RIC-244 - Eliminate Setup/Reset request from dashboard & connectionAttempts

[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 cb24472..f855df4 100644 (file)
--- a/E2Manager/managers/ran_setup_manager.go
+++ b/E2Manager/managers/ran_setup_manager.go
@@ -13,7 +13,10 @@
 // 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
 
@@ -22,51 +25,53 @@ import (
        "e2mgr/e2pdus"
        "e2mgr/logger"
        "e2mgr/models"
-       "e2mgr/rNibWriter"
        "e2mgr/rmrCgo"
        "e2mgr/services"
+       "e2mgr/services/rmrsender"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
+       "unsafe"
 )
 
 type RanSetupManager struct {
-       logger             *logger.Logger
-       rnibWriterProvider func() rNibWriter.RNibWriter
-       rmrService         *services.RmrService
+       logger          *logger.Logger
+       rnibDataService services.RNibDataService
+       rmrSender       *rmrsender.RmrSender
 }
 
-func NewRanSetupManager(logger *logger.Logger, rmrService *services.RmrService, rnibWriterProvider func() rNibWriter.RNibWriter) *RanSetupManager {
+type IRanSetupManager interface {
+       ExecuteSetup(nodebInfo *entities.NodebInfo, status entities.ConnectionStatus) error
+}
+
+func NewRanSetupManager(logger *logger.Logger, rmrSender *rmrsender.RmrSender, rnibDataService services.RNibDataService) *RanSetupManager {
        return &RanSetupManager{
-               logger:             logger,
-               rnibWriterProvider: rnibWriterProvider,
-               rmrService        : rmrService,
+               logger:          logger,
+               rnibDataService: rnibDataService,
+               rmrSender:       rmrSender,
        }
 }
 
-
-// Update retries and connection status (connecting)
-func (m *RanSetupManager) updateConnectionStatusConnecting(nodebInfo *entities.NodebInfo) error {
-       // Update retries and connection status (connecting)
-       nodebInfo.ConnectionStatus = entities.ConnectionStatus_CONNECTING
-       nodebInfo.ConnectionAttempts++
-       err:= m.rnibWriterProvider().UpdateNodebInfo(nodebInfo)
+// Update retries and connection status 
+func (m *RanSetupManager) updateConnectionStatus(nodebInfo *entities.NodebInfo, status entities.ConnectionStatus) error {
+       // Update retries and connection status
+       nodebInfo.ConnectionStatus = status
+       err := m.rnibDataService.UpdateNodebInfo(nodebInfo)
        if err != nil {
-               m.logger.Errorf("#ran_setup_manager.updateConnectionStatusConnecting - failed to update RAN's connection status to CONNECTING: %s", 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("#ran_setup_manager.updateConnectionStatusConnecting - successfully updated RAN's connection status to CONNECTING: %s", err)
+               m.logger.Infof("#RanSetupManager.updateConnectionStatus - Ran name: %s - Successfully updated rNib. RAN's current connection status: %v", nodebInfo.RanName, status)
        }
        return err
 }
 
 // Decrement retries and connection status (disconnected)
 func (m *RanSetupManager) updateConnectionStatusDisconnected(nodebInfo *entities.NodebInfo) error {
-       // Update retries and connection status (connecting)
+       // 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("#ran_setup_manager.updateConnectionStatusDisconnected - failed to update RAN's connection status to DISCONNECTED : %s", err)
+               m.logger.Errorf("#RanSetupManager.updateConnectionStatusDisconnected - Ran name: %s - Failed updating RAN's connection status to DISCONNECTED : %s", nodebInfo.RanName, err)
        } else {
-               m.logger.Errorf("#ran_setup_manager.updateConnectionStatusDisconnected - successfully updated RAN's connection status to DISCONNECTED : %s", err)
+               m.logger.Infof("#RanSetupManager.updateConnectionStatusDisconnected - Ran name: %s - Successfully updated rNib. RAN's current connection status: DISCONNECTED", nodebInfo.RanName)
        }
        return err
 }
@@ -80,39 +85,47 @@ func (m *RanSetupManager) prepareSetupRequest(nodebInfo *entities.NodebInfo) (in
                return rmrMsgType, request, nil
        case entities.E2ApplicationProtocol_ENDC_X2_SETUP_REQUEST:
                rmrMsgType := rmrCgo.RIC_ENDC_X2_SETUP_REQ
-               request:= models.NewE2RequestMessage(nodebInfo.RanName /*tid*/, nodebInfo.Ip, uint16(nodebInfo.Port), nodebInfo.RanName, e2pdus.PackedEndcX2setupRequest)
+               request := models.NewE2RequestMessage(nodebInfo.RanName /*tid*/, nodebInfo.Ip, uint16(nodebInfo.Port), nodebInfo.RanName, e2pdus.PackedEndcX2setupRequest)
                return rmrMsgType, request, nil
        }
 
-       m.logger.Errorf("#ran_setup_manager.ExecuteSetup - unsupported nodebInfo.E2ApplicationProtocol %d ", nodebInfo.E2ApplicationProtocol)
+       m.logger.Errorf("#RanSetupManager.prepareSetupRequest - Unsupported nodebInfo.E2ApplicationProtocol %d ", nodebInfo.E2ApplicationProtocol)
        return 0, nil, e2managererrors.NewInternalError()
 }
 
 // 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) error {
+func (m *RanSetupManager) ExecuteSetup(nodebInfo *entities.NodebInfo, status entities.ConnectionStatus) error {
 
-       // Update retries and connection status (connecting)
-       if err := m.updateConnectionStatusConnecting(nodebInfo); err != nil {
+       // Update retries and connection status
+       if err := m.updateConnectionStatus(nodebInfo, status); err != nil {
                return e2managererrors.NewRnibDbError()
        }
 
        // Build the endc/x2 setup request
-       rmrMsgType,request, err := m.prepareSetupRequest(nodebInfo)
+       rmrMsgType, request, err := m.prepareSetupRequest(nodebInfo)
        if err != nil {
                return err
        }
-       
+
        // Send the endc/x2 setup request
-       response := &models.NotificationResponse{MgsType: rmrMsgType, RanName: nodebInfo.RanName, Payload: request.GetMessageAsBytes(m.logger)}
-       if err := m.rmrService.SendRmrMessage(response); err != nil {
-               m.logger.Errorf("#ran_setup_manager.ExecuteSetup - failed to send setup request to RMR: %s", err)
+       var xAction []byte
+       var msgSrc unsafe.Pointer
+       msg := models.NewRmrMessage(rmrMsgType, nodebInfo.RanName, request.GetMessageAsBytes(m.logger), xAction, msgSrc)
+
+       err = m.rmrSender.Send(msg)
+
+       if err != nil {
+               m.logger.Errorf("#RanSetupManager.ExecuteSetup - failed sending setup request to RMR: %s", err)
+
+               err := m.updateConnectionStatusDisconnected(nodebInfo)
 
                // Decrement retries and connection status (disconnected)
-               if err := m.updateConnectionStatusDisconnected(nodebInfo); err != nil {
+               if err != nil {
                        return e2managererrors.NewRnibDbError()
                }
 
                return e2managererrors.NewRmrError()
        }
+
        return nil
 }