X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fcontrollers%2Fcontroller.go;h=7d549b25e847eaae1c63872bf12e984ca36cdc18;hb=refs%2Fchanges%2F85%2F885%2F1;hp=c02e67126a3066094f7147f9a98023c5a18ee1d5;hpb=a2533f20818f4aab9ee32e2b3ef4bea298613cc7;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/controllers/controller.go b/E2Manager/controllers/controller.go index c02e671..7d549b2 100644 --- a/E2Manager/controllers/controller.go +++ b/E2Manager/controllers/controller.go @@ -22,71 +22,77 @@ import ( "e2mgr/e2managererrors" "e2mgr/logger" "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" - "io" + "github.com/gorilla/mux" "net/http" - "time" ) const ( ParamRanName = "ranName" ) + +type IController interface { + ShutdownHandler(writer http.ResponseWriter, r *http.Request) + X2ResetHandler(writer http.ResponseWriter, r *http.Request) +} + type Controller struct { - logger *logger.Logger - handlerProvider *providers.IncomingRequestHandlerProvider - rmrResponseChannel chan<- *models.NotificationResponse + 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, rmrResponseChannel chan<- *models.NotificationResponse) *Controller { + config *configuration.Configuration) *Controller { - provider := providers.NewIncomingRequestHandlerProvider(logger, rmrService, config, rNibWriterProvider, rNibReaderProvider) + provider := httpmsghandlerprovider.NewIncomingRequestHandlerProvider(logger, rmrService, config, rNibWriterProvider, rNibReaderProvider) return &Controller{ - logger: logger, + logger: logger, handlerProvider: provider, - rmrResponseChannel: rmrResponseChannel, } } -func (c *Controller)ShutdownHandler(writer http.ResponseWriter, r *http.Request, params httprouter.Params){ - - 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", prettifyRequest(r)) + c.handleRequest(writer, &r.Header, httpmsghandlerprovider.ShutdownRequest, nil, false, http.StatusNoContent) } -func (c *Controller) X2ResetHandler(writer http.ResponseWriter, r *http.Request, params httprouter.Params){ - startTime := time.Now() - request:= models.ResetRequest{} - ranName:= params.ByName(ParamRanName) - if !c.extractJsonBody(r.Body, &request, writer){ +func (c *Controller) X2ResetHandler(writer http.ResponseWriter, r *http.Request) { + c.logger.Infof("[Client -> E2 Manager] #controller.X2ResetHandler - request: %v", prettifyRequest(r)) + request := models.ResetRequest{} + vars := mux.Vars(r) + ranName := vars[ParamRanName] + + if !c.extractJsonBody(r, &request, writer) { return } request.RanName = ranName - request.StartTime = startTime - c.handleRequest(writer, &r.Header, providers.ResetRequest, request, false, http.StatusNoContent) + c.handleRequest(writer, &r.Header, httpmsghandlerprovider.ResetRequest, request, false, http.StatusNoContent) } -func (c *Controller) extractJsonBody(body io.Reader, request models.Request, writer http.ResponseWriter) bool{ - decoder := json.NewDecoder(body) - if err:= decoder.Decode(request); err != nil { +func (c *Controller) extractJsonBody(r *http.Request, request models.Request, writer http.ResponseWriter) bool { + if r.ContentLength <= 0 { + return true + } + + 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.NewRequestValidationError(), writer) + c.handleErrorResponse(e2managererrors.NewInvalidJsonError(), writer) return false } } + return true } -func (c *Controller) handleRequest(writer http.ResponseWriter, header *http.Header, requestName providers.IncomingRequest, +func (c *Controller) handleRequest(writer http.ResponseWriter, header *http.Header, requestName httpmsghandlerprovider.IncomingRequest, request models.Request, validateHeader bool, httpStatusResponse int) { - c.logger.Infof("[Client -> E2 Manager] #controller.handleRequest - request: %v", requestName) //TODO print request if exist - if validateHeader { err := c.validateRequestHeader(header) @@ -96,13 +102,13 @@ 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, c.rmrResponseChannel) + err = handler.Handle(c.logger, request) if err != nil { c.handleErrorResponse(err, writer) @@ -113,17 +119,17 @@ func (c *Controller) handleRequest(writer http.ResponseWriter, header *http.Head c.logger.Infof("[E2 Manager -> Client] #controller.handleRequest - status response: %v", httpStatusResponse) } -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 @@ -132,36 +138,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.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, _ := err.(*e2managererrors.InternalError) - errorResponseDetails = models.ErrorResponse{Code: e2Error.Err.Code, Message: e2Error.Err.Message} + e2Error := e2managererrors.NewInternalError() + errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message} httpError = http.StatusInternalServerError } } @@ -176,4 +186,4 @@ 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 +}