Code Review
/
ric-plt
/
e2mgr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[RIC-196] Update LostConnection Automation
[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
ef4a642
..
de54308
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.
// 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
package managers
@@
-22,23
+25,27
@@
import (
"e2mgr/e2pdus"
"e2mgr/logger"
"e2mgr/models"
"e2mgr/e2pdus"
"e2mgr/logger"
"e2mgr/models"
- "e2mgr/rNibWriter"
"e2mgr/rmrCgo"
"e2mgr/services"
"e2mgr/rmrCgo"
"e2mgr/services"
+ "e2mgr/services/rmrsender"
"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
)
type RanSetupManager struct {
"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
+}
+
+type IRanSetupManager interface {
+ ExecuteSetup(nodebInfo *entities.NodebInfo, status entities.ConnectionStatus) error
}
}
-func NewRanSetupManager(logger *logger.Logger, rmrSe
rvice *services.RmrService, rnibWriterProvider func() rNibWriter.RNibWriter
) *RanSetupManager {
+func NewRanSetupManager(logger *logger.Logger, rmrSe
nder *rmrsender.RmrSender, rnibDataService services.RNibDataService
) *RanSetupManager {
return &RanSetupManager{
return &RanSetupManager{
- logger:
logger,
- rnib
WriterProvider: rnibWriterProvider
,
- rmrSe
rvice: rmrService
,
+ logger: logger,
+ rnib
DataService: rnibDataService
,
+ rmrSe
nder: rmrSender
,
}
}
}
}
@@
-47,7
+54,7
@@
func (m *RanSetupManager) updateConnectionStatus(nodebInfo *entities.NodebInfo,
// Update retries and connection status
nodebInfo.ConnectionStatus = status
nodebInfo.ConnectionAttempts++
// Update retries and connection status
nodebInfo.ConnectionStatus = status
nodebInfo.ConnectionAttempts++
- err := m.rnib
WriterProvider()
.UpdateNodebInfo(nodebInfo)
+ err := m.rnib
DataService
.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, err)
} else {
if err != nil {
m.logger.Errorf("#RanSetupManager.updateConnectionStatus - Ran name: %s - Failed updating RAN's connection status to %v : %s", nodebInfo.RanName, status, err)
} else {
@@
-61,7
+68,7
@@
func (m *RanSetupManager) updateConnectionStatusDisconnected(nodebInfo *entities
// Update retries and connection status
nodebInfo.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED
nodebInfo.ConnectionAttempts--
// Update retries and connection status
nodebInfo.ConnectionStatus = entities.ConnectionStatus_DISCONNECTED
nodebInfo.ConnectionAttempts--
- err := m.rnib
WriterProvider()
.UpdateNodebInfo(nodebInfo)
+ err := m.rnib
DataService
.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 {
if err != nil {
m.logger.Errorf("#RanSetupManager.updateConnectionStatusDisconnected - Ran name: %s - Failed updating RAN's connection status to DISCONNECTED : %s", nodebInfo.RanName, err)
} else {
@@
-102,12
+109,18
@@
func (m *RanSetupManager) ExecuteSetup(nodebInfo *entities.NodebInfo, status ent
}
// Send the endc/x2 setup request
}
// 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)
m.logger.Errorf("#RanSetupManager.ExecuteSetup - failed sending setup request to RMR: %s", err)
+ err := m.updateConnectionStatusDisconnected(nodebInfo)
+
// Decrement retries and connection status (disconnected)
// Decrement retries and connection status (disconnected)
- if err
:= m.updateConnectionStatusDisconnected(nodebInfo); err
!= nil {
+ if err != nil {
return e2managererrors.NewRnibDbError()
}
return e2managererrors.NewRnibDbError()
}