X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=E2Manager%2Fmanagers%2Fran_setup_manager.go;h=7aaf1510c1efc9a06e56caded7d8a8683b120b65;hb=99e39b485bd66dad8afadbc1f3c3c3b0ca3569b5;hp=7500069beda7ed3d6ac6a230c9b8e15062377fb1;hpb=e3623cf1310f8c8d2fd9b5842102516b9be3b441;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/managers/ran_setup_manager.go b/E2Manager/managers/ran_setup_manager.go
index 7500069..7aaf151 100644
--- a/E2Manager/managers/ran_setup_manager.go
+++ b/E2Manager/managers/ran_setup_manager.go
@@ -24,20 +24,25 @@ import (
 	"e2mgr/models"
 	"e2mgr/rmrCgo"
 	"e2mgr/services"
+	"e2mgr/services/rmrsender"
 	"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
 )
 
 type RanSetupManager struct {
-	logger             *logger.Logger
+	logger          *logger.Logger
 	rnibDataService services.RNibDataService
-	rmrService         *services.RmrService
+	rmrSender       *rmrsender.RmrSender
 }
 
-func NewRanSetupManager(logger *logger.Logger, rmrService *services.RmrService, rnibDataService services.RNibDataService) *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,
+		logger:          logger,
 		rnibDataService: rnibDataService,
-		rmrService:         rmrService,
+		rmrSender:       rmrSender,
 	}
 }
 
@@ -101,12 +106,18 @@ func (m *RanSetupManager) ExecuteSetup(nodebInfo *entities.NodebInfo, status ent
 	}
 
 	// 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 {
+	var xAction []byte
+	msg := models.NewRmrMessage(rmrMsgType, nodebInfo.RanName, request.GetMessageAsBytes(m.logger), xAction)
+
+	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()
 		}