X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fservices%2Frnib_data_service.go;h=7235028ad2d43eba5ac7c21787a1fc90fb09aea7;hb=refs%2Fchanges%2F07%2F4007%2F1;hp=1a5af5931a5af8d8fdf9cfcdf6c22302205c7ecf;hpb=5c9533257e79cc65d506df54105933bf5844e7ab;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/services/rnib_data_service.go b/E2Manager/services/rnib_data_service.go
index 1a5af59..7235028 100644
--- a/E2Manager/services/rnib_data_service.go
+++ b/E2Manager/services/rnib_data_service.go
@@ -17,7 +17,6 @@
 //  This source code is part of the near-RT RIC (RAN Intelligent Controller)
 //  platform project (RICP).
 
-
 package services
 
 import (
@@ -47,6 +46,9 @@ type RNibDataService interface {
 	GetE2TInstancesNoLogs(addresses []string) ([]*entities.E2TInstance, error)
 	SaveE2TInstanceNoLogs(e2tInstance *entities.E2TInstance) error
 	GetE2TAddressesNoLogs() ([]string, error)
+	RemoveE2TInstance(e2tAddress string) error
+	UpdateGnbCells(nodebInfo *entities.NodebInfo, servedNrCells []*entities.ServedNRCell) error
+	RemoveServedNrCells(inventoryName string, servedNrCells []*entities.ServedNRCell) error
 }
 
 type rNibDataService struct {
@@ -67,6 +69,26 @@ func NewRnibDataService(logger *logger.Logger, config *configuration.Configurati
 	}
 }
 
+func (w *rNibDataService) RemoveServedNrCells(inventoryName string, servedNrCells []*entities.ServedNRCell) error {
+	err := w.retry("RemoveServedNrCells", func() (err error) {
+		err = w.rnibWriter.RemoveServedNrCells(inventoryName, servedNrCells)
+		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)
+
+	err := w.retry("UpdateGnbCells", func() (err error) {
+		err = w.rnibWriter.UpdateGnbCells(nodebInfo, servedNrCells)
+		return
+	})
+
+	return err
+}
+
 func (w *rNibDataService) UpdateNodebInfo(nodebInfo *entities.NodebInfo) error {
 	w.logger.Infof("#RnibDataService.UpdateNodebInfo - nodebInfo: %s", nodebInfo)
 
@@ -110,7 +132,7 @@ func (w *rNibDataService) GetNodeb(ranName string) (*entities.NodebInfo, error)
 	})
 
 	if err == nil {
-		w.logger.Infof("#RnibDataService.GetNodeb - RAN name: %s, connection status: %s", nodeb.RanName, nodeb.ConnectionStatus)
+		w.logger.Infof("#RnibDataService.GetNodeb - RAN name: %s, connection status: %s, associated E2T: %s", nodeb.RanName, nodeb.ConnectionStatus, nodeb.AssociatedE2TInstanceAddress)
 	}
 
 	return nodeb, err
@@ -210,7 +232,7 @@ func (w *rNibDataService) GetE2TAddressesNoLogs() ([]string, error) {
 }
 
 func (w *rNibDataService) SaveE2TInstance(e2tInstance *entities.E2TInstance) error {
-	w.logger.Infof("#RnibDataService.SaveE2TInstance - E2T instance address: %s, state: %s, associated RANs count: %d, keep Alive ts: %d", e2tInstance.Address, e2tInstance.State, len(e2tInstance.AssociatedRanList), e2tInstance.KeepAliveTimestamp)
+	w.logger.Infof("#RnibDataService.SaveE2TInstance - E2T instance address: %s, podName: %s, state: %s, associated RANs count: %d, keep Alive ts: %d", e2tInstance.Address, e2tInstance.PodName, e2tInstance.State, len(e2tInstance.AssociatedRanList), e2tInstance.KeepAliveTimestamp)
 
 	return w.SaveE2TInstanceNoLogs(e2tInstance)
 }
@@ -236,6 +258,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()