[RICPLT-2584] Implementation of E2TShutdownManager + Automation fix

[ric-plt/e2mgr.git] / E2Manager / services / rnib_data_service.go

diff --git a/E2Manager/services/rnib_data_service.go b/E2Manager/services/rnib_data_service.go
index 1274c53..35b4c02 100644 (file)
--- a/E2Manager/services/rnib_data_service.go
+++ b/E2Manager/services/rnib_data_service.go
@@ -47,6 +47,7 @@ type RNibDataService interface {
        GetE2TInstancesNoLogs(addresses []string) ([]*entities.E2TInstance, error)
        SaveE2TInstanceNoLogs(e2tInstance *entities.E2TInstance) error
        GetE2TAddressesNoLogs() ([]string, error)
+       RemoveE2TInstance(e2tAddress string) error
 }
 
 type rNibDataService struct {
@@ -101,7 +102,6 @@ func (w *rNibDataService) SaveRanLoadInformation(inventoryName string, ranLoadIn
 }
 
 func (w *rNibDataService) GetNodeb(ranName string) (*entities.NodebInfo, error) {
-       w.logger.Infof("#RnibDataService.GetNodeb - RAN name: %s", ranName)
 
        var nodeb *entities.NodebInfo = nil
 
@@ -110,12 +110,14 @@ func (w *rNibDataService) GetNodeb(ranName string) (*entities.NodebInfo, error)
                return
        })
 
+       if err == nil {
+               w.logger.Infof("#RnibDataService.GetNodeb - RAN name: %s, connection status: %s", nodeb.RanName, nodeb.ConnectionStatus)
+       }
+
        return nodeb, err
 }
 
 func (w *rNibDataService) GetListNodebIds() ([]*entities.NbIdentity, error) {
-       w.logger.Infof("#RnibDataService.GetListNodebIds")
-
        var nodeIds []*entities.NbIdentity = nil
 
        err := w.retry("GetListNodebIds", func() (err error) {
@@ -123,6 +125,10 @@ func (w *rNibDataService) GetListNodebIds() ([]*entities.NbIdentity, error) {
                return
        })
 
+       if err == nil {
+               w.logger.Infof("#RnibDataService.GetListNodebIds - RANs count: %d", len(nodeIds))
+       }
+
        return nodeIds, err
 }
 
@@ -231,6 +237,17 @@ func (w *rNibDataService) SaveE2TAddresses(addresses []string) error {
        return err
 }
 
+func (w *rNibDataService) RemoveE2TInstance(e2tAddress string) error {
+       w.logger.Infof("#RnibDataService.RemoveE2TInstance - e2tAddress: %s", e2tAddress)
+
+       err := w.retry("RemoveE2TInstance", func() (err error) {
+               err = w.rnibWriter.RemoveE2TInstance(e2tAddress)
+               return
+       })
+
+       return err
+}
+
 func (w *rNibDataService) PingRnib() bool {
        err := w.retry("GetListNodebIds", func() (err error) {
                _, err = w.rnibReader.GetListNodebIds()