X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=E2Manager%2Fservices%2Frnib_data_service.go;h=2ab34d2f1b17add8987dff40f1368346825a256a;hb=refs%2Fchanges%2F37%2F4337%2F1;hp=902466dd7550441b02d25453a9be143807f15f09;hpb=14eb5132c3dca8cdad98e7e5420701b04f452046;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/services/rnib_data_service.go b/E2Manager/services/rnib_data_service.go
index 902466d..2ab34d2 100644
--- a/E2Manager/services/rnib_data_service.go
+++ b/E2Manager/services/rnib_data_service.go
@@ -52,6 +52,7 @@ type RNibDataService interface {
 	GetGeneralConfiguration() (*entities.GeneralConfiguration, error)
 	UpdateNodebInfoOnConnectionStatusInversion(nodebInfo *entities.NodebInfo, event string) error
 	SaveGeneralConfiguration(config *entities.GeneralConfiguration) error
+	RemoveEnb(nodebInfo *entities.NodebInfo) error
 }
 
 type rNibDataService struct {
@@ -60,7 +61,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 +70,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 +82,15 @@ func (w *rNibDataService) RemoveServedNrCells(inventoryName string, servedNrCell
 	return err
 }
 
+func (w *rNibDataService) RemoveEnb(nodebInfo *entities.NodebInfo) error {
+	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)
 
@@ -304,10 +312,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
 	})