"e2mgr/e2pdus"
"e2mgr/logger"
"e2mgr/models"
- "e2mgr/rNibWriter"
"e2mgr/rmrCgo"
"e2mgr/services"
- "e2mgr/sessions"
+ "e2mgr/services/rmrsender"
"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
- "time"
)
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
+// 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 - Ran name: %s - Failed updating RAN's connection status to CONNECTING : %s", nodebInfo.RanName, 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 - Ran name: %s - Successfully updated rNib. RAN's current connection status: CONNECTING, RAN's current connection attempts: %d", nodebInfo.RanName, 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
}
// 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 - Ran name: %s - Failed updating RAN's connection status to DISCONNECTED : %s", nodebInfo.RanName, err)
} else {
}
// 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 {
-
- //Fill details for the response handler
- requestDetails := models.RequestDetails{RanName: nodebInfo.RanName, RanPort: uint16(nodebInfo.Port), RanIp: nodebInfo.Ip}
- m.rmrService.E2sessions[nodebInfo.RanName] = sessions.E2SessionDetails{SessionStart: time.Now(), Request: &requestDetails}
+func (m *RanSetupManager) ExecuteSetup(nodebInfo *entities.NodebInfo, status entities.ConnectionStatus) error {
- // Update retries and connection status (connecting)
- if err := m.updateConnectionStatusConnecting(nodebInfo); err != nil {
- delete(m.rmrService.E2sessions, nodebInfo.RanName)
+ // 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)
if err != nil {
- delete(m.rmrService.E2sessions, nodebInfo.RanName)
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 {
+ 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)
- delete(m.rmrService.E2sessions, nodebInfo.RanName)
+ err := m.updateConnectionStatusDisconnected(nodebInfo)
// Decrement retries and connection status (disconnected)
- if err := m.updateConnectionStatusDisconnected(nodebInfo); err != nil {
+ if err != nil {
return e2managererrors.NewRnibDbError()
}