[RIC-584] - Improve logging when enb type in add enb request is not valid

[ric-plt/e2mgr.git] / E2Manager / controllers / nodeb_controller.go

diff --git a/E2Manager/controllers/nodeb_controller.go b/E2Manager/controllers/nodeb_controller.go
index 96d0067..385824e 100644 (file)
--- a/E2Manager/controllers/nodeb_controller.go
+++ b/E2Manager/controllers/nodeb_controller.go
@@ -48,9 +48,11 @@ type INodebController interface {
        X2Reset(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 {
@@ -94,14 +96,43 @@ 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))
+
+       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
+       }
+
+       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
+       }
+
+       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) {
        c.logger.Infof("[Client -> E2 Manager] #NodebController.AddEnb - request: %v", c.prettifyRequest(r))
 
        defer r.Body.Close()
-       body, err := ioutil.ReadAll(io.LimitReader(r.Body, LimitRequest))
+       body, err := ioutil.ReadAll(r.Body)
 
        if err != nil {
                c.logger.Errorf("[Client -> E2 Manager] #NodebController.AddEnb - unable to read request body - error: %s", err)
@@ -121,6 +152,14 @@ func (c *NodebController) AddEnb(writer http.ResponseWriter, r *http.Request) {
        c.handleRequest(writer, &r.Header, httpmsghandlerprovider.AddEnbRequest, &addEnbRequest, true, http.StatusCreated)
 }
 
+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))