[RICPLT-2165] Add rnibDataService to support retries

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

diff --git a/E2Manager/managers/ran_setup_manager.go b/E2Manager/managers/ran_setup_manager.go
index 9329411..7500069 100644 (file)
--- a/E2Manager/managers/ran_setup_manager.go
+++ b/E2Manager/managers/ran_setup_manager.go
@@ -22,24 +22,21 @@ import (
        "e2mgr/e2pdus"
        "e2mgr/logger"
        "e2mgr/models"
-       "e2mgr/rNibWriter"
        "e2mgr/rmrCgo"
        "e2mgr/services"
-       "e2mgr/sessions"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
-       "time"
 )
 
 type RanSetupManager struct {
        logger             *logger.Logger
-       rnibWriterProvider func() rNibWriter.RNibWriter
+       rnibDataService services.RNibDataService
        rmrService         *services.RmrService
 }
 
-func NewRanSetupManager(logger *logger.Logger, rmrService *services.RmrService, rnibWriterProvider func() rNibWriter.RNibWriter) *RanSetupManager {
+func NewRanSetupManager(logger *logger.Logger, rmrService *services.RmrService, rnibDataService services.RNibDataService) *RanSetupManager {
        return &RanSetupManager{
                logger:             logger,
-               rnibWriterProvider: rnibWriterProvider,
+               rnibDataService: rnibDataService,
                rmrService:         rmrService,
        }
 }
@@ -49,11 +46,11 @@ func (m *RanSetupManager) updateConnectionStatus(nodebInfo *entities.NodebInfo,
        // Update retries and connection status
        nodebInfo.ConnectionStatus = status
        nodebInfo.ConnectionAttempts++
-       err := m.rnibWriterProvider().UpdateNodebInfo(nodebInfo)
+       err := m.rnibDataService.UpdateNodebInfo(nodebInfo)
        if err != nil {
-               m.logger.Errorf("#RanSetupManager.updateConnectionStatus - Ran name: %s - Failed updating RAN's connection status to %v : %s", nodebInfo.RanName, status.String(), err)
+               m.logger.Errorf("#RanSetupManager.updateConnectionStatus - Ran name: %s - Failed updating RAN's connection status to %v : %s", nodebInfo.RanName, status, err)
        } else {
-               m.logger.Infof("#RanSetupManager.updateConnectionStatus - Ran name: %s - Successfully updated rNib. RAN's current connection status: %v, RAN's current connection attempts: %d", nodebInfo.RanName, status.String(), nodebInfo.ConnectionAttempts)
+               m.logger.Infof("#RanSetupManager.updateConnectionStatus - Ran name: %s - Successfully updated rNib. RAN's current connection status: %v, RAN's current connection attempts: %d", nodebInfo.RanName, status, nodebInfo.ConnectionAttempts)
        }
        return err
 }
@@ -63,7 +60,7 @@ func (m *RanSetupManager) updateConnectionStatusDisconnected(nodebInfo *entities
        // Update retries and connection status
        nodebInfo.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED
        nodebInfo.ConnectionAttempts--
-       err := m.rnibWriterProvider().UpdateNodebInfo(nodebInfo)
+       err := m.rnibDataService.UpdateNodebInfo(nodebInfo)
        if err != nil {
                m.logger.Errorf("#RanSetupManager.updateConnectionStatusDisconnected - Ran name: %s - Failed updating RAN's connection status to DISCONNECTED : %s", nodebInfo.RanName, err)
        } else {
@@ -92,20 +89,14 @@ func (m *RanSetupManager) prepareSetupRequest(nodebInfo *entities.NodebInfo) (in
 // ExecuteSetup updates the connection status and number of attempts in the nodebInfo and send an endc/x2 setup request to establish a connection with the RAN
 func (m *RanSetupManager) ExecuteSetup(nodebInfo *entities.NodebInfo, status entities.ConnectionStatus) error {
 
-       //Fill details for the response handler
-       requestDetails := models.SetupRequest{RanName: nodebInfo.RanName, RanPort: uint16(nodebInfo.Port), RanIp: nodebInfo.Ip}
-       m.rmrService.E2sessions[nodebInfo.RanName] = sessions.E2SessionDetails{SessionStart: time.Now(), Request: &requestDetails}
-
        // Update retries and connection status
        if err := m.updateConnectionStatus(nodebInfo, status); err != nil {
-               delete(m.rmrService.E2sessions, nodebInfo.RanName)
                return e2managererrors.NewRnibDbError()
        }
 
        // Build the endc/x2 setup request
        rmrMsgType, request, err := m.prepareSetupRequest(nodebInfo)
        if err != nil {
-               delete(m.rmrService.E2sessions, nodebInfo.RanName)
                return err
        }
 
@@ -114,8 +105,6 @@ func (m *RanSetupManager) ExecuteSetup(nodebInfo *entities.NodebInfo, status ent
        if err := m.rmrService.SendRmrMessage(response); err != nil {
                m.logger.Errorf("#RanSetupManager.ExecuteSetup - failed sending setup request to RMR: %s", err)
 
-               delete(m.rmrService.E2sessions, nodebInfo.RanName)
-
                // Decrement retries and connection status (disconnected)
                if err := m.updateConnectionStatusDisconnected(nodebInfo); err != nil {
                        return e2managererrors.NewRnibDbError()