[RIC-584] - Validate setup from network and antenna type in ENB REST APIs

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

diff --git a/E2Manager/handlers/httpmsghandlers/delete_all_request_handler.go b/E2Manager/handlers/httpmsghandlers/delete_all_request_handler.go
index 869890a..e53c636 100644 (file)
--- a/E2Manager/handlers/httpmsghandlers/delete_all_request_handler.go
+++ b/E2Manager/handlers/httpmsghandlers/delete_all_request_handler.go
@@ -30,31 +30,39 @@ import (
        "e2mgr/rmrCgo"
        "e2mgr/services"
        "e2mgr/services/rmrsender"
+       "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
        "time"
 )
 
 type DeleteAllRequestHandler struct {
-       rnibDataService     services.RNibDataService
-       rmrSender           *rmrsender.RmrSender
-       config              *configuration.Configuration
-       logger              *logger.Logger
-       e2tInstancesManager managers.IE2TInstancesManager
-       rmClient            clients.IRoutingManagerClient
+       rnibDataService               services.RNibDataService
+       rmrSender                     *rmrsender.RmrSender
+       config                        *configuration.Configuration
+       logger                        *logger.Logger
+       e2tInstancesManager           managers.IE2TInstancesManager
+       rmClient                      clients.IRoutingManagerClient
+       ranConnectStatusChangeManager managers.IRanConnectStatusChangeManager
+       ranListManager                managers.RanListManager
 }
 
-func NewDeleteAllRequestHandler(logger *logger.Logger, rmrSender *rmrsender.RmrSender, config *configuration.Configuration, rnibDataService services.RNibDataService, e2tInstancesManager managers.IE2TInstancesManager, rmClient clients.IRoutingManagerClient) *DeleteAllRequestHandler {
+const PartialSuccessDueToRmErrorMessage = "Operation succeeded except for routing manager outbound call"
+
+func NewDeleteAllRequestHandler(logger *logger.Logger, rmrSender *rmrsender.RmrSender, config *configuration.Configuration, rnibDataService services.RNibDataService, e2tInstancesManager managers.IE2TInstancesManager, rmClient clients.IRoutingManagerClient, ranConnectStatusChangeManager managers.IRanConnectStatusChangeManager, ranListManager managers.RanListManager) *DeleteAllRequestHandler {
        return &DeleteAllRequestHandler{
-               logger:              logger,
-               rnibDataService:     rnibDataService,
-               rmrSender:           rmrSender,
-               config:              config,
-               e2tInstancesManager: e2tInstancesManager,
-               rmClient:            rmClient,
+               logger:                        logger,
+               rnibDataService:               rnibDataService,
+               rmrSender:                     rmrSender,
+               config:                        config,
+               e2tInstancesManager:           e2tInstancesManager,
+               rmClient:                      rmClient,
+               ranConnectStatusChangeManager: ranConnectStatusChangeManager,
+               ranListManager:                ranListManager,
        }
 }
 
 func (h *DeleteAllRequestHandler) Handle(request models.Request) (models.IResponse, error) {
+       h.logger.Infof("#DeleteAllRequestHandler.Handle - handling shutdown request")
 
        e2tAddresses, err := h.e2tInstancesManager.GetE2TAddresses()
 
@@ -73,7 +81,7 @@ func (h *DeleteAllRequestHandler) Handle(request models.Request) (models.IRespon
                h.logger.Warnf("#DeleteAllRequestHandler.Handle - routing manager failure. continue flow.")
        }
 
-       err, allRansAreShutDown := h.updateNodebs(h.updateNodebInfoShuttingDown)
+       err, updatedAtLeastOnce := h.updateNodebs(h.updateNodebInfoShuttingDown)
 
        if err != nil {
                return nil, err
@@ -94,10 +102,11 @@ func (h *DeleteAllRequestHandler) Handle(request models.Request) (models.IRespon
                return nil, e2managererrors.NewRmrError()
        }
 
-       if allRansAreShutDown {
+       if !updatedAtLeastOnce {
+               h.logger.Infof("#DeleteAllRequestHandler.Handle - DB wasn't updated, not activating timer")
 
                if dissocErr != nil {
-                       return models.NewRedButtonPartialSuccessResponseModel("Operation succeeded, except Routing Manager failure"), nil
+                       return models.NewRedButtonPartialSuccessResponseModel(PartialSuccessDueToRmErrorMessage), nil
                }
 
                return nil, nil
@@ -113,84 +122,102 @@ func (h *DeleteAllRequestHandler) Handle(request models.Request) (models.IRespon
        }
 
        if dissocErr != nil {
-               return models.NewRedButtonPartialSuccessResponseModel("Operation succeeded, except Routing Manager failure"), nil
+               return models.NewRedButtonPartialSuccessResponseModel(PartialSuccessDueToRmErrorMessage), nil
        }
 
        return nil, nil
 }
 
-func (h *DeleteAllRequestHandler) updateNodebs(updateCb func(node *entities.NodebInfo) error) (error, bool) {
-       nbIdentityList, err := h.rnibDataService.GetListNodebIds()
-
-       if err != nil {
-               h.logger.Errorf("#DeleteAllRequestHandler.updateNodebs - failed to get nodes list from rNib. Error: %s", err)
-               return e2managererrors.NewRnibDbError(), false
-       }
-
-       allRansAreShutdown := true
+func (h *DeleteAllRequestHandler) updateNodebs(updateCb func(node *entities.NodebInfo) (error, bool)) (error, bool) {
+       nbIdentityList := h.ranListManager.GetNbIdentityList()
+       updatedAtLeastOnce := false
 
        for _, nbIdentity := range nbIdentityList {
                node, err := h.rnibDataService.GetNodeb(nbIdentity.InventoryName)
 
                if err != nil {
-                       h.logger.Errorf("#DeleteAllRequestHandler.updateNodebs - failed to get nodeB entity for ran name: %s from rNib. error: %s", nbIdentity.InventoryName, err)
-                       return e2managererrors.NewRnibDbError(), false
-               }
+                       _, ok := err.(*common.ResourceNotFoundError)
 
-               if node.ConnectionStatus != entities.ConnectionStatus_SHUT_DOWN {
-                       allRansAreShutdown = false
+                       if !ok {
+                               h.logger.Errorf("#DeleteAllRequestHandler.updateNodebs - failed to get nodeB entity for ran name: %s from rNib. error: %s", nbIdentity.InventoryName, err)
+                               return e2managererrors.NewRnibDbError(), false
+                       }
+                       continue
                }
 
-               err = updateCb(node)
+               err, updated := updateCb(node)
 
                if err != nil {
                        return err, false
                }
-       }
 
-       return nil, allRansAreShutdown
+               if updated {
+                       updatedAtLeastOnce = true
+               }
+       }
 
+       return nil, updatedAtLeastOnce
 }
 
-func (h *DeleteAllRequestHandler) updateNodebInfoForceShutdown(node *entities.NodebInfo) error {
-       return h.updateNodebInfo(node, entities.ConnectionStatus_SHUT_DOWN, true)
+func (h *DeleteAllRequestHandler) updateNodebInfoForceShutdown(node *entities.NodebInfo) (error, bool) {
+       err := h.updateNodebInfo(node, entities.ConnectionStatus_SHUT_DOWN, true)
+
+       if err != nil {
+               return err, false
+       }
+
+       return nil, true
 }
 
-func (h *DeleteAllRequestHandler) updateNodebInfoShuttingDown(node *entities.NodebInfo) error {
+func (h *DeleteAllRequestHandler) updateNodebInfoShuttingDown(node *entities.NodebInfo) (error, bool) {
        if node.ConnectionStatus == entities.ConnectionStatus_SHUT_DOWN {
-               return nil
+               return nil, false
+       }
+
+       err := h.updateNodebInfo(node, entities.ConnectionStatus_SHUTTING_DOWN, true)
+
+       if err != nil {
+               return err, false
        }
 
-       return h.updateNodebInfo(node, entities.ConnectionStatus_SHUTTING_DOWN, true)
+       return nil, true
 }
 
-func (h *DeleteAllRequestHandler) updateNodebInfoShutDown(node *entities.NodebInfo) error {
+func (h *DeleteAllRequestHandler) updateNodebInfoShutDown(node *entities.NodebInfo) (error, bool) {
        if node.ConnectionStatus == entities.ConnectionStatus_SHUT_DOWN {
-               return nil
+               return nil, false
        }
 
        if node.ConnectionStatus != entities.ConnectionStatus_SHUTTING_DOWN {
                h.logger.Warnf("#DeleteAllRequestHandler.updateNodebInfoShutDown - RAN name: %s - ignore, status is not Shutting Down", node.RanName)
-               return nil
+               return nil, false
        }
 
-       return h.updateNodebInfo(node, entities.ConnectionStatus_SHUT_DOWN, false)
-}
-
-func (h *DeleteAllRequestHandler) updateNodebInfo(node *entities.NodebInfo, connectionStatus entities.ConnectionStatus, resetAssociatedE2TAddress bool) error {
-       node.ConnectionStatus = connectionStatus
+       err := h.updateNodebInfo(node, entities.ConnectionStatus_SHUT_DOWN, false)
 
-       if resetAssociatedE2TAddress {
-               node.AssociatedE2TInstanceAddress = ""
+       if err != nil {
+               return err, false
        }
 
-       err := h.rnibDataService.UpdateNodebInfo(node)
+       return nil, true
+}
+
+func (h *DeleteAllRequestHandler) updateNodebInfo(node *entities.NodebInfo, connectionStatus entities.ConnectionStatus, resetAssociatedE2TAddress bool) error {
 
+       _, err := h.ranConnectStatusChangeManager.ChangeStatus(node, connectionStatus)
        if err != nil {
-               h.logger.Errorf("#DeleteAllRequestHandler.updateNodebInfo - RAN name: %s - failed updating nodeB entity in rNib. error: %s", node.RanName, err)
                return e2managererrors.NewRnibDbError()
        }
 
+       if resetAssociatedE2TAddress {
+               node.AssociatedE2TInstanceAddress = ""
+
+               err = h.rnibDataService.UpdateNodebInfo(node)
+               if err != nil {
+                       h.logger.Errorf("#DeleteAllRequestHandler.updateNodebInfo - RAN name: %s - failed updating nodeB entity in rNib. error: %s", node.RanName, err)
+                       return e2managererrors.NewRnibDbError()
+               }
+       }
        h.logger.Infof("#DeleteAllRequestHandler.updateNodebInfo - RAN name: %s, connection status: %s", node.RanName, connectionStatus)
        return nil