X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fe2t_instances_manager.go;h=1887cd75db61133d7d0b0213cba88221054cf73a;hb=071419a702d7642a4d20b662c0219fdda0c80d1c;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..1887cd7 100644
--- a/E2Manager/managers/e2t_instances_manager.go
+++ b/E2Manager/managers/e2t_instances_manager.go
@@ -42,10 +42,10 @@ 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)
-	AddRanToInstance(ranName string, e2tAddress string) error
+	AddRansToInstance(e2tAddress string, ranNames []string) error
 	RemoveRanFromInstance(ranName string, e2tAddress string) error
 	ResetKeepAliveTimestamp(e2tAddress string) error
 	ClearRansOfAllE2TInstances() 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
 }
 
@@ -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
 
 	}
@@ -399,13 +399,13 @@ func (m *E2TInstancesManager) SetE2tInstanceState(e2tAddress string, currentStat
 		return e2managererrors.NewRnibDbError()
 	}
 
-	if (currentState != e2tInstance.State) {
+	if currentState != e2tInstance.State {
 		m.logger.Warnf("#E2TInstancesManager.SetE2tInstanceState - E2T Instance address: %s - Current state is not: %s", e2tAddress, currentState)
 		return e2managererrors.NewInternalError()
 	}
 
 	e2tInstance.State = newState
-	if (newState == entities.Active) {
+	if newState == entities.Active {
 		e2tInstance.KeepAliveTimestamp = time.Now().UnixNano()
 	}