[RIC-433] Add unit tests + increment container-tag

[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 902466d..c1bf97b 100644 (file)
--- a/E2Manager/services/rnib_data_service.go
+++ b/E2Manager/services/rnib_data_service.go
@@ -52,6 +52,9 @@ type RNibDataService interface {
        GetGeneralConfiguration() (*entities.GeneralConfiguration, error)
        UpdateNodebInfoOnConnectionStatusInversion(nodebInfo *entities.NodebInfo, event string) error
        SaveGeneralConfiguration(config *entities.GeneralConfiguration) error
+       RemoveEnb(nodebInfo *entities.NodebInfo) error
+       RemoveServedCells(inventoryName string, servedCells []*entities.ServedCellInfo) error
+       UpdateEnb(nodebInfo *entities.NodebInfo, servedCells []*entities.ServedCellInfo) error
 }
 
 type rNibDataService struct {
@@ -60,7 +63,6 @@ type rNibDataService struct {
        rnibWriter       rNibWriter.RNibWriter
        maxAttempts      int
        retryInterval    time.Duration
-       rnibWriterConfig configuration.RnibWriterConfig
 }
 
 func NewRnibDataService(logger *logger.Logger, config *configuration.Configuration, rnibReader reader.RNibReader, rnibWriter rNibWriter.RNibWriter) *rNibDataService {
@@ -70,7 +72,6 @@ func NewRnibDataService(logger *logger.Logger, config *configuration.Configurati
                rnibWriter:       rnibWriter,
                maxAttempts:      config.MaxRnibConnectionAttempts,
                retryInterval:    time.Duration(config.RnibRetryIntervalMs) * time.Millisecond,
-               rnibWriterConfig: config.RnibWriter,
        }
 }
 
@@ -83,6 +84,17 @@ func (w *rNibDataService) RemoveServedNrCells(inventoryName string, servedNrCell
        return err
 }
 
+func (w *rNibDataService) RemoveEnb(nodebInfo *entities.NodebInfo) error {
+       w.logger.Infof("#RnibDataService.RemoveEnb - nodebInfo: %s", nodebInfo)
+
+       err := w.retry("RemoveEnb", func() (err error) {
+               err = w.rnibWriter.RemoveEnb(nodebInfo)
+               return
+       })
+
+       return err
+}
+
 func (w *rNibDataService) UpdateGnbCells(nodebInfo *entities.NodebInfo, servedNrCells []*entities.ServedNRCell) error {
        w.logger.Infof("#RnibDataService.UpdateGnbCells - nodebInfo: %s, servedNrCells: %s", nodebInfo, servedNrCells)
 
@@ -294,6 +306,24 @@ func (w *rNibDataService) SaveGeneralConfiguration(config *entities.GeneralConfi
        return err
 }
 
+func (w *rNibDataService) RemoveServedCells(inventoryName string, servedCells []*entities.ServedCellInfo) error {
+       err := w.retry("RemoveServedCells", func() (err error) {
+               err = w.rnibWriter.RemoveServedCells(inventoryName, servedCells)
+               return
+       })
+
+       return err
+}
+
+func (w *rNibDataService) UpdateEnb(nodebInfo *entities.NodebInfo, servedCells []*entities.ServedCellInfo) error {
+       err := w.retry("UpdateEnb", func() (err error) {
+               err = w.rnibWriter.UpdateEnb(nodebInfo, servedCells)
+               return
+       })
+
+       return err
+}
+
 func (w *rNibDataService) PingRnib() bool {
        err := w.retry("GetListNodebIds", func() (err error) {
                _, err = w.rnibReader.GetListNodebIds()
@@ -304,10 +334,10 @@ func (w *rNibDataService) PingRnib() bool {
 }
 
 func (w *rNibDataService) UpdateNodebInfoOnConnectionStatusInversion(nodebInfo *entities.NodebInfo, event string) error {
-       w.logger.Infof("#RnibDataService.UpdateNodebInfoOnConnectionStatusInversion - stateChangeMessageChannel: %s, event: %s, nodebInfo: %s", w.rnibWriterConfig.StateChangeMessageChannel, event, nodebInfo)
+       w.logger.Infof("#RnibDataService.UpdateNodebInfoOnConnectionStatusInversion - event: %s, nodebInfo: %s", event, nodebInfo)
 
        err := w.retry("UpdateNodebInfoOnConnectionStatusInversion", func() (err error) {
-               err = w.rnibWriter.UpdateNodebInfoOnConnectionStatusInversion(nodebInfo, w.rnibWriterConfig.StateChangeMessageChannel, event)
+               err = w.rnibWriter.UpdateNodebInfoOnConnectionStatusInversion(nodebInfo, event)
                return
        })