X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=E2Manager%2Fmanagers%2Fran_disconnection_manager.go;h=aeb91bb9b3c45e6521d37f47f9e0d892c5246b38;hb=ab8f039d2f4288ceba5d0ce6c95172210fe60776;hp=c34e5285e62c795a67efb1377622fa9dcdd72199;hpb=a75da9a56d61ca4754650d44a54bbf0b04f610d1;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/managers/ran_disconnection_manager.go b/E2Manager/managers/ran_disconnection_manager.go
index c34e528..aeb91bb 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,19 +59,16 @@ 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
 	}
 
-	nodebInfo.ConnectionAttempts = 0;
-
 	if connectionStatus == entities.ConnectionStatus_SHUTTING_DOWN {
-		return m.updateNodebInfo(nodebInfo, entities.ConnectionStatus_SHUT_DOWN)
+		return m.ranConnectStatusChangeManager.ChangeStatus(nodebInfo, entities.ConnectionStatus_SHUT_DOWN)
 	}
 
-	err = m.updateNodebInfo(nodebInfo, entities.ConnectionStatus_DISCONNECTED)
+	err = m.ranConnectStatusChangeManager.ChangeStatus(nodebInfo, entities.ConnectionStatus_DISCONNECTED)
 
 	if err != nil {
 		return err
@@ -82,7 +80,7 @@ func (m *RanDisconnectionManager) DisconnectRan(inventoryName string) error {
 
 func (m *RanDisconnectionManager) updateNodebInfo(nodebInfo *entities.NodebInfo, connectionStatus entities.ConnectionStatus) error {
 
-	nodebInfo.ConnectionStatus = connectionStatus;
+	nodebInfo.ConnectionStatus = connectionStatus
 	err := m.rnibDataService.UpdateNodebInfo(nodebInfo)
 
 	if err != nil {