X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fhandlers%2Fhttpmsghandlers%2Fupdate_nodeb_request_handler.go;h=551006e2a2b6a85ce8aa357d0d00aed529f05abc;hb=0fb24ff00209041b316352327e2c73b699943131;hp=62eddbf05dca98669f229268ff0d89576ebb204f;hpb=d435d27ca2599b8aed814af54c879effe7ded8f0;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/handlers/httpmsghandlers/update_nodeb_request_handler.go b/E2Manager/handlers/httpmsghandlers/update_nodeb_request_handler.go
index 62eddbf..551006e 100644
--- 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 ""
+}