[RICPLT-2585] E2Term Init - Support Multiple E2T Instances

[ric-plt/e2mgr.git] / E2Manager / managers / ran_reconnection_manager.go

diff --git a/E2Manager/managers/ran_reconnection_manager.go b/E2Manager/managers/ran_reconnection_manager.go
index f27f810..16614b1 100644 (file)
--- a/E2Manager/managers/ran_reconnection_manager.go
+++ b/E2Manager/managers/ran_reconnection_manager.go
@@ -29,21 +29,27 @@ type IRanReconnectionManager interface {
 }
 
 type RanReconnectionManager struct {
-       logger          *logger.Logger
-       config          *configuration.Configuration
-       rnibDataService services.RNibDataService
-       ranSetupManager *RanSetupManager
+       logger              *logger.Logger
+       config              *configuration.Configuration
+       rnibDataService     services.RNibDataService
+       ranSetupManager     *RanSetupManager
+       e2tInstancesManager IE2TInstancesManager
 }
 
-func NewRanReconnectionManager(logger *logger.Logger, config *configuration.Configuration, rnibDataService services.RNibDataService, ranSetupManager *RanSetupManager) *RanReconnectionManager {
+func NewRanReconnectionManager(logger *logger.Logger, config *configuration.Configuration, rnibDataService services.RNibDataService, ranSetupManager *RanSetupManager, e2tInstancesManager IE2TInstancesManager) *RanReconnectionManager {
        return &RanReconnectionManager{
-               logger:          logger,
-               config:          config,
-               rnibDataService: rnibDataService,
-               ranSetupManager: ranSetupManager,
+               logger:              logger,
+               config:              config,
+               rnibDataService:     rnibDataService,
+               ranSetupManager:     ranSetupManager,
+               e2tInstancesManager: e2tInstancesManager,
        }
 }
 
+func (m *RanReconnectionManager) isRanExceededConnectionAttempts(nodebInfo *entities.NodebInfo) bool {
+       return int(nodebInfo.GetConnectionAttempts()) >= m.config.MaxConnectionAttempts
+}
+
 func (m *RanReconnectionManager) ReconnectRan(inventoryName string) error {
        nodebInfo, rnibErr := m.rnibDataService.GetNodeb(inventoryName)
 
@@ -55,7 +61,17 @@ func (m *RanReconnectionManager) ReconnectRan(inventoryName string) error {
        m.logger.Infof("#RanReconnectionManager.ReconnectRan - RAN name: %s - RAN's connection status: %s, RAN's connection attempts: %d", nodebInfo.RanName, nodebInfo.ConnectionStatus, nodebInfo.ConnectionAttempts)
 
        if !m.canReconnectRan(nodebInfo) {
-               return m.setConnectionStatusOfUnconnectableRan(nodebInfo)
+               err := m.setConnectionStatusOfUnconnectableRan(nodebInfo)
+
+               if err != nil {
+                       return err
+               }
+
+               if m.isRanExceededConnectionAttempts(nodebInfo) {
+                       return m.e2tInstancesManager.DeassociateRan(nodebInfo.RanName, nodebInfo.AssociatedE2TInstanceAddress)
+               }
+
+               return nil
        }
 
        err := m.ranSetupManager.ExecuteSetup(nodebInfo, entities.ConnectionStatus_CONNECTING)
@@ -104,7 +120,7 @@ func (m *RanReconnectionManager) setConnectionStatusOfUnconnectableRan(nodebInfo
                return m.updateNodebInfoStatus(nodebInfo, entities.ConnectionStatus_SHUT_DOWN)
        }
 
-       if int(nodebInfo.GetConnectionAttempts()) >= m.config.MaxConnectionAttempts {
+       if m.isRanExceededConnectionAttempts(nodebInfo) {
                m.logger.Warnf("#RanReconnectionManager.ReconnectRan - RAN name: %s - Cannot reconnect RAN. Reason: RAN's connection attempts exceeded the limit (%d)", nodebInfo.RanName, m.config.MaxConnectionAttempts)
                return m.updateNodebInfoStatus(nodebInfo, entities.ConnectionStatus_DISCONNECTED)
        }