X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fe2t_instances_manager.go;h=982524cd24a73cb0ac77051f63c510ebb092d398;hb=76709204dfd7968156b5fa81190f146a8991812d;hp=d4cc3d8cb645977ff57ac7f5739500db8f8b7490;hpb=380b7a2a46087a054ebfac57f3dbf7949d318cc6;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/managers/e2t_instances_manager.go b/E2Manager/managers/e2t_instances_manager.go index d4cc3d8..982524c 100644 --- a/E2Manager/managers/e2t_instances_manager.go +++ b/E2Manager/managers/e2t_instances_manager.go @@ -42,7 +42,7 @@ type IE2TInstancesManager interface { GetE2TInstance(e2tAddress string) (*entities.E2TInstance, error) GetE2TInstances() ([]*entities.E2TInstance, error) GetE2TInstancesNoLogs() ([]*entities.E2TInstance, error) - AddE2TInstance(e2tAddress string) error + AddE2TInstance(e2tAddress string, podName string) error RemoveE2TInstance(e2tAddress string) error SelectE2TInstance() (string, error) AddRansToInstance(e2tAddress string, ranNames []string) error @@ -198,12 +198,12 @@ func findActiveE2TInstanceWithMinimumAssociatedRans(e2tInstances []*entities.E2T return minInstance } -func (m *E2TInstancesManager) AddE2TInstance(e2tAddress string) error { +func (m *E2TInstancesManager) AddE2TInstance(e2tAddress string, podName string) error { m.mux.Lock() defer m.mux.Unlock() - e2tInstance := entities.NewE2TInstance(e2tAddress) + e2tInstance := entities.NewE2TInstance(e2tAddress, podName) err := m.rnibDataService.SaveE2TInstance(e2tInstance) if err != nil { @@ -232,7 +232,7 @@ func (m *E2TInstancesManager) AddE2TInstance(e2tAddress string) error { return err } - m.logger.Infof("#E2TInstancesManager.AddE2TInstance - E2T Instance address: %s - successfully added E2T instance", e2tInstance.Address) + m.logger.Infof("#E2TInstancesManager.AddE2TInstance - E2T Instance address: %s, pod name: %s - successfully added E2T instance", e2tInstance.Address, e2tInstance.PodName) return nil } @@ -371,7 +371,7 @@ func (m *E2TInstancesManager) ResetKeepAliveTimestamp(e2tAddress string) error { return err } - if e2tInstance.State == entities.ToBeDeleted || e2tInstance.State == entities.RoutingManagerFailure { + if e2tInstance.State == entities.ToBeDeleted { m.logger.Warnf("#E2TInstancesManager.ResetKeepAliveTimestamp - Ignore. This Instance is about to be deleted") return nil