[RIC-587] Update E2 Setup existing nodeb behavior

[ric-plt/e2mgr.git] / E2Manager / managers / e2t_shutdown_manager.go

diff --git a/E2Manager/managers/e2t_shutdown_manager.go b/E2Manager/managers/e2t_shutdown_manager.go
index 2b82d3a..3c88dbd 100644 (file)
--- a/E2Manager/managers/e2t_shutdown_manager.go
+++ b/E2Manager/managers/e2t_shutdown_manager.go
@@ -39,18 +39,16 @@ type E2TShutdownManager struct {
        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, kubernetes *KubernetesManager, ranConnectStatusChangeManager IRanConnectStatusChangeManager) *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,
                ranConnectStatusChangeManager: ranConnectStatusChangeManager,
        }
 }
@@ -64,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)
@@ -100,7 +96,7 @@ func (m E2TShutdownManager) clearNodebsAssociation(ranNamesToBeDissociated []str
                        return err
                }
 
-               err = m.ranConnectStatusChangeManager.ChangeStatus(nodeb, entities.ConnectionStatus_DISCONNECTED)
+               _, err = m.ranConnectStatusChangeManager.ChangeStatus(nodeb, entities.ConnectionStatus_DISCONNECTED)
                if err != nil {
                        return err
                }