X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fservices%2Frnib_data_service.go;h=e2b5dc41c4e3b9858178a1d1bed1a53f874a27f0;hb=69f1211bf4b73c8b61ccaf10b75de53a2a6dbc65;hp=af329afe7c279fb9e12f32927c3c7bd27b489c7e;hpb=08bbf91d9f5afd6ecd6eeb9bcc8c160b8242d1ec;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/services/rnib_data_service.go b/E2Manager/services/rnib_data_service.go
index af329af..e2b5dc4 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 (
@@ -32,8 +31,9 @@ import (
 )
 
 type RNibDataService interface {
-	SaveNodeb(nbIdentity *entities.NbIdentity, nb *entities.NodebInfo) error
+	SaveNodeb(nodebInfo *entities.NodebInfo) error
 	UpdateNodebInfo(nodebInfo *entities.NodebInfo) error
+	UpdateNodebInfoAndPublish(nodebInfo *entities.NodebInfo) error
 	SaveRanLoadInformation(inventoryName string, ranLoadInformation *entities.RanLoadInformation) error
 	GetNodeb(ranName string) (*entities.NodebInfo, error)
 	GetListNodebIds() ([]*entities.NbIdentity, error)
@@ -49,6 +49,16 @@ type RNibDataService interface {
 	GetE2TAddressesNoLogs() ([]string, error)
 	RemoveE2TInstance(e2tAddress string) error
 	UpdateGnbCells(nodebInfo *entities.NodebInfo, servedNrCells []*entities.ServedNRCell) error
+	RemoveServedNrCells(inventoryName string, servedNrCells []*entities.ServedNRCell) error
+	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
+	AddNbIdentity(nodeType entities.Node_Type, nbIdentity *entities.NbIdentity) error
+	RemoveNbIdentity(nodeType entities.Node_Type, nbIdentity *entities.NbIdentity) error
+	AddEnb(nodebInfo *entities.NodebInfo) error
 }
 
 type rNibDataService struct {
@@ -69,6 +79,48 @@ func NewRnibDataService(logger *logger.Logger, config *configuration.Configurati
 	}
 }
 
+func (w *rNibDataService) AddNbIdentity(nodeType entities.Node_Type, nbIdentity *entities.NbIdentity) error {
+	w.logger.Infof("#RnibDataService.AddNbIdentity - nbIdentity: %s", nbIdentity)
+
+	err := w.retry("AddNbIdentity", func() (err error) {
+		err = w.rnibWriter.AddNbIdentity(nodeType, nbIdentity)
+		return
+	})
+
+	return err
+}
+
+func (w *rNibDataService) RemoveNbIdentity(nodeType entities.Node_Type, nbIdentity *entities.NbIdentity) error{
+	w.logger.Infof("#RnibDataService.RemoveNbIdentity - nbIdentity: %s", nbIdentity)
+
+	err := w.retry("RemoveNbIdentity", func() (err error) {
+		err = w.rnibWriter.RemoveNbIdentity(nodeType, nbIdentity)
+		return
+	})
+
+	return err
+}
+
+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) 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)
 
@@ -91,11 +143,22 @@ func (w *rNibDataService) UpdateNodebInfo(nodebInfo *entities.NodebInfo) error {
 	return err
 }
 
-func (w *rNibDataService) SaveNodeb(nbIdentity *entities.NbIdentity, nb *entities.NodebInfo) error {
-	w.logger.Infof("#RnibDataService.SaveNodeb - nbIdentity: %s, nodebInfo: %s", nbIdentity, nb)
+func (w *rNibDataService) UpdateNodebInfoAndPublish(nodebInfo *entities.NodebInfo) error {
+	w.logger.Infof("#RnibDataService.UpdateNodebInfoAndPublish - nodebInfo: %s", nodebInfo)
+
+	err := w.retry("UpdateNodebInfoAndPublish", func() (err error) {
+		err = w.rnibWriter.UpdateNodebInfoAndPublish(nodebInfo)
+		return
+	})
+
+	return err
+}
+
+func (w *rNibDataService) SaveNodeb(nodebInfo *entities.NodebInfo) error {
+	w.logger.Infof("#RnibDataService.SaveNodeb - nodebInfo: %s", nodebInfo)
 
 	err := w.retry("SaveNodeb", func() (err error) {
-		err = w.rnibWriter.SaveNodeb(nbIdentity, nb)
+		err = w.rnibWriter.SaveNodeb(nodebInfo)
 		return
 	})
 
@@ -260,6 +323,44 @@ func (w *rNibDataService) RemoveE2TInstance(e2tAddress string) error {
 	return err
 }
 
+func (w *rNibDataService) GetGeneralConfiguration() (*entities.GeneralConfiguration, error) {
+	var generalConfiguration *entities.GeneralConfiguration = nil
+
+	err := w.retry("GetGeneralConfiguration", func() (err error) {
+		generalConfiguration, err = w.rnibReader.GetGeneralConfiguration()
+		return
+	})
+
+	return generalConfiguration, err
+}
+
+func (w *rNibDataService) SaveGeneralConfiguration(config *entities.GeneralConfiguration) error {
+	err := w.retry("SaveGeneralConfiguration", func() (err error) {
+		err = w.rnibWriter.SaveGeneralConfiguration(config)
+		return
+	})
+
+	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()
@@ -269,6 +370,28 @@ func (w *rNibDataService) PingRnib() bool {
 	return !isRnibConnectionError(err)
 }
 
+func (w *rNibDataService) UpdateNodebInfoOnConnectionStatusInversion(nodebInfo *entities.NodebInfo, event string) error {
+	w.logger.Infof("#RnibDataService.UpdateNodebInfoOnConnectionStatusInversion - event: %s, nodebInfo: %s", event, nodebInfo)
+
+	err := w.retry("UpdateNodebInfoOnConnectionStatusInversion", func() (err error) {
+		err = w.rnibWriter.UpdateNodebInfoOnConnectionStatusInversion(nodebInfo, event)
+		return
+	})
+
+	return err
+}
+
+func (w *rNibDataService) AddEnb(nodebInfo *entities.NodebInfo) error {
+	w.logger.Infof("#RnibDataService.AddEnb - nodebInfo: %s", nodebInfo)
+
+	err := w.retry("AddEnb", func() (err error) {
+		err = w.rnibWriter.AddEnb(nodebInfo)
+		return
+	})
+
+	return err
+}
+
 func (w *rNibDataService) retry(rnibFunc string, f func() error) (err error) {
 	attempts := w.maxAttempts