X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fhandlers%2Fhttpmsghandlers%2Fdelete_all_request_handler.go;fp=E2Manager%2Fhandlers%2Fhttpmsghandlers%2Fdelete_all_request_handler.go;h=4e4142e6fe0332776f86b65609bb008a5f4e41c5;hb=db0380732b248c2343c95cdd56b33a50b3383d66;hp=975640a613bc8bb65ed0d8e02ab928b5ad3e10b1;hpb=ab8f039d2f4288ceba5d0ce6c95172210fe60776;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/handlers/httpmsghandlers/delete_all_request_handler.go b/E2Manager/handlers/httpmsghandlers/delete_all_request_handler.go
index 975640a..4e4142e 100644
--- a/E2Manager/handlers/httpmsghandlers/delete_all_request_handler.go
+++ b/E2Manager/handlers/httpmsghandlers/delete_all_request_handler.go
@@ -36,24 +36,26 @@ import (
 )
 
 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
 }
 
 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) *DeleteAllRequestHandler {
+func NewDeleteAllRequestHandler(logger *logger.Logger, rmrSender *rmrsender.RmrSender, config *configuration.Configuration, rnibDataService services.RNibDataService, e2tInstancesManager managers.IE2TInstancesManager, rmClient clients.IRoutingManagerClient, ranConnectStatusChangeManager managers.IRanConnectStatusChangeManager) *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,
 	}
 }
 
@@ -195,7 +197,7 @@ func (h *DeleteAllRequestHandler) updateNodebInfoShutDown(node *entities.NodebIn
 		return nil, false
 	}
 
-	err :=  h.updateNodebInfo(node, entities.ConnectionStatus_SHUT_DOWN, false)
+	err := h.updateNodebInfo(node, entities.ConnectionStatus_SHUT_DOWN, false)
 
 	if err != nil {
 		return err, false
@@ -205,19 +207,21 @@ func (h *DeleteAllRequestHandler) updateNodebInfoShutDown(node *entities.NodebIn
 }
 
 func (h *DeleteAllRequestHandler) updateNodebInfo(node *entities.NodebInfo, connectionStatus entities.ConnectionStatus, resetAssociatedE2TAddress bool) error {
-	node.ConnectionStatus = connectionStatus
-
-	if resetAssociatedE2TAddress {
-		node.AssociatedE2TInstanceAddress = ""
-	}
-
-	err := h.rnibDataService.UpdateNodebInfo(node)
 
+	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