X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fe2t_shutdown_manager.go;h=3c88dbd39c072d8b0b7e93dc96d6763e60d3ae69;hb=69f1211bf4b73c8b61ccaf10b75de53a2a6dbc65;hp=628754722d4bcfc82290dfd9c238a3669e72c90b;hpb=4c67d61c4898a775d1280ee6fadd83637317037a;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/managers/e2t_shutdown_manager.go b/E2Manager/managers/e2t_shutdown_manager.go
index 6287547..3c88dbd 100644
--- a/E2Manager/managers/e2t_shutdown_manager.go
+++ b/E2Manager/managers/e2t_shutdown_manager.go
@@ -34,22 +34,22 @@ type IE2TShutdownManager interface {
 }
 
 type E2TShutdownManager struct {
-	logger                *logger.Logger
-	config                *configuration.Configuration
-	rnibDataService       services.RNibDataService
-	e2TInstancesManager   IE2TInstancesManager
-	e2tAssociationManager *E2TAssociationManager
-	kubernetesManager     *KubernetesManager
+	logger                        *logger.Logger
+	config                        *configuration.Configuration
+	rnibDataService               services.RNibDataService
+	e2TInstancesManager           IE2TInstancesManager
+	e2tAssociationManager         *E2TAssociationManager
+	ranConnectStatusChangeManager IRanConnectStatusChangeManager
 }
 
-func NewE2TShutdownManager(logger *logger.Logger, config *configuration.Configuration, rnibDataService services.RNibDataService, e2TInstancesManager IE2TInstancesManager, e2tAssociationManager *E2TAssociationManager, kubernetes *KubernetesManager) *E2TShutdownManager {
+func NewE2TShutdownManager(logger *logger.Logger, config *configuration.Configuration, rnibDataService services.RNibDataService, e2TInstancesManager IE2TInstancesManager, e2tAssociationManager *E2TAssociationManager, ranConnectStatusChangeManager IRanConnectStatusChangeManager) *E2TShutdownManager {
 	return &E2TShutdownManager{
-		logger:                logger,
-		config:                config,
-		rnibDataService:       rnibDataService,
-		e2TInstancesManager:   e2TInstancesManager,
-		e2tAssociationManager: e2tAssociationManager,
-		kubernetesManager:     kubernetes,
+		logger:                        logger,
+		config:                        config,
+		rnibDataService:               rnibDataService,
+		e2TInstancesManager:           e2TInstancesManager,
+		e2tAssociationManager:         e2tAssociationManager,
+		ranConnectStatusChangeManager: ranConnectStatusChangeManager,
 	}
 }
 
@@ -62,8 +62,6 @@ func (m E2TShutdownManager) Shutdown(e2tInstance *entities.E2TInstance) error {
 		return nil
 	}
 
-	//go m.kubernetesManager.DeletePod(e2tInstance.PodName)
-
 	err := m.markE2tInstanceToBeDeleted(e2tInstance)
 	if err != nil {
 		m.logger.Errorf("#E2TShutdownManager.Shutdown - Failed to mark E2T %s as 'ToBeDeleted'.", e2tInstance.Address)
@@ -97,12 +95,16 @@ func (m E2TShutdownManager) clearNodebsAssociation(ranNamesToBeDissociated []str
 			}
 			return err
 		}
-		nodeb.AssociatedE2TInstanceAddress = ""
-		nodeb.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED
 
+		_, err = m.ranConnectStatusChangeManager.ChangeStatus(nodeb, entities.ConnectionStatus_DISCONNECTED)
+		if err != nil {
+			return err
+		}
+
+		nodeb.AssociatedE2TInstanceAddress = ""
 		err = m.rnibDataService.UpdateNodebInfo(nodeb)
 		if err != nil {
-			m.logger.Errorf("#E2TShutdownManager.associateAndSetupNodebs - Failed to save nodeb %s from db.", ranName)
+			m.logger.Errorf("#E2TShutdownManager.clearNodebsAssociation - Failed to save nodeb %s to db.", ranName)
 			return err
 		}
 	}