X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fe2t_instances_manager.go;h=74f6a5188345eef4657762594783d3955853ae84;hb=a96d143507d5c3366188e8c96076c552f25ef7ac;hp=18734733773d83e041f716d9394a3ae354f27bb0;hpb=e4f4427a1dfde7ac6fa5656496627ad88f82a1a6;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/managers/e2t_instances_manager.go b/E2Manager/managers/e2t_instances_manager.go
index 1873473..74f6a51 100644
--- a/E2Manager/managers/e2t_instances_manager.go
+++ b/E2Manager/managers/e2t_instances_manager.go
@@ -79,8 +79,10 @@ func (m *E2TInstancesManager) GetE2TInstancesNoLogs() ([]*entities.E2TInstance,
 
 		if !ok {
 			m.logger.Errorf("#E2TInstancesManager.GetE2TInstancesNoLogs - Failed retrieving E2T addresses. error: %s", err)
+			return nil, e2managererrors.NewRnibDbError()
 		}
-		return nil, err
+
+		return []*entities.E2TInstance{}, nil
 	}
 
 	if len(e2tAddresses) == 0 {
@@ -105,8 +107,16 @@ func (m *E2TInstancesManager) GetE2TInstances() ([]*entities.E2TInstance, error)
 	e2tAddresses, err := m.rnibDataService.GetE2TAddresses()
 
 	if err != nil {
-		m.logger.Errorf("#E2TInstancesManager.GetE2TInstances - Failed retrieving E2T addresses. error: %s", err)
-		return nil, err
+
+		_, ok := err.(*common.ResourceNotFoundError)
+
+		if !ok {
+			m.logger.Errorf("#E2TInstancesManager.GetE2TInstances - Failed retrieving E2T addresses. error: %s", err)
+			return nil, e2managererrors.NewRnibDbError()
+		}
+
+		m.logger.Infof("#E2TInstancesManager.GetE2TInstances - Empty E2T addresses list")
+		return []*entities.E2TInstance{}, nil
 	}
 
 	if len(e2tAddresses) == 0 {
@@ -118,7 +128,7 @@ func (m *E2TInstancesManager) GetE2TInstances() ([]*entities.E2TInstance, error)
 
 	if err != nil {
 		m.logger.Errorf("#E2TInstancesManager.GetE2TInstances - Failed retrieving E2T instances list. error: %s", err)
-		return e2tInstances, err
+		return e2tInstances, e2managererrors.NewRnibDbError()
 	}
 
 	if len(e2tInstances) == 0 {
@@ -255,7 +265,7 @@ func (m *E2TInstancesManager) SelectE2TInstance() (string, error) {
 	e2tInstances, err := m.GetE2TInstances()
 
 	if err != nil {
-		return "", e2managererrors.NewRnibDbError()
+		return "", err
 	}
 
 	if len(e2tInstances) == 0 {