[RICPLT-2527] Fix according to acceptance comments
Change-Id: I7b791a984e4cdc0d8db4d243c970038f6d75bd01
Signed-off-by: Amichai <amichai.sichel@intl.att.com>
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 @@
"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 (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 @@
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