Upgrade release version to 5.4.14

[ric-plt/e2mgr.git] / E2Manager / managers / ran_disconnection_manager.go

diff --git a/E2Manager/managers/ran_disconnection_manager.go b/E2Manager/managers/ran_disconnection_manager.go
index aeb91bb..8d30eec 100644 (file)
--- a/E2Manager/managers/ran_disconnection_manager.go
+++ b/E2Manager/managers/ran_disconnection_manager.go
@@ -65,10 +65,11 @@ func (m *RanDisconnectionManager) DisconnectRan(inventoryName string) error {
        }
 
        if connectionStatus == entities.ConnectionStatus_SHUTTING_DOWN {
-               return m.ranConnectStatusChangeManager.ChangeStatus(nodebInfo, entities.ConnectionStatus_SHUT_DOWN)
+               _, err = m.ranConnectStatusChangeManager.ChangeStatus(nodebInfo, entities.ConnectionStatus_SHUT_DOWN)
+               return err
        }
 
-       err = m.ranConnectStatusChangeManager.ChangeStatus(nodebInfo, entities.ConnectionStatus_DISCONNECTED)
+       _, err = m.ranConnectStatusChangeManager.ChangeStatus(nodebInfo, entities.ConnectionStatus_DISCONNECTED)
 
        if err != nil {
                return err
@@ -77,17 +78,3 @@ func (m *RanDisconnectionManager) DisconnectRan(inventoryName string) error {
        e2tAddress := nodebInfo.AssociatedE2TInstanceAddress
        return m.e2tAssociationManager.DissociateRan(e2tAddress, nodebInfo.RanName)
 }
-
-func (m *RanDisconnectionManager) updateNodebInfo(nodebInfo *entities.NodebInfo, connectionStatus entities.ConnectionStatus) error {
-
-       nodebInfo.ConnectionStatus = connectionStatus
-       err := m.rnibDataService.UpdateNodebInfo(nodebInfo)
-
-       if err != nil {
-               m.logger.Errorf("#RanDisconnectionManager.updateNodebInfo - RAN name: %s - Failed updating RAN's connection status to %s in rNib. Error: %v", nodebInfo.RanName, connectionStatus, err)
-               return err
-       }
-
-       m.logger.Infof("#RanDisconnectionManager.updateNodebInfo - RAN name: %s - Successfully updated rNib. RAN's current connection status: %s", nodebInfo.RanName, nodebInfo.ConnectionStatus)
-       return nil
-}