X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=E2Manager%2Fmanagers%2Fe2t_instances_manager.go;h=d4bff658ce75eb42f738670f58c429cce298e944;hb=622ede7fa6952e84a311654683d8eccc6f0eed25;hp=267c778af0d0b7e4c15af0040657cc477d764bb7;hpb=d1972d0d82bd0f231a66b39adccd20d8e4829729;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/managers/e2t_instances_manager.go b/E2Manager/managers/e2t_instances_manager.go
index 267c778..d4bff65 100644
--- a/E2Manager/managers/e2t_instances_manager.go
+++ b/E2Manager/managers/e2t_instances_manager.go
@@ -1,9 +1,26 @@
+//
+// Copyright 2019 AT&T Intellectual Property
+// Copyright 2019 Nokia
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
 package managers
 
 import (
+	"e2mgr/e2managererrors"
 	"e2mgr/logger"
 	"e2mgr/services"
-	"fmt"
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
 	"math"
@@ -37,7 +54,14 @@ func (m *E2TInstancesManager) GetE2TInstance(e2tAddress string) (*entities.E2TIn
 	e2tInstance, err := m.rnibDataService.GetE2TInstance(e2tAddress)
 
 	if err != nil {
-		m.logger.Errorf("#GetE2TInstance - E2T Instance address: %s - Failed retrieving E2TInstance. error: %s", e2tAddress, err)
+
+		_, ok := err.(*common.ResourceNotFoundError)
+
+		if !ok {
+			m.logger.Errorf("#GetE2TInstance - E2T Instance address: %s - Failed retrieving E2TInstance. error: %s", e2tAddress, err)
+		} else {
+			m.logger.Infof("#GetE2TInstance - E2T Instance address: %s not found on DB", e2tAddress)
+		}
 	}
 
 	return e2tInstance, err
@@ -69,7 +93,6 @@ func (m *E2TInstancesManager) GetE2TInstances() ([]*entities.E2TInstance, error)
 	}
 
 	return e2tInstances, nil
-
 }
 
 func findActiveE2TInstanceWithMinimumAssociatedRans(e2tInstances []*entities.E2TInstance) *entities.E2TInstance {
@@ -88,11 +111,6 @@ func findActiveE2TInstanceWithMinimumAssociatedRans(e2tInstances []*entities.E2T
 
 func (m *E2TInstancesManager) AddE2TInstance(e2tAddress string) error {
 
-	if len(e2tAddress) == 0 {
-		m.logger.Errorf("#AddE2TInstance - Empty E2T address received")
-		return fmt.Errorf("empty E2T address")
-	}
-
 	e2tInstance := entities.NewE2TInstance(e2tAddress)
 	err := m.rnibDataService.SaveE2TInstance(e2tInstance)
 
@@ -125,7 +143,7 @@ func (m *E2TInstancesManager) AddE2TInstance(e2tAddress string) error {
 		return err
 	}
 
-	m.logger.Infof("#AddE2TInstance - E2T Instance address: %s - successfully completed", e2tInstance.Address)
+	m.logger.Infof("#AddE2TInstance - E2T Instance address: %s - successfully added E2T instance", e2tInstance.Address)
 	return nil
 }
 
@@ -159,6 +177,7 @@ func (m *E2TInstancesManager) DissociateRan(ranName string, e2tAddress string) e
 		return err
 	}
 
+	m.logger.Infof("#DissociateRan - successfully dissociated RAN %s from E2T %s", ranName, e2tInstance.Address)
 	return nil
 }
 
@@ -170,23 +189,23 @@ func (m *E2TInstancesManager) SelectE2TInstance() (string, error) {
 	e2tInstances, err := m.GetE2TInstances()
 
 	if err != nil {
-		//TODO: handle
-		return "", err
+		m.logger.Errorf("#E2TInstancesManager.SelectE2TInstance - failed retrieving E2T instances. error: %s", err)
+		return "", e2managererrors.NewRnibDbError()
 	}
 
 	if len(e2tInstances) == 0 {
-		//TODO: handle
-		return "", err
+		m.logger.Errorf("#E2TInstancesManager.SelectE2TInstance - No E2T instance found")
+		return "", e2managererrors.NewE2TInstanceAbsenceError()
 	}
 
 	min := findActiveE2TInstanceWithMinimumAssociatedRans(e2tInstances)
 
 	if min == nil {
 		m.logger.Errorf("#SelectE2TInstance - No active E2T instance found")
-		//TODO: handle
-		return "", fmt.Errorf("No active E2T instance found")
+		return "", e2managererrors.NewE2TInstanceAbsenceError()
 	}
 
+	m.logger.Infof("#SelectE2TInstance - successfully selected E2T instance. address: %s", min.Address)
 	return min.Address, nil
 }
 
@@ -199,7 +218,7 @@ func (m *E2TInstancesManager) AssociateRan(ranName string, e2tAddress string) er
 
 	if err != nil {
 		m.logger.Errorf("#AssociateRan - E2T Instance address: %s - Failed retrieving E2TInstance. error: %s", e2tAddress, err)
-		return err
+		return e2managererrors.NewRnibDbError()
 	}
 
 	e2tInstance.AssociatedRanList = append(e2tInstance.AssociatedRanList, ranName)
@@ -208,8 +227,9 @@ func (m *E2TInstancesManager) AssociateRan(ranName string, e2tAddress string) er
 
 	if err != nil {
 		m.logger.Errorf("#AssociateRan - E2T Instance address: %s - Failed saving E2TInstance. error: %s", e2tAddress, err)
-		return err
+		return e2managererrors.NewRnibDbError()
 	}
 
+	m.logger.Infof("#AssociateRan - successfully associated RAN %s with E2T %s", ranName, e2tInstance.Address)
 	return nil
 }