X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fcontrollers%2Fcontroller.go;h=f9a7bb3de94565656e5da7e69b92c38da8e8a11e;hb=b7c68cce977fc001e6c42f12bac3e54ca52d00a3;hp=6d638c415c950a3dd09f7d5f607770adc2f3a69c;hpb=549944ecfb9e75ed4a03dd6d10e4160b89f26ca8;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/controllers/controller.go b/E2Manager/controllers/controller.go index 6d638c4..f9a7bb3 100644 --- a/E2Manager/controllers/controller.go +++ b/E2Manager/controllers/controller.go @@ -21,70 +21,112 @@ import ( "e2mgr/configuration" "e2mgr/e2managererrors" "e2mgr/logger" + "e2mgr/managers" "e2mgr/models" - "e2mgr/providers" + "e2mgr/providers/httpmsghandlerprovider" "e2mgr/rNibWriter" "e2mgr/services" "encoding/json" "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader" - "github.com/julienschmidt/httprouter" + "github.com/gorilla/mux" + "io" + "io/ioutil" "net/http" + "net/http/httputil" + "strings" ) const ( ParamRanName = "ranName" + LimitRequest = 2000 ) + +type IController interface { + ShutdownHandler(writer http.ResponseWriter, r *http.Request) + X2ResetHandler(writer http.ResponseWriter, r *http.Request) + X2SetupHandler(writer http.ResponseWriter, r *http.Request) + EndcSetupHandler(writer http.ResponseWriter, r *http.Request) +} + type Controller struct { - logger *logger.Logger - handlerProvider *providers.IncomingRequestHandlerProvider + logger *logger.Logger + handlerProvider *httpmsghandlerprovider.IncomingRequestHandlerProvider } func NewController(logger *logger.Logger, rmrService *services.RmrService, rNibReaderProvider func() reader.RNibReader, rNibWriterProvider func() rNibWriter.RNibWriter, - config *configuration.Configuration) *Controller { + config *configuration.Configuration, ranSetupManager *managers.RanSetupManager) *Controller { - provider := providers.NewIncomingRequestHandlerProvider(logger, rmrService, config, rNibWriterProvider, rNibReaderProvider) + provider := httpmsghandlerprovider.NewIncomingRequestHandlerProvider(logger, rmrService, config, rNibWriterProvider, rNibReaderProvider, ranSetupManager) return &Controller{ - logger: logger, + logger: logger, handlerProvider: provider, } } -func (c *Controller)ShutdownHandler(writer http.ResponseWriter, r *http.Request, params httprouter.Params){ - c.logger.Infof("[Client -> E2 Manager] #controller.ShutdownHandler - request: %v", prettifyRequest(r)) - c.handleRequest(writer, &r.Header, providers.ShutdownRequest,nil, false, http.StatusNoContent) +func (c *Controller) ShutdownHandler(writer http.ResponseWriter, r *http.Request) { + c.logger.Infof("[Client -> E2 Manager] #controller.ShutdownHandler - request: %v", c.prettifyRequest(r)) + c.handleRequest(writer, &r.Header, httpmsghandlerprovider.ShutdownRequest, nil, false) } -func (c *Controller) X2ResetHandler(writer http.ResponseWriter, r *http.Request, params httprouter.Params){ - c.logger.Infof("[Client -> E2 Manager] #controller.X2ResetHandler - request: %v", prettifyRequest(r)) - request:= models.ResetRequest{} - ranName:= params.ByName(ParamRanName) +func (c *Controller) X2ResetHandler(writer http.ResponseWriter, r *http.Request) { + c.logger.Infof("[Client -> E2 Manager] #controller.X2ResetHandler - request: %v", c.prettifyRequest(r)) + request := models.ResetRequest{} + vars := mux.Vars(r) + ranName := vars[ParamRanName] - if !c.extractJsonBody(r, &request, writer){ + if r.ContentLength > 0 && !c.extractJsonBody(r, &request, writer) { return } request.RanName = ranName - c.handleRequest(writer, &r.Header, providers.ResetRequest, request, false, http.StatusNoContent) + c.handleRequest(writer, &r.Header, httpmsghandlerprovider.ResetRequest, request, false) } -func (c *Controller) extractJsonBody(r *http.Request, request models.Request, writer http.ResponseWriter) bool{ - if r.ContentLength <= 0 { - return true +func (c *Controller) X2SetupHandler(writer http.ResponseWriter, r *http.Request) { + c.logger.Infof("[Client -> E2 Manager] #controller.X2SetupHandler - request: %v", c.prettifyRequest(r)) + + request := models.SetupRequest{} + + if !c.extractJsonBody(r, &request, writer) { + return } - decoder := json.NewDecoder(r.Body) - if err := decoder.Decode(request); err != nil { - if err != nil { - c.logger.Errorf("[Client -> E2 Manager] #controller.extractJsonBody - unable to extract json body - error: %s", err) - c.handleErrorResponse(e2managererrors.NewInvalidJsonError(), writer) - return false - } + c.handleRequest(writer, &r.Header, httpmsghandlerprovider.X2SetupRequest, request, true) +} + +func (c *Controller) EndcSetupHandler(writer http.ResponseWriter, r *http.Request) { + c.logger.Infof("[Client -> E2 Manager] #controller.EndcSetupHandler - request: %v", c.prettifyRequest(r)) + + request := models.SetupRequest{} + + if !c.extractJsonBody(r, &request, writer) { + return + } + + c.handleRequest(writer, &r.Header, httpmsghandlerprovider.EndcSetupRequest, request, true) +} + +func (c *Controller) extractJsonBody(r *http.Request, request models.Request, writer http.ResponseWriter) bool { + defer r.Body.Close() + body, err := ioutil.ReadAll(io.LimitReader(r.Body, LimitRequest)) + + if err != nil { + c.logger.Errorf("[Client -> E2 Manager] #controller.extractJsonBody - unable to extract json body - error: %s", err) + c.handleErrorResponse(e2managererrors.NewInvalidJsonError(), writer) + return false + } + + err = json.Unmarshal(body, &request) + if err != nil { + c.logger.Errorf("[Client -> E2 Manager] #controller.extractJsonBody - unable to extract json body - error: %s", err) + c.handleErrorResponse(e2managererrors.NewInvalidJsonError(), writer) + return false } return true } -func (c *Controller) handleRequest(writer http.ResponseWriter, header *http.Header, requestName providers.IncomingRequest, - request models.Request, validateHeader bool, httpStatusResponse int) { +func (c *Controller) handleRequest(writer http.ResponseWriter, header *http.Header, requestName httpmsghandlerprovider.IncomingRequest, + request models.Request, validateHeader bool) { if validateHeader { @@ -95,34 +137,35 @@ func (c *Controller) handleRequest(writer http.ResponseWriter, header *http.Head } } - handler,err := c.handlerProvider.GetHandler(requestName) + handler, err := c.handlerProvider.GetHandler(requestName) + if err != nil { c.handleErrorResponse(err, writer) return } - err = handler.Handle(c.logger, request) + err = handler.Handle(request) if err != nil { c.handleErrorResponse(err, writer) return } - writer.WriteHeader(httpStatusResponse) - c.logger.Infof("[E2 Manager -> Client] #controller.handleRequest - status response: %v", httpStatusResponse) + writer.WriteHeader(http.StatusNoContent) + c.logger.Infof("[E2 Manager -> Client] #controller.handleRequest - status response: %v", http.StatusNoContent) } -func (c *Controller) validateRequestHeader( header *http.Header) error { +func (c *Controller) validateRequestHeader(header *http.Header) error { - if header.Get("Content-Type") != "application/json"{ + if header.Get("Content-Type") != "application/json" { c.logger.Errorf("#controller.validateRequestHeader - validation failure, incorrect content type") - return e2managererrors.NewHeaderValidationError() + return e2managererrors.NewHeaderValidationError() } return nil } -func (c *Controller) handleErrorResponse(err error, writer http.ResponseWriter){ +func (c *Controller) handleErrorResponse(err error, writer http.ResponseWriter) { var errorResponseDetails models.ErrorResponse var httpError int @@ -131,40 +174,40 @@ func (c *Controller) handleErrorResponse(err error, writer http.ResponseWriter){ switch err.(type) { case *e2managererrors.RnibDbError: e2Error, _ := err.(*e2managererrors.RnibDbError) - errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message} + errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message} httpError = http.StatusInternalServerError case *e2managererrors.CommandAlreadyInProgressError: e2Error, _ := err.(*e2managererrors.CommandAlreadyInProgressError) - errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message} + errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message} httpError = http.StatusMethodNotAllowed case *e2managererrors.HeaderValidationError: e2Error, _ := err.(*e2managererrors.HeaderValidationError) - errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message} + errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message} httpError = http.StatusUnsupportedMediaType case *e2managererrors.WrongStateError: e2Error, _ := err.(*e2managererrors.WrongStateError) - errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message} + errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message} httpError = http.StatusBadRequest case *e2managererrors.RequestValidationError: e2Error, _ := err.(*e2managererrors.RequestValidationError) - errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message} + errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message} httpError = http.StatusBadRequest case *e2managererrors.InvalidJsonError: e2Error, _ := err.(*e2managererrors.InvalidJsonError) - errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message} + errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message} httpError = http.StatusBadRequest case *e2managererrors.RmrError: e2Error, _ := err.(*e2managererrors.RmrError) - errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message} + errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message} httpError = http.StatusInternalServerError case *e2managererrors.ResourceNotFoundError: e2Error, _ := err.(*e2managererrors.ResourceNotFoundError) - errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message} + errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message} httpError = http.StatusNotFound default: e2Error := e2managererrors.NewInternalError() - errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message} + errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message} httpError = http.StatusInternalServerError } } @@ -179,4 +222,10 @@ func (c *Controller) handleErrorResponse(err error, writer http.ResponseWriter){ if err != nil { c.logger.Errorf("#controller.handleErrorResponse - Cannot send response. writer:%v", writer) } -} \ No newline at end of file +} + +func (c *Controller) prettifyRequest(request *http.Request) string { + dump, _ := httputil.DumpRequest(request, true) + requestPrettyPrint := strings.Replace(string(dump), "\r\n", " ", -1) + return strings.Replace(requestPrettyPrint, "\n", "", -1) +}