X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fran_reconnection_manager.go;h=530a2cf156cfe62cb9ecc81f6ed90f2d749479af;hb=efcb4528362460aa2249d319c9752b63bb720fe2;hp=df3467a4519dcb571e009665ebc4305e108bcc55;hpb=ce7bdb1a54c10071a9aa0310a8e42411dcab9226;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/managers/ran_reconnection_manager.go b/E2Manager/managers/ran_reconnection_manager.go
index df3467a..530a2cf 100644
--- a/E2Manager/managers/ran_reconnection_manager.go
+++ b/E2Manager/managers/ran_reconnection_manager.go
@@ -13,18 +13,18 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-//
+
+//  This source code is part of the near-RT RIC (RAN Intelligent Controller)
+//  platform project (RICP).
+
 
 package managers
 
 import (
 	"e2mgr/configuration"
 	"e2mgr/logger"
-	"e2mgr/rNibWriter"
 	"e2mgr/services"
-	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
-	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
 )
 
 type IRanReconnectionManager interface {
@@ -32,44 +32,59 @@ type IRanReconnectionManager interface {
 }
 
 type RanReconnectionManager struct {
-	logger             *logger.Logger
-	config             *configuration.Configuration
-	rnibReaderProvider func() reader.RNibReader
-	rnibWriterProvider func() rNibWriter.RNibWriter
-	ranSetupManager    *RanSetupManager
+	logger              *logger.Logger
+	config              *configuration.Configuration
+	rnibDataService     services.RNibDataService
+	ranSetupManager     *RanSetupManager
+	e2tInstancesManager IE2TInstancesManager
 }
 
-func NewRanReconnectionManager(logger *logger.Logger, config *configuration.Configuration, rnibReaderProvider func() reader.RNibReader, rnibWriterProvider func() rNibWriter.RNibWriter, rmrService *services.RmrService) *RanReconnectionManager {
+func NewRanReconnectionManager(logger *logger.Logger, config *configuration.Configuration, rnibDataService services.RNibDataService, ranSetupManager *RanSetupManager, e2tInstancesManager IE2TInstancesManager) *RanReconnectionManager {
 	return &RanReconnectionManager{
-		logger:             logger,
-		config:             config,
-		rnibReaderProvider: rnibReaderProvider,
-		rnibWriterProvider: rnibWriterProvider,
-		ranSetupManager:    NewRanSetupManager(logger,rmrService,rnibWriterProvider),
+		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.rnibReaderProvider().GetNodeb(inventoryName)
+	nodebInfo, rnibErr := m.rnibDataService.GetNodeb(inventoryName)
 
 	if rnibErr != nil {
-		m.logger.Errorf("#ReconnectRan - RAN name: %s - Failed fetching RAN from rNib. Error: %v", inventoryName, rnibErr)
+		m.logger.Errorf("#RanReconnectionManager.ReconnectRan - RAN name: %s - Failed fetching RAN from rNib. Error: %v", inventoryName, rnibErr)
 		return rnibErr
 	}
 
+	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) {
-		m.logger.Warnf("#ReconnectRan - RAN name: %s - Cannot reconnect RAN", inventoryName)
-		return m.setConnectionStatusOfUnconnectableRan(nodebInfo)
+		e2tAddress := nodebInfo.AssociatedE2TInstanceAddress
+		err := m.updateUnconnectableRan(nodebInfo)
+
+		if err != nil {
+			return err
+		}
+
+		if m.isRanExceededConnectionAttempts(nodebInfo) {
+			return m.e2tInstancesManager.DissociateRan(nodebInfo.RanName, e2tAddress)
+		}
+
+		return nil
 	}
 
-	err := m.ranSetupManager.ExecuteSetup(nodebInfo)
+	err := m.ranSetupManager.ExecuteSetup(nodebInfo, entities.ConnectionStatus_CONNECTING)
 
 	if err != nil {
-		m.logger.Errorf("#ReconnectRan - RAN name: %s - Failed executing setup. Error: %v", inventoryName, err)
+		m.logger.Errorf("#RanReconnectionManager.ReconnectRan - RAN name: %s - Failed executing setup. Error: %v", inventoryName, err)
 		return err
 	}
 
-	m.logger.Infof("#ReconnectRan - RAN name: %s - Successfully done executing setup", inventoryName)
 	return nil
 }
 
@@ -79,30 +94,41 @@ func (m *RanReconnectionManager) canReconnectRan(nodebInfo *entities.NodebInfo)
 		int(nodebInfo.GetConnectionAttempts()) < m.config.MaxConnectionAttempts
 }
 
-func (m *RanReconnectionManager) updateNodebInfoStatus(nodebInfo *entities.NodebInfo, connectionStatus entities.ConnectionStatus) common.IRNibError {
+func (m *RanReconnectionManager) updateNodebInfo(nodebInfo *entities.NodebInfo, connectionStatus entities.ConnectionStatus, resetE2tAddress bool) error {
+
 	nodebInfo.ConnectionStatus = connectionStatus;
-	err := m.rnibWriterProvider().UpdateNodebInfo(nodebInfo)
+
+	if resetE2tAddress {
+		nodebInfo.AssociatedE2TInstanceAddress = ""
+	}
+
+	err := m.rnibDataService.UpdateNodebInfo(nodebInfo)
 
 	if err != nil {
-		m.logger.Errorf("#updateNodebInfoStatus - RAN name: %s - Failed updating RAN's connection status to %s in rNib. Error: %v", nodebInfo.RanName, connectionStatus, err)
+		m.logger.Errorf("#RanReconnectionManager.updateNodebInfo - RAN name: %s - Failed updating RAN's connection status to %s in rNib. Error: %v", nodebInfo.RanName, connectionStatus, err)
 		return err
 	}
 
-	m.logger.Infof("#updateNodebInfoStatus - RAN name: %s - Successfully updated RAN's connection status to %s in rNib", nodebInfo.RanName, connectionStatus)
+	m.logger.Infof("#RanReconnectionManager.updateNodebInfo - RAN name: %s - Successfully updated rNib. RAN's current connection status: %s", nodebInfo.RanName, nodebInfo.ConnectionStatus)
 	return nil
 }
 
-func (m *RanReconnectionManager) setConnectionStatusOfUnconnectableRan(nodebInfo *entities.NodebInfo) common.IRNibError {
+func (m *RanReconnectionManager) updateUnconnectableRan(nodebInfo *entities.NodebInfo) error {
 	connectionStatus := nodebInfo.GetConnectionStatus()
-	m.logger.Warnf("#setConnectionStatusOfUnconnectableRan - RAN name: %s, RAN's connection status: %s, RAN's connection attempts: %d", nodebInfo.RanName, nodebInfo.ConnectionStatus, nodebInfo.ConnectionAttempts)
+
+	if connectionStatus == entities.ConnectionStatus_SHUT_DOWN {
+		m.logger.Warnf("#RanReconnectionManager.updateUnconnectableRan - RAN name: %s - Cannot reconnect RAN. Reason: connection status is SHUT_DOWN", nodebInfo.RanName)
+		return nil
+	}
 
 	if connectionStatus == entities.ConnectionStatus_SHUTTING_DOWN {
-		return m.updateNodebInfoStatus(nodebInfo, entities.ConnectionStatus_SHUT_DOWN)
+		m.logger.Warnf("#RanReconnectionManager.updateUnconnectableRan - RAN name: %s - Cannot reconnect RAN. Reason: connection status is SHUTTING_DOWN", nodebInfo.RanName)
+		return m.updateNodebInfo(nodebInfo, entities.ConnectionStatus_SHUT_DOWN, false)
 	}
 
-	if int(nodebInfo.GetConnectionAttempts()) >= m.config.MaxConnectionAttempts {
-		m.logger.Warnf("#setConnectionStatusOfUnconnectableRan - RAN name: %s - RAN's connection attempts are greater than %d", nodebInfo.RanName, m.config.MaxConnectionAttempts)
-		return m.updateNodebInfoStatus(nodebInfo, entities.ConnectionStatus_DISCONNECTED)
+	if m.isRanExceededConnectionAttempts(nodebInfo) {
+		m.logger.Warnf("#RanReconnectionManager.updateUnconnectableRan - RAN name: %s - Cannot reconnect RAN. Reason: RAN's connection attempts exceeded the limit (%d)", nodebInfo.RanName, m.config.MaxConnectionAttempts)
+		return m.updateNodebInfo(nodebInfo, entities.ConnectionStatus_DISCONNECTED, true)
 	}
 
 	return nil