X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=E2Manager%2Fmanagers%2Fe2t_association_manager.go;h=3afba253df0e6933b230a0adc28012cec60c70a5;hb=514e6041ca6b9b92cb887c941767f298a746e315;hp=9988d01ee18cf4d442731dafdb44eb98b5cb0d3f;hpb=f846c5987cd35da745534e26ac3a22bdcf8b030a;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/managers/e2t_association_manager.go b/E2Manager/managers/e2t_association_manager.go
index 9988d01..3afba25 100644
--- a/E2Manager/managers/e2t_association_manager.go
+++ b/E2Manager/managers/e2t_association_manager.go
@@ -21,6 +21,7 @@ package managers
 
 import (
 	"e2mgr/clients"
+	"e2mgr/e2managererrors"
 	"e2mgr/logger"
 	"e2mgr/services"
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
@@ -46,30 +47,43 @@ func (m *E2TAssociationManager) AssociateRan(e2tAddress string, nodebInfo *entit
 	ranName := nodebInfo.RanName
 	m.logger.Infof("#E2TAssociationManager.AssociateRan - Associating RAN %s to E2T Instance address: %s", ranName, e2tAddress)
 
-	err := m.rmClient.AssociateRanToE2TInstance(e2tAddress, ranName)
+	err := m.associateRanAndUpdateNodeb(e2tAddress, nodebInfo)
 	if err != nil {
-		m.logger.Errorf("#E2TAssociationManager.AssociateRan - RoutingManager failure: Failed to associate RAN %s to E2T %s. Error: %s", ranName, e2tAddress, err)
+		m.logger.Errorf("#E2TAssociationManager.AssociateRan - RoutingManager failure: Failed to associate RAN %s to E2T %s. Error: %s", nodebInfo, e2tAddress, err)
 		return err
 	}
-
-	nodebInfo.AssociatedE2TInstanceAddress = e2tAddress
-	nodebInfo.ConnectionAttempts = 0
-
-	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
-	}
-
-	err = m.e2tInstanceManager.AddRanToInstance(ranName, e2tAddress)
+	err = m.e2tInstanceManager.AddRansToInstance(e2tAddress, []string{ranName})
 	if err != nil {
 		m.logger.Errorf("#E2TAssociationManager.AssociateRan - RAN name: %s - Failed to add RAN to E2T instance %s. Error: %s", ranName, e2tAddress, err)
-		return err
+		return e2managererrors.NewRnibDbError()
 	}
 	m.logger.Infof("#E2TAssociationManager.AssociateRan - successfully associated RAN %s with E2T %s", ranName, e2tAddress)
 	return nil
 }
 
+func (m *E2TAssociationManager) associateRanAndUpdateNodeb(e2tAddress string, nodebInfo *entities.NodebInfo) error {
+
+	rmErr := m.rmClient.AssociateRanToE2TInstance(e2tAddress, nodebInfo.RanName)
+	if rmErr != nil {
+		nodebInfo.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED
+	} else {
+		nodebInfo.ConnectionStatus = entities.ConnectionStatus_CONNECTED
+		nodebInfo.AssociatedE2TInstanceAddress = e2tAddress
+		nodebInfo.ConnectionAttempts = 0
+	}
+	rNibErr := m.rnibDataService.UpdateNodebInfo(nodebInfo)
+	if rNibErr != nil {
+		m.logger.Errorf("#E2TAssociationManager.associateRanAndUpdateNodeb - RAN name: %s - Failed to update nodeb entity in rNib. Error: %s", nodebInfo.RanName, rNibErr)
+	}
+	var err error
+	if rmErr != nil {
+		err = e2managererrors.NewRoutingManagerError()
+	} else if rNibErr != nil{
+		err = e2managererrors.NewRnibDbError()
+	}
+	return err
+}
+
 func (m *E2TAssociationManager) DissociateRan(e2tAddress string, ranName string) error {
 	m.logger.Infof("#E2TAssociationManager.DissociateRan - Dissociating RAN %s from E2T Instance address: %s", ranName, e2tAddress)
 
@@ -101,32 +115,21 @@ func (m *E2TAssociationManager) DissociateRan(e2tAddress string, ranName string)
 	return nil
 }
 
-func (m *E2TAssociationManager) RemoveE2tInstance(e2tAddress string, ransToBeDissociated []string, ranAssociationList map[string][]string) error {
+func (m *E2TAssociationManager) RemoveE2tInstance(e2tInstance *entities.E2TInstance) error {
+	m.logger.Infof("#E2TAssociationManager.RemoveE2tInstance -  Removing E2T %s and dessociating its associated RANs.", e2tInstance.Address)
 
-	err := m.rmClient.DeleteE2TInstance(e2tAddress, ransToBeDissociated, ranAssociationList)
+	err := m.rmClient.DeleteE2TInstance(e2tInstance.Address, e2tInstance.AssociatedRanList)
 	if err != nil {
-		m.logger.Errorf("#E2TAssociationManager.RemoveE2tInstance - RoutingManager failure: Failed to delete E2T %s. Error: %s", e2tAddress, err)
-		_ = m.setStateToRoutingManagerFailure(e2tAddress)
-		return err
+		m.logger.Warnf("#E2TAssociationManager.RemoveE2tInstance - RoutingManager failure: Failed to delete E2T %s. Error: %s", e2tInstance.Address, err)
+		// log and continue
 	}
 
-	err = m.e2tInstanceManager.RemoveE2TInstance(e2tAddress)
+	err = m.e2tInstanceManager.RemoveE2TInstance(e2tInstance.Address)
 	if err != nil {
-		m.logger.Errorf("#E2TAssociationManager.RemoveE2tInstance - Failed to remove E2T %s. Error: %s", e2tAddress, err)
+		m.logger.Errorf("#E2TAssociationManager.RemoveE2tInstance - Failed to remove E2T %s. Error: %s", e2tInstance.Address, err)
 		return err
 	}
 
-	return nil
-}
-
-func (m *E2TAssociationManager) setStateToRoutingManagerFailure(e2tAddress string) error {
-	e2tInstance, err := m.e2tInstanceManager.GetE2TInstance(e2tAddress)
-	if err != nil {
-		return err
-	}
-	err = m.e2tInstanceManager.SetE2tInstanceState(e2tAddress, e2tInstance.State, entities.RoutingManagerFailure)
-	if err != nil {
-		return err
-	}
+	m.logger.Infof("#E2TAssociationManager.RemoveE2tInstance -  E2T %s successfully removed.", e2tInstance.Address)
 	return nil
 }