J release: Release container Image

[ric-plt/e2mgr.git] / E2Manager / handlers / httpmsghandlers / update_nodeb_request_handler.go

diff --git a/E2Manager/handlers/httpmsghandlers/update_nodeb_request_handler.go b/E2Manager/handlers/httpmsghandlers/update_nodeb_request_handler.go
index 62eddbf..551006e 100644 (file)
--- a/E2Manager/handlers/httpmsghandlers/update_nodeb_request_handler.go
+++ b/E2Manager/handlers/httpmsghandlers/update_nodeb_request_handler.go
@@ -65,16 +65,18 @@ func (h *UpdateNodebRequestHandler) Handle(request models.Request) (models.IResp
                return nil, e2managererrors.NewResourceNotFoundError()
        }
 
-       err = h.updateNodebManager.RemoveNodebCells(nodebInfo)
+       err = h.updateNodebManager.ValidateNodeb(nodebInfo)
        if err != nil {
-               return nil, err
+               return nil, e2managererrors.NewRequestValidationError()
        }
 
-       err = h.updateNodebManager.SetNodeb(nodebInfo, request)
+       err = h.updateNodebManager.RemoveNodebCells(nodebInfo)
        if err != nil {
                return nil, err
        }
 
+       h.updateNodebManager.SetNodeb(nodebInfo, request)
+
        err = h.updateNodebManager.UpdateNodeb(nodebInfo)
        if err != nil {
                return nil, err
@@ -84,14 +86,12 @@ func (h *UpdateNodebRequestHandler) Handle(request models.Request) (models.IResp
 }
 
 func (h *UpdateNodebRequestHandler) getRanName(request models.Request) string {
-
-       var ranName string
-       updateEnbRequest, ok := request.(*models.UpdateEnbRequest)
-       if !ok {
-               //updateGnbRequest := request.(*models.UpdateGnbRequest)
-               //ranName = updateGnbRequest.RanName
-       } else {
-               ranName = updateEnbRequest.RanName
+       switch v := request.(type) {
+       case *models.UpdateEnbRequest:
+               return v.RanName
+       case *models.UpdateGnbRequest:
+               return v.RanName
        }
-       return ranName
-}
\ No newline at end of file
+
+       return ""
+}