X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fcontrollers%2Fnodeb_controller.go;h=385824e5c184c0e439f612e5cf714abed437ee45;hb=7000880c4031e607a2fe36046fd097f486476a84;hp=cef57f951d3a15715b745ec9ffbf1c3d803b78cc;hpb=d6d623cc2eda63be912b4e322c25e492abe86a99;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/controllers/nodeb_controller.go b/E2Manager/controllers/nodeb_controller.go index cef57f9..385824e 100644 --- a/E2Manager/controllers/nodeb_controller.go +++ b/E2Manager/controllers/nodeb_controller.go @@ -46,12 +46,13 @@ const ContentType = "Content-Type" type INodebController interface { Shutdown(writer http.ResponseWriter, r *http.Request) X2Reset(writer http.ResponseWriter, r *http.Request) - X2Setup(writer http.ResponseWriter, r *http.Request) - EndcSetup(writer http.ResponseWriter, r *http.Request) GetNodeb(writer http.ResponseWriter, r *http.Request) UpdateGnb(writer http.ResponseWriter, r *http.Request) + UpdateEnb(writer http.ResponseWriter, r *http.Request) GetNodebIdList(writer http.ResponseWriter, r *http.Request) SetGeneralConfiguration(writer http.ResponseWriter, r *http.Request) + AddEnb(writer http.ResponseWriter, r *http.Request) + DeleteEnb(writer http.ResponseWriter, r *http.Request) } type NodebController struct { @@ -69,7 +70,7 @@ func NewNodebController(logger *logger.Logger, handlerProvider *httpmsghandlerpr func (c *NodebController) GetNodebIdList(writer http.ResponseWriter, r *http.Request) { c.logger.Infof("[Client -> E2 Manager] #NodebController.GetNodebIdList - request: %v", c.prettifyRequest(r)) - c.handleRequest(writer, &r.Header, httpmsghandlerprovider.GetNodebIdListRequest, nil, false) + c.handleRequest(writer, &r.Header, httpmsghandlerprovider.GetNodebIdListRequest, nil, false, http.StatusOK) } func (c *NodebController) GetNodeb(writer http.ResponseWriter, r *http.Request) { @@ -77,7 +78,7 @@ func (c *NodebController) GetNodeb(writer http.ResponseWriter, r *http.Request) vars := mux.Vars(r) ranName := vars["ranName"] request := models.GetNodebRequest{RanName: ranName} - c.handleRequest(writer, &r.Header, httpmsghandlerprovider.GetNodebRequest, request, false) + c.handleRequest(writer, &r.Header, httpmsghandlerprovider.GetNodebRequest, request, false, http.StatusOK) } func (c *NodebController) UpdateGnb(writer http.ResponseWriter, r *http.Request) { @@ -95,63 +96,101 @@ func (c *NodebController) UpdateGnb(writer http.ResponseWriter, r *http.Request) request.Gnb = &gnb request.RanName = ranName - c.handleRequest(writer, &r.Header, httpmsghandlerprovider.UpdateGnbRequest, request, true) + c.handleRequest(writer, &r.Header, httpmsghandlerprovider.UpdateGnbRequest, &request, true, http.StatusOK) } -func (c *NodebController) SetGeneralConfiguration(writer http.ResponseWriter, r *http.Request) { - c.logger.Infof("[Client -> E2 Manager] #NodebController.SetGeneralConfiguration - request: %v", c.prettifyRequest(r)) +func (c *NodebController) UpdateEnb(writer http.ResponseWriter, r *http.Request) { + c.logger.Infof("[Client -> E2 Manager] #NodebController.UpdateEnb - request: %v", c.prettifyRequest(r)) - request := models.GeneralConfigurationRequest{} + defer r.Body.Close() + body, err := ioutil.ReadAll(r.Body) - if !c.extractJsonBodyDisallowUnknownFields(r, &request, writer){ + if err != nil { + c.logger.Errorf("[Client -> E2 Manager] #NodebController.UpdateEnb - unable to read request body - error: %s", err) + c.handleErrorResponse(e2managererrors.NewInvalidJsonError(), writer) return } - c.handleRequest(writer, &r.Header, httpmsghandlerprovider.SetGeneralConfigurationRequest, request, false) -} -func (c *NodebController) Shutdown(writer http.ResponseWriter, r *http.Request) { - c.logger.Infof("[Client -> E2 Manager] #NodebController.Shutdown - request: %v", c.prettifyRequest(r)) - c.handleRequest(writer, &r.Header, httpmsghandlerprovider.ShutdownRequest, nil, false) -} + updateEnbRequest := models.UpdateEnbRequest{} + err = json.Unmarshal(body, &updateEnbRequest) + + if err != nil { + c.logger.Errorf("[Client -> E2 Manager] #NodebController.UpdateEnb - unable to unmarshal json - error: %s", err) + c.handleErrorResponse(e2managererrors.NewInvalidJsonError(), writer) + return + } -func (c *NodebController) X2Reset(writer http.ResponseWriter, r *http.Request) { - c.logger.Infof("[Client -> E2 Manager] #NodebController.X2Reset - request: %v", c.prettifyRequest(r)) - request := models.ResetRequest{} vars := mux.Vars(r) ranName := vars[ParamRanName] - if r.ContentLength > 0 && !c.extractJsonBody(r, &request, writer) { - return - } - request.RanName = ranName - c.handleRequest(writer, &r.Header, httpmsghandlerprovider.ResetRequest, request, false) + updateEnbRequest.RanName = ranName + + c.handleRequest(writer, &r.Header, httpmsghandlerprovider.UpdateEnbRequest, &updateEnbRequest, true, http.StatusOK) } -func (c *NodebController) X2Setup(writer http.ResponseWriter, r *http.Request) { - c.logger.Infof("[Client -> E2 Manager] #NodebController.X2Setup - request: %v", c.prettifyRequest(r)) +func (c *NodebController) AddEnb(writer http.ResponseWriter, r *http.Request) { + c.logger.Infof("[Client -> E2 Manager] #NodebController.AddEnb - request: %v", c.prettifyRequest(r)) - request := models.SetupRequest{} + defer r.Body.Close() + body, err := ioutil.ReadAll(r.Body) - if !c.extractJsonBody(r, &request, writer) { + if err != nil { + c.logger.Errorf("[Client -> E2 Manager] #NodebController.AddEnb - unable to read request body - error: %s", err) + c.handleErrorResponse(e2managererrors.NewInvalidJsonError(), writer) + return + } + + addEnbRequest := models.AddEnbRequest{} + err = json.Unmarshal(body, &addEnbRequest) + + if err != nil { + c.logger.Errorf("[Client -> E2 Manager] #NodebController.AddEnb - unable to unmarshal json - error: %s", err) + c.handleErrorResponse(e2managererrors.NewInvalidJsonError(), writer) return } - c.handleRequest(writer, &r.Header, httpmsghandlerprovider.X2SetupRequest, request, true) + c.handleRequest(writer, &r.Header, httpmsghandlerprovider.AddEnbRequest, &addEnbRequest, true, http.StatusCreated) } -func (c *NodebController) EndcSetup(writer http.ResponseWriter, r *http.Request) { - c.logger.Infof("[Client -> E2 Manager] #NodebController.EndcSetup - request: %v", c.prettifyRequest(r)) +func (c *NodebController) DeleteEnb(writer http.ResponseWriter, r *http.Request) { + c.logger.Infof("[Client -> E2 Manager] #NodebController.DeleteEnb - request: %v", c.prettifyRequest(r)) + vars := mux.Vars(r) + ranName := vars["ranName"] + request := &models.DeleteEnbRequest{RanName: ranName} + c.handleRequest(writer, &r.Header, httpmsghandlerprovider.DeleteEnbRequest, request, true, http.StatusNoContent) +} + +func (c *NodebController) SetGeneralConfiguration(writer http.ResponseWriter, r *http.Request) { + c.logger.Infof("[Client -> E2 Manager] #NodebController.SetGeneralConfiguration - request: %v", c.prettifyRequest(r)) - request := models.SetupRequest{} + request := models.GeneralConfigurationRequest{} - if !c.extractJsonBody(r, &request, writer) { + if !c.extractJsonBodyDisallowUnknownFields(r, &request, writer) { return } + c.handleRequest(writer, &r.Header, httpmsghandlerprovider.SetGeneralConfigurationRequest, request, false, http.StatusOK) +} + +func (c *NodebController) Shutdown(writer http.ResponseWriter, r *http.Request) { + c.logger.Infof("[Client -> E2 Manager] #NodebController.Shutdown - request: %v", c.prettifyRequest(r)) + c.handleRequest(writer, &r.Header, httpmsghandlerprovider.ShutdownRequest, nil, false, http.StatusNoContent) +} + +func (c *NodebController) X2Reset(writer http.ResponseWriter, r *http.Request) { + c.logger.Infof("[Client -> E2 Manager] #NodebController.X2Reset - request: %v", c.prettifyRequest(r)) + request := models.ResetRequest{} + vars := mux.Vars(r) + ranName := vars[ParamRanName] - c.handleRequest(writer, &r.Header, httpmsghandlerprovider.EndcSetupRequest, request, true) + if err := c.extractJsonBody(r, &request); err != nil { + c.handleErrorResponse(err, writer) + return + } + request.RanName = ranName + c.handleRequest(writer, &r.Header, httpmsghandlerprovider.ResetRequest, request, false, http.StatusNoContent) } -func (c *NodebController) extractRequestBodyToProto(r *http.Request, pb proto.Message , writer http.ResponseWriter) bool { +func (c *NodebController) extractRequestBodyToProto(r *http.Request, pb proto.Message, writer http.ResponseWriter) bool { defer r.Body.Close() err := jsonpb.Unmarshal(r.Body, pb) @@ -180,27 +219,25 @@ func (c *NodebController) extractJsonBodyDisallowUnknownFields(r *http.Request, return true } -func (c *NodebController) extractJsonBody(r *http.Request, request models.Request, writer http.ResponseWriter) bool { +func (c *NodebController) extractJsonBody(r *http.Request, request models.Request) error { defer r.Body.Close() body, err := ioutil.ReadAll(io.LimitReader(r.Body, LimitRequest)) if err != nil { c.logger.Errorf("[Client -> E2 Manager] #NodebController.extractJsonBody - unable to extract json body - error: %s", err) - c.handleErrorResponse(e2managererrors.NewInvalidJsonError(), writer) - return false + return e2managererrors.NewInvalidJsonError() } err = json.Unmarshal(body, &request) if err != nil { c.logger.Errorf("[Client -> E2 Manager] #NodebController.extractJsonBody - unable to extract json body - error: %s", err) - c.handleErrorResponse(e2managererrors.NewInvalidJsonError(), writer) - return false + return e2managererrors.NewInvalidJsonError() } - return true + return nil } -func (c *NodebController) handleRequest(writer http.ResponseWriter, header *http.Header, requestName httpmsghandlerprovider.IncomingRequest, request models.Request, validateRequestHeaders bool) { +func (c *NodebController) handleRequest(writer http.ResponseWriter, header *http.Header, requestName httpmsghandlerprovider.IncomingRequest, request models.Request, validateRequestHeaders bool, successStatusCode int) { if validateRequestHeaders { @@ -225,8 +262,8 @@ func (c *NodebController) handleRequest(writer http.ResponseWriter, header *http return } - if response == nil { - writer.WriteHeader(http.StatusNoContent) + if successStatusCode == http.StatusNoContent { + writer.WriteHeader(successStatusCode) c.logger.Infof("[E2 Manager -> Client] #NodebController.handleRequest - status response: %v", http.StatusNoContent) return } @@ -240,6 +277,7 @@ func (c *NodebController) handleRequest(writer http.ResponseWriter, header *http c.logger.Infof("[E2 Manager -> Client] #NodebController.handleRequest - response: %s", result) writer.Header().Set(ContentType, ApplicationJson) + writer.WriteHeader(successStatusCode) writer.Write(result) } @@ -300,6 +338,10 @@ func (c *NodebController) handleErrorResponse(err error, writer http.ResponseWri e2Error, _ := err.(*e2managererrors.RoutingManagerError) errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message} httpError = http.StatusServiceUnavailable + case *e2managererrors.NodebExistsError: + e2Error, _ := err.(*e2managererrors.NodebExistsError) + errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message} + httpError = http.StatusBadRequest default: e2Error := e2managererrors.NewInternalError() errorResponseDetails = models.ErrorResponse{Code: e2Error.Code, Message: e2Error.Message}