X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fcontrollers%2Fnodeb_controller.go;h=809c5b34a24c611a8a355ef0a8666beea45b1fab;hb=9377e3df9b861e512df33d8596a868b9e5e34e94;hp=71b11600fe3348c67adf2ce93c10fff4d1793414;hpb=a0a0af06b43d30f837a8865e924f8587fb42c3f3;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/controllers/nodeb_controller.go b/E2Manager/controllers/nodeb_controller.go index 71b1160..809c5b3 100644 --- a/E2Manager/controllers/nodeb_controller.go +++ b/E2Manager/controllers/nodeb_controller.go @@ -101,20 +101,31 @@ func (c *NodebController) UpdateGnb(writer http.ResponseWriter, r *http.Request) func (c *NodebController) UpdateEnb(writer http.ResponseWriter, r *http.Request) { c.logger.Infof("[Client -> E2 Manager] #NodebController.UpdateEnb - request: %v", c.prettifyRequest(r)) - vars := mux.Vars(r) - ranName := vars[ParamRanName] - request := models.UpdateNodebRequest{} + defer r.Body.Close() + body, err := ioutil.ReadAll(r.Body) + + 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 + } - enb := entities.Enb{} + updateEnbRequest := models.UpdateEnbRequest{} + err = json.Unmarshal(body, &updateEnbRequest) - if !c.extractRequestBodyToProto(r, &enb, writer) { + if err != nil { + c.logger.Errorf("[Client -> E2 Manager] #NodebController.UpdateEnb - unable to unmarshal json - error: %s", err) + c.handleErrorResponse(e2managererrors.NewInvalidJsonError(), writer) return } - request.Enb = &enb - request.RanName = ranName - c.handleRequest(writer, &r.Header, httpmsghandlerprovider.UpdateEnbRequest, request, true, http.StatusOK) + vars := mux.Vars(r) + ranName := vars[ParamRanName] + + updateEnbRequest.RanName = ranName + + c.handleRequest(writer, &r.Header, httpmsghandlerprovider.UpdateEnbRequest, &updateEnbRequest, true, http.StatusOK) } func (c *NodebController) AddEnb(writer http.ResponseWriter, r *http.Request) {