X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fran_setup_manager.go;h=40b4d005ec7dfe8ef7a423c1a566badc1b60bf14;hb=15d3982b5eda43a5b5b9054d7ecb026448c6ca16;hp=f6fe1d202e33d611fc88e0208e652dc22424a89a;hpb=264731981e4a52e876c5b484e35032ada6559ac6;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/managers/ran_setup_manager.go b/E2Manager/managers/ran_setup_manager.go
index f6fe1d2..40b4d00 100644
--- 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,50 +25,50 @@ 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"
 )
 
 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 {
+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
+// Update retries and connection status 
+func (m *RanSetupManager) updateConnectionStatus(nodebInfo *entities.NodebInfo, status entities.ConnectionStatus) error {
+	// 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.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("#RanSetupManager.updateConnectionStatusConnecting - successfully updated RAN's connection status to CONNECTING")
+		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
 }
 
 // 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("#RanSetupManager.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("#RanSetupManager.updateConnectionStatusDisconnected - successfully updated RAN's connection status to DISCONNECTED")
+		m.logger.Infof("#RanSetupManager.updateConnectionStatusDisconnected - Ran name: %s - Successfully updated rNib. RAN's current connection status: DISCONNECTED, RAN's current connection attempts: %d", nodebInfo.RanName, nodebInfo.ConnectionAttempts)
 	}
 	return err
 }
@@ -83,15 +86,15 @@ func (m *RanSetupManager) prepareSetupRequest(nodebInfo *entities.NodebInfo) (in
 		return rmrMsgType, request, nil
 	}
 
-	m.logger.Errorf("#RanSetupManager.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()
 	}
 
@@ -102,12 +105,17 @@ func (m *RanSetupManager) ExecuteSetup(nodebInfo *entities.NodebInfo) error {
 	}
 
 	// 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("#RanSetupManager.ExecuteSetup - failed to send setup request to RMR: %s", err)
+	msg := models.NewRmrMessage(rmrMsgType, nodebInfo.RanName, request.GetMessageAsBytes(m.logger))
+
+	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()
 		}