X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fe2t_association_manager.go;h=e313c191efdabcd668fbe04fda189ff9e83f3bcf;hb=1f62f4c6e2746153275b6c3b1e24a705e25b90c0;hp=78ae6d767af6775bc64c8242bd14b549cb26c471;hpb=11768a2e58fa729372fb99d30bdc66b1fa252be3;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/managers/e2t_association_manager.go b/E2Manager/managers/e2t_association_manager.go
index 78ae6d7..e313c19 100644
--- a/E2Manager/managers/e2t_association_manager.go
+++ b/E2Manager/managers/e2t_association_manager.go
@@ -23,6 +23,7 @@ import (
 	"e2mgr/clients"
 	"e2mgr/logger"
 	"e2mgr/services"
+	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
 )
 
 type E2TAssociationManager struct {
@@ -41,7 +42,8 @@ func NewE2TAssociationManager(logger *logger.Logger, rnibDataService services.RN
 	}
 }
 
-func (m *E2TAssociationManager) AssociateRan(e2tAddress string, ranName string) error {
+func (m *E2TAssociationManager) AssociateRan(e2tAddress string, nodebInfo *entities.NodebInfo) error {
+	ranName := nodebInfo.RanName
 	m.logger.Infof("#E2TAssociationManager.AssociateRan - Associating RAN %s to E2T Instance address: %s", ranName, e2tAddress)
 
 	err := m.rmClient.AssociateRanToE2TInstance(e2tAddress, ranName)
@@ -50,16 +52,9 @@ func (m *E2TAssociationManager) AssociateRan(e2tAddress string, ranName string)
 		return err
 	}
 
-	nodebInfo, rnibErr := m.rnibDataService.GetNodeb(ranName)
-
-	if rnibErr != nil {
-		m.logger.Errorf("#E2TAssociationManager.AssociateRan - RAN name: %s - Failed fetching RAN from rNib. Error: %s", ranName, rnibErr)
-		return rnibErr
-	}
-
 	nodebInfo.AssociatedE2TInstanceAddress = e2tAddress
 	nodebInfo.ConnectionAttempts = 0
-	rnibErr = m.rnibDataService.UpdateNodebInfo(nodebInfo)
+	rnibErr := m.rnibDataService.UpdateNodebInfo(nodebInfo)
 	if rnibErr != nil {
 		m.logger.Errorf("#E2TAssociationManager.AssociateRan - RAN name: %s - Failed to update RAN.AssociatedE2TInstanceAddress in rNib. Error: %s", ranName, rnibErr)
 		return rnibErr