RIC-961:implement Xn and X2 component IDs correctly in E2M

[ric-plt/e2mgr.git] / E2Manager / managers / update_enb_manager.go

diff --git a/E2Manager/managers/update_enb_manager.go b/E2Manager/managers/update_enb_manager.go
old mode 100644 (file)
new mode 100755 (executable)
index 005e9bb..0e8ed7e
--- a/E2Manager/managers/update_enb_manager.go
+++ b/E2Manager/managers/update_enb_manager.go
@@ -48,23 +48,28 @@ 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
        }
-
        return nil
 }
 
 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 +79,14 @@ 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}
+       if nodeb.SetupFromNetwork {
+               updateEnbRequest.Enb.EnbType = nodeb.GetEnb().GetEnbType()
+       }
 
-       return nil
+       nodeb.Configuration = &entities.NodebInfo_Enb{Enb: updateEnbRequest.Enb}
 }
 
 func (h *UpdateEnbManager) UpdateNodeb(nodeb *entities.NodebInfo) error {
@@ -106,4 +112,16 @@ func (h *UpdateEnbManager) validateRequestBody(request *models.UpdateEnbRequest)
        }
 
        return nil
-}
\ No newline at end of file
+}
+
+func (h *UpdateEnbManager) ValidateNodeb(nodeb *entities.NodebInfo) error{
+
+       enbType := nodeb.GetEnb().GetEnbType()
+
+       if h.nodebValidator.IsNgEnbType(enbType) {
+               h.logger.Errorf("#UpdateEnbManager.ValidateNodeb - validation failure: current enb type is not supported. enb type: %s", enbType)
+               return errors.New("")
+       }
+       return nil
+}
+