}
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,
}
}
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)
return err
}
-
m.logger.Infof("#E2TShutdownManager.Shutdown - E2T %s was shutdown successfully.", e2tInstance.Address)
return nil
}
}
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
}
}