X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fe2t_instances_manager.go;h=f8def48046b08752620ed31d4a6ac2f5df08ec59;hb=refs%2Fchanges%2F36%2F2936%2F1;hp=7f7c379a8e49bbf714cd75e44ec605d05b0a3f5e;hpb=f846c5987cd35da745534e26ac3a22bdcf8b030a;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/managers/e2t_instances_manager.go b/E2Manager/managers/e2t_instances_manager.go index 7f7c379..f8def48 100644 --- a/E2Manager/managers/e2t_instances_manager.go +++ b/E2Manager/managers/e2t_instances_manager.go @@ -45,7 +45,7 @@ type IE2TInstancesManager interface { AddE2TInstance(e2tAddress string) error RemoveE2TInstance(e2tAddress string) error SelectE2TInstance() (string, error) - AddRanToInstance(ranName string, e2tAddress string) error + AddRansToInstance(e2tAddress string, ranNames []string) error RemoveRanFromInstance(ranName string, e2tAddress string) error ResetKeepAliveTimestamp(e2tAddress string) error ClearRansOfAllE2TInstances() error @@ -334,7 +334,7 @@ func (m *E2TInstancesManager) SelectE2TInstance() (string, error) { return min.Address, nil } -func (m *E2TInstancesManager) AddRanToInstance(ranName string, e2tAddress string) error { +func (m *E2TInstancesManager) AddRansToInstance(e2tAddress string, ranNames []string) error { m.mux.Lock() defer m.mux.Unlock() @@ -342,20 +342,20 @@ func (m *E2TInstancesManager) AddRanToInstance(ranName string, e2tAddress string e2tInstance, err := m.rnibDataService.GetE2TInstance(e2tAddress) if err != nil { - m.logger.Errorf("#E2TInstancesManager.AddRanToInstance - E2T Instance address: %s - Failed retrieving E2TInstance. error: %s", e2tAddress, err) + m.logger.Errorf("#E2TInstancesManager.AddRansToInstance - E2T Instance address: %s - Failed retrieving E2TInstance. error: %s", e2tAddress, err) return e2managererrors.NewRnibDbError() } - e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, ranName) + e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, ranNames...) err = m.rnibDataService.SaveE2TInstance(e2tInstance) if err != nil { - m.logger.Errorf("#E2TInstancesManager.AddRanToInstance - E2T Instance address: %s - Failed saving E2TInstance. error: %s", e2tAddress, err) + m.logger.Errorf("#E2TInstancesManager.AddRansToInstance - E2T Instance address: %s - Failed saving E2TInstance. error: %s", e2tAddress, err) return e2managererrors.NewRnibDbError() } - m.logger.Infof("#E2TInstancesManager.AddRanToInstance - RAN %s was added successfully to E2T %s", ranName, e2tInstance.Address) + m.logger.Infof("#E2TInstancesManager.AddRansToInstance - RAN %s were added successfully to E2T %s", ranNames, e2tInstance.Address) return nil } @@ -371,8 +371,8 @@ func (m *E2TInstancesManager) ResetKeepAliveTimestamp(e2tAddress string) error { return err } - if e2tInstance.State == entities.ToBeDeleted || e2tInstance.State == entities.RoutingManagerFailure { - m.logger.Warnf("#E2TInstancesManager.ResetKeepAliveTimestamp - Ignore. This Instance is about to deleted") + if e2tInstance.State == entities.ToBeDeleted { + m.logger.Warnf("#E2TInstancesManager.ResetKeepAliveTimestamp - Ignore. This Instance is about to be deleted") return nil }