X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=inline;f=E2Manager%2Fmanagers%2Fupdate_enb_manager.go;h=cb3e4bc29aa676ff543d6f7f9d4d59cce810aa0a;hb=5208a1cf953edf958444d41352815073e9ebaf29;hp=b2cd7d74a9cf05bba2afc95ad3258cb1c6ae310a;hpb=fafc90d9bf1c8edc7b8815280f2fd0a11677e00b;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/managers/update_enb_manager.go b/E2Manager/managers/update_enb_manager.go
index b2cd7d7..cb3e4bc 100755
--- 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
@@ -64,7 +63,14 @@ func (h *UpdateEnbManager) RemoveNodebCells(nodeb *entities.NodebInfo) error {
 		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,10 @@ 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)
-
+	updateEnbRequest.Enb.EnbType = nodeb.GetEnb().GetEnbType()
 	nodeb.Configuration = &entities.NodebInfo_Enb{Enb: updateEnbRequest.Enb}
-
-	return nil
 }
 
 func (h *UpdateEnbManager) UpdateNodeb(nodeb *entities.NodebInfo) error {
@@ -105,5 +108,9 @@ func (h *UpdateEnbManager) validateRequestBody(request *models.UpdateEnbRequest)
 		return err
 	}
 
+	if h.nodebValidator.IsNgEnbType(request.Enb.GetEnbType()){
+		return errors.New("enb.enbType")
+	}
+
 	return nil
-}
\ No newline at end of file
+}