X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fcontrollers%2Fnodeb_controller.go;h=385824e5c184c0e439f612e5cf714abed437ee45;hb=fbd73df3e4bd575816d4c6444807879a8bf54c7f;hp=3ff453eae6aa612cb6c627eb929b8c0e691c33b8;hpb=5830d4db63151dd466533673fd76d842302f0034;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/controllers/nodeb_controller.go b/E2Manager/controllers/nodeb_controller.go
index 3ff453e..385824e 100644
--- a/E2Manager/controllers/nodeb_controller.go
+++ b/E2Manager/controllers/nodeb_controller.go
@@ -96,25 +96,36 @@ 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, http.StatusOK)
+	c.handleRequest(writer, &r.Header, httpmsghandlerprovider.UpdateGnbRequest, &request, true, http.StatusOK)
 }
 
 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) {
@@ -145,7 +156,7 @@ 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}
+	request := &models.DeleteEnbRequest{RanName: ranName}
 	c.handleRequest(writer, &r.Header, httpmsghandlerprovider.DeleteEnbRequest, request, true, http.StatusNoContent)
 }