X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fmanagers%2Fran_connect_status_change_manager.go;h=1e3b3aa9bf7ba71c34c8faf9a75f85a621e0c6d0;hb=refs%2Fchanges%2F19%2F4519%2F1;hp=ecb645ccc5b5d7b9bc03e14515b225a1e8c96fb3;hpb=197657e0e814c871b903ef779ad654b13347e430;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/managers/ran_connect_status_change_manager.go b/E2Manager/managers/ran_connect_status_change_manager.go index ecb645c..1e3b3aa 100644 --- a/E2Manager/managers/ran_connect_status_change_manager.go +++ b/E2Manager/managers/ran_connect_status_change_manager.go @@ -32,7 +32,7 @@ const ( ) type IRanConnectStatusChangeManager interface { - ChangeStatus(nodebInfo *entities.NodebInfo, nextStatus entities.ConnectionStatus) error + ChangeStatus(nodebInfo *entities.NodebInfo, nextStatus entities.ConnectionStatus) (bool, error) } type RanConnectStatusChangeManager struct { @@ -51,9 +51,11 @@ func NewRanConnectStatusChangeManager(logger *logger.Logger, rnibDataService ser } } -func (m *RanConnectStatusChangeManager) ChangeStatus(nodebInfo *entities.NodebInfo, nextStatus entities.ConnectionStatus) error { +func (m *RanConnectStatusChangeManager) ChangeStatus(nodebInfo *entities.NodebInfo, nextStatus entities.ConnectionStatus) (bool, error) { m.logger.Infof("#RanConnectStatusChangeManager.ChangeStatus - RAN name: %s, currentStatus: %s, nextStatus: %s", nodebInfo.RanName, nodebInfo.GetConnectionStatus(), nextStatus) + var ranStatusChangePublished bool + // set the proper event event := m.setEvent(nodebInfo, nextStatus) isConnectivityEvent := event != NONE_RAW_EVENT @@ -63,18 +65,20 @@ func (m *RanConnectStatusChangeManager) ChangeStatus(nodebInfo *entities.NodebIn if !isConnectivityEvent { err := m.updateNodebInfo(nodebInfo) if err != nil { - return err + return ranStatusChangePublished, err } } else { err := m.updateNodebInfoOnConnectionStatusInversion(nodebInfo, event) if err != nil { - return err + return ranStatusChangePublished, err } + ranStatusChangePublished = true } // in any case, update RanListManager - m.logger.Infof("#RanConnectStatusChangeManager.ChangeStatus - RAN name: %s, updating RanListManager... status: %s", nodebInfo.RanName, nodebInfo.GetConnectionStatus()) - err := m.ranListManager.UpdateRanState(nodebInfo) + connectionStatus := nodebInfo.GetConnectionStatus() + m.logger.Infof("#RanConnectStatusChangeManager.ChangeStatus - RAN name: %s, updating RanListManager... status: %s", nodebInfo.RanName, connectionStatus) + err := m.ranListManager.UpdateNbIdentityConnectionStatus(nodebInfo.GetNodeType(), nodebInfo.RanName, connectionStatus) if err != nil { m.logger.Errorf("#RanConnectStatusChangeManager.ChangeStatus - RAN name: %s - Failed updating RAN's connection status by RanListManager. Error: %v", nodebInfo.RanName, err) // log and proceed... @@ -89,7 +93,7 @@ func (m *RanConnectStatusChangeManager) ChangeStatus(nodebInfo *entities.NodebIn } } - return nil + return ranStatusChangePublished, nil } func (m *RanConnectStatusChangeManager) updateNodebInfoOnConnectionStatusInversion(nodebInfo *entities.NodebInfo, event string) error {