X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fupdate_enb_manager.go;h=79a8f49b4e98e65e7eccf68b1b52c800c817e588;hb=7000880c4031e607a2fe36046fd097f486476a84;hp=005e9bbb1557d95102fcddc03319fdbe1b50d499;hpb=9377e3df9b861e512df33d8596a868b9e5e34e94;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/managers/update_enb_manager.go b/E2Manager/managers/update_enb_manager.go
old mode 100644
new mode 100755
index 005e9bb..79a8f49
--- a/E2Manager/managers/update_enb_manager.go
+++ b/E2Manager/managers/update_enb_manager.go
@@ -48,7 +48,6 @@ func (h *UpdateEnbManager) Validate(request models.Request) error {
 
 	h.logger.Infof("#UpdateEnbManager.Validate - Validate incoming request, ran name: %s", updateEnbRequest.RanName)
 
-
 	if err := h.validateRequestBody(updateEnbRequest); err != nil {
 		h.logger.Errorf("#UpdateEnbManager.Validate - validation failure: %s is a mandatory field and cannot be empty", err)
 		return err
@@ -60,11 +59,18 @@ func (h *UpdateEnbManager) Validate(request models.Request) error {
 func (h *UpdateEnbManager) RemoveNodebCells(nodeb *entities.NodebInfo) error {
 
 	if nodeb.NodeType != entities.Node_ENB {
-		h.logger.Errorf("#UpdateEnbManager.RemoveNodebCells - RAN name: %s - nodeb missing eNB configuration", nodeb.GetRanName())
+		h.logger.Errorf("#UpdateEnbManager.RemoveNodebCells - RAN name: %s - RAN is not eNB.", nodeb.RanName)
 		return e2managererrors.NewRequestValidationError()
 	}
 
-	err := h.rnibDataService.RemoveServedCells(nodeb.GetRanName(), nodeb.GetEnb().GetServedCells())
+	servedCells := nodeb.GetEnb().GetServedCells()
+
+	if len(servedCells) == 0 {
+		h.logger.Infof("#UpdateGnbManager.RemoveNodebCells - RAN name: %s - eNB cells are nil or empty - no cells to remove", nodeb.GetRanName())
+		return nil
+	}
+
+	err := h.rnibDataService.RemoveServedCells(nodeb.GetRanName(), servedCells)
 	if err != nil {
 		h.logger.Errorf("#UpdateEnbManager.RemoveNodebCells - RAN name: %s - Failed removing eNB served cells", nodeb.GetRanName())
 		return e2managererrors.NewRnibDbError()
@@ -74,13 +80,9 @@ func (h *UpdateEnbManager) RemoveNodebCells(nodeb *entities.NodebInfo) error {
 	return nil
 }
 
-func (h *UpdateEnbManager) SetNodeb(nodeb *entities.NodebInfo, request models.Request) error {
-
+func (h *UpdateEnbManager) SetNodeb(nodeb *entities.NodebInfo, request models.Request) {
 	updateEnbRequest := request.(*models.UpdateEnbRequest)
-
 	nodeb.Configuration = &entities.NodebInfo_Enb{Enb: updateEnbRequest.Enb}
-
-	return nil
 }
 
 func (h *UpdateEnbManager) UpdateNodeb(nodeb *entities.NodebInfo) error {
@@ -106,4 +108,4 @@ func (h *UpdateEnbManager) validateRequestBody(request *models.UpdateEnbRequest)
 	}
 
 	return nil
-}
\ No newline at end of file
+}