import (
"e2mgr/clients"
+ "e2mgr/e2managererrors"
"e2mgr/logger"
"e2mgr/services"
"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
)
type E2TAssociationManager struct {
- logger *logger.Logger
- rnibDataService services.RNibDataService
- e2tInstanceManager IE2TInstancesManager
- rmClient clients.IRoutingManagerClient
+ logger *logger.Logger
+ rnibDataService services.RNibDataService
+ e2tInstanceManager IE2TInstancesManager
+ rmClient clients.IRoutingManagerClient
+ ranConnectStatusChangeManager IRanConnectStatusChangeManager
}
-func NewE2TAssociationManager(logger *logger.Logger, rnibDataService services.RNibDataService, e2tInstanceManager IE2TInstancesManager, rmClient clients.IRoutingManagerClient) *E2TAssociationManager {
+func NewE2TAssociationManager(logger *logger.Logger, rnibDataService services.RNibDataService, e2tInstanceManager IE2TInstancesManager, rmClient clients.IRoutingManagerClient, ranConnectStatusChangeManager IRanConnectStatusChangeManager) *E2TAssociationManager {
return &E2TAssociationManager{
- logger: logger,
- rnibDataService: rnibDataService,
- e2tInstanceManager: e2tInstanceManager,
- rmClient: rmClient,
+ logger: logger,
+ rnibDataService: rnibDataService,
+ e2tInstanceManager: e2tInstanceManager,
+ rmClient: rmClient,
+ ranConnectStatusChangeManager: ranConnectStatusChangeManager,
}
}
ranName := nodebInfo.RanName
m.logger.Infof("#E2TAssociationManager.AssociateRan - Associating RAN %s to E2T Instance address: %s", ranName, e2tAddress)
- 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.AddRansToInstance(e2tAddress, []string{ranName})
+ err := m.associateRanAndUpdateNodeb(e2tAddress, nodebInfo)
if err != nil {
- m.logger.Errorf("#E2TAssociationManager.AssociateRan - RAN name: %s - Failed to add RAN to E2T instance %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
}
- err = m.rmClient.AssociateRanToE2TInstance(e2tAddress, ranName)
+ err = m.e2tInstanceManager.AddRansToInstance(e2tAddress, []string{ranName})
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 - RAN name: %s - Failed to add RAN to E2T instance %s. Error: %s", ranName, e2tAddress, 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 {
+ _ = m.ranConnectStatusChangeManager.ChangeStatus(nodebInfo, entities.ConnectionStatus_DISCONNECTED)
+ return e2managererrors.NewRoutingManagerError()
+ }
+
+ rnibErr := m.ranConnectStatusChangeManager.ChangeStatus(nodebInfo, entities.ConnectionStatus_CONNECTED)
+
+ if rnibErr != nil {
+ return e2managererrors.NewRnibDbError()
+ }
+
+ nodebInfo.AssociatedE2TInstanceAddress = e2tAddress
+ rnibErr = m.rnibDataService.UpdateNodebInfo(nodebInfo)
+
+ if rnibErr != nil {
+ m.logger.Errorf("#E2TAssociationManager.associateRanAndUpdateNodeb - RAN name: %s - Failed updating nodeb. Error: %s", nodebInfo.RanName, rnibErr)
+ return e2managererrors.NewRnibDbError()
+ }
+
+ return nil
+}
+
func (m *E2TAssociationManager) DissociateRan(e2tAddress string, ranName string) error {
m.logger.Infof("#E2TAssociationManager.DissociateRan - Dissociating RAN %s from E2T Instance address: %s", ranName, e2tAddress)
}
err = m.rmClient.DissociateRanE2TInstance(e2tAddress, ranName)
+
if err != nil {
m.logger.Errorf("#E2TAssociationManager.DissociateRan - RoutingManager failure: Failed to dissociate RAN %s from E2T %s. Error: %s", ranName, e2tAddress, err)
} else {