X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fe2t_shutdown_manager.go;h=628754722d4bcfc82290dfd9c238a3669e72c90b;hb=13ced50827996f6d49f5af7a64247466cda046e2;hp=2bb5d0f11281d9d1070a7c4cb630cc8dbc1407da;hpb=011bb9161ca8e7ad0d0cf282b818672a88a5dfbf;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/managers/e2t_shutdown_manager.go b/E2Manager/managers/e2t_shutdown_manager.go index 2bb5d0f..6287547 100644 --- a/E2Manager/managers/e2t_shutdown_manager.go +++ b/E2Manager/managers/e2t_shutdown_manager.go @@ -39,15 +39,17 @@ type E2TShutdownManager struct { rnibDataService services.RNibDataService e2TInstancesManager IE2TInstancesManager e2tAssociationManager *E2TAssociationManager + kubernetesManager *KubernetesManager } -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) *E2TShutdownManager { return &E2TShutdownManager{ logger: logger, config: config, rnibDataService: rnibDataService, e2TInstancesManager: e2TInstancesManager, e2tAssociationManager: e2tAssociationManager, + kubernetesManager: kubernetes, } } @@ -60,6 +62,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 +82,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 }