X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fran_disconnection_manager.go;h=8d30eec69eeda761aabbe73451a5097568ec601a;hb=1dd3ab9b385a97aad0f4c48671b3091287baeef5;hp=ce6d62ecf6331711fbf2e4e0a610bd16c3e9e930;hpb=3ae760f4378ea43575eca6e83ccc01084566e7cf;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/managers/ran_disconnection_manager.go b/E2Manager/managers/ran_disconnection_manager.go
index ce6d62e..8d30eec 100644
--- a/E2Manager/managers/ran_disconnection_manager.go
+++ b/E2Manager/managers/ran_disconnection_manager.go
@@ -31,19 +31,20 @@ type IRanDisconnectionManager interface {
 }
 
 type RanDisconnectionManager struct {
-	logger                *logger.Logger
-	config                *configuration.Configuration
-	rnibDataService       services.RNibDataService
-	ranSetupManager       *RanSetupManager
-	e2tAssociationManager *E2TAssociationManager
+	logger                        *logger.Logger
+	config                        *configuration.Configuration
+	rnibDataService               services.RNibDataService
+	e2tAssociationManager         *E2TAssociationManager
+	ranConnectStatusChangeManager IRanConnectStatusChangeManager
 }
 
-func NewRanDisconnectionManager(logger *logger.Logger, config *configuration.Configuration, rnibDataService services.RNibDataService, e2tAssociationManager *E2TAssociationManager) *RanDisconnectionManager {
+func NewRanDisconnectionManager(logger *logger.Logger, config *configuration.Configuration, rnibDataService services.RNibDataService, e2tAssociationManager *E2TAssociationManager, ranConnectStatusChangeManager IRanConnectStatusChangeManager) *RanDisconnectionManager {
 	return &RanDisconnectionManager{
-		logger:                logger,
-		config:                config,
-		rnibDataService:       rnibDataService,
-		e2tAssociationManager: e2tAssociationManager,
+		logger:                        logger,
+		config:                        config,
+		rnibDataService:               rnibDataService,
+		e2tAssociationManager:         e2tAssociationManager,
+		ranConnectStatusChangeManager: ranConnectStatusChangeManager,
 	}
 }
 
@@ -58,17 +59,17 @@ func (m *RanDisconnectionManager) DisconnectRan(inventoryName string) error {
 	connectionStatus := nodebInfo.GetConnectionStatus()
 	m.logger.Infof("#RanDisconnectionManager.DisconnectRan - RAN name: %s - RAN's connection status: %s", nodebInfo.RanName, connectionStatus)
 
-
 	if connectionStatus == entities.ConnectionStatus_SHUT_DOWN {
 		m.logger.Warnf("#RanDisconnectionManager.DisconnectRan - RAN name: %s - quit. RAN's connection status is SHUT_DOWN", nodebInfo.RanName)
 		return nil
 	}
 
 	if connectionStatus == entities.ConnectionStatus_SHUTTING_DOWN {
-		return m.updateNodebInfo(nodebInfo, entities.ConnectionStatus_SHUT_DOWN)
+		_, err = m.ranConnectStatusChangeManager.ChangeStatus(nodebInfo, entities.ConnectionStatus_SHUT_DOWN)
+		return err
 	}
 
-	err = m.updateNodebInfo(nodebInfo, entities.ConnectionStatus_DISCONNECTED)
+	_, err = m.ranConnectStatusChangeManager.ChangeStatus(nodebInfo, entities.ConnectionStatus_DISCONNECTED)
 
 	if err != nil {
 		return err
@@ -77,17 +78,3 @@ func (m *RanDisconnectionManager) DisconnectRan(inventoryName string) error {
 	e2tAddress := nodebInfo.AssociatedE2TInstanceAddress
 	return m.e2tAssociationManager.DissociateRan(e2tAddress, nodebInfo.RanName)
 }
-
-func (m *RanDisconnectionManager) updateNodebInfo(nodebInfo *entities.NodebInfo, connectionStatus entities.ConnectionStatus) error {
-
-	nodebInfo.ConnectionStatus = connectionStatus;
-	err := m.rnibDataService.UpdateNodebInfo(nodebInfo)
-
-	if err != nil {
-		m.logger.Errorf("#RanDisconnectionManager.updateNodebInfo - RAN name: %s - Failed updating RAN's connection status to %s in rNib. Error: %v", nodebInfo.RanName, connectionStatus, err)
-		return err
-	}
-
-	m.logger.Infof("#RanDisconnectionManager.updateNodebInfo - RAN name: %s - Successfully updated rNib. RAN's current connection status: %s", nodebInfo.RanName, nodebInfo.ConnectionStatus)
-	return nil
-}