X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fe2t_shutdown_manager.go;h=2b82d3a83f8a3dc8a8be36707c06fe2f85a0bd21;hb=197657e0e814c871b903ef779ad654b13347e430;hp=2bb5d0f11281d9d1070a7c4cb630cc8dbc1407da;hpb=a75da9a56d61ca4754650d44a54bbf0b04f610d1;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/managers/e2t_shutdown_manager.go b/E2Manager/managers/e2t_shutdown_manager.go
index 2bb5d0f..2b82d3a 100644
--- a/E2Manager/managers/e2t_shutdown_manager.go
+++ b/E2Manager/managers/e2t_shutdown_manager.go
@@ -34,20 +34,24 @@ type IE2TShutdownManager interface {
 }
 
 type E2TShutdownManager struct {
-	logger                *logger.Logger
-	config                *configuration.Configuration
-	rnibDataService       services.RNibDataService
-	e2TInstancesManager   IE2TInstancesManager
-	e2tAssociationManager *E2TAssociationManager
+	logger                        *logger.Logger
+	config                        *configuration.Configuration
+	rnibDataService               services.RNibDataService
+	e2TInstancesManager           IE2TInstancesManager
+	e2tAssociationManager         *E2TAssociationManager
+	kubernetesManager             *KubernetesManager
+	ranConnectStatusChangeManager IRanConnectStatusChangeManager
 }
 
-func NewE2TShutdownManager(logger *logger.Logger, config *configuration.Configuration, rnibDataService services.RNibDataService, e2TInstancesManager IE2TInstancesManager, e2tAssociationManager *E2TAssociationManager) *E2TShutdownManager {
+func NewE2TShutdownManager(logger *logger.Logger, config *configuration.Configuration, rnibDataService services.RNibDataService, e2TInstancesManager IE2TInstancesManager, e2tAssociationManager *E2TAssociationManager, kubernetes *KubernetesManager, ranConnectStatusChangeManager IRanConnectStatusChangeManager) *E2TShutdownManager {
 	return &E2TShutdownManager{
-		logger:                logger,
-		config:                config,
-		rnibDataService:       rnibDataService,
-		e2TInstancesManager:   e2TInstancesManager,
-		e2tAssociationManager: e2tAssociationManager,
+		logger:                        logger,
+		config:                        config,
+		rnibDataService:               rnibDataService,
+		e2TInstancesManager:           e2TInstancesManager,
+		e2tAssociationManager:         e2tAssociationManager,
+		kubernetesManager:             kubernetes,
+		ranConnectStatusChangeManager: ranConnectStatusChangeManager,
 	}
 }
 
@@ -60,6 +64,8 @@ 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)
@@ -78,7 +84,6 @@ func (m E2TShutdownManager) Shutdown(e2tInstance *entities.E2TInstance) error {
 		return err
 	}
 
-
 	m.logger.Infof("#E2TShutdownManager.Shutdown - E2T %s was shutdown successfully.", e2tInstance.Address)
 	return nil
 }
@@ -94,12 +99,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
 		}
 	}