X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fservices%2Frnib_data_service.go;h=e96ba488315866bbf7a439ca0b3e25777d41d8af;hb=197657e0e814c871b903ef779ad654b13347e430;hp=35b4c02e47f7730359956a041229107d9f8787de;hpb=f846c5987cd35da745534e26ac3a22bdcf8b030a;p=ric-plt%2Fe2mgr.git

diff --git a/E2Manager/services/rnib_data_service.go b/E2Manager/services/rnib_data_service.go
index 35b4c02..e96ba48 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 (
@@ -48,26 +47,53 @@ type RNibDataService interface {
 	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
+	GetGeneralConfiguration() (*entities.GeneralConfiguration, error)
+	UpdateNodebInfoOnConnectionStatusInversion(nodebInfo *entities.NodebInfo, event string) error
+	SaveGeneralConfiguration(config *entities.GeneralConfiguration) error
 }
 
 type rNibDataService struct {
-	logger        *logger.Logger
-	rnibReader    reader.RNibReader
-	rnibWriter    rNibWriter.RNibWriter
-	maxAttempts   int
-	retryInterval time.Duration
+	logger                    *logger.Logger
+	rnibReader                reader.RNibReader
+	rnibWriter                rNibWriter.RNibWriter
+	maxAttempts               int
+	retryInterval             time.Duration
+	stateChangeMessageChannel string
 }
 
 func NewRnibDataService(logger *logger.Logger, config *configuration.Configuration, rnibReader reader.RNibReader, rnibWriter rNibWriter.RNibWriter) *rNibDataService {
 	return &rNibDataService{
-		logger:        logger,
-		rnibReader:    rnibReader,
-		rnibWriter:    rnibWriter,
-		maxAttempts:   config.MaxRnibConnectionAttempts,
-		retryInterval: time.Duration(config.RnibRetryIntervalMs) * time.Millisecond,
+		logger:                    logger,
+		rnibReader:                rnibReader,
+		rnibWriter:                rnibWriter,
+		maxAttempts:               config.MaxRnibConnectionAttempts,
+		retryInterval:             time.Duration(config.RnibRetryIntervalMs) * time.Millisecond,
+		stateChangeMessageChannel: config.StateChangeMessageChannel,
 	}
 }
 
+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)
 
@@ -111,7 +137,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
@@ -211,7 +237,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)
 }
@@ -248,6 +274,26 @@ 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) PingRnib() bool {
 	err := w.retry("GetListNodebIds", func() (err error) {
 		_, err = w.rnibReader.GetListNodebIds()
@@ -257,6 +303,17 @@ func (w *rNibDataService) PingRnib() bool {
 	return !isRnibConnectionError(err)
 }
 
+func (w *rNibDataService) UpdateNodebInfoOnConnectionStatusInversion(nodebInfo *entities.NodebInfo, event string) error {
+	w.logger.Infof("#RnibDataService.UpdateNodebInfoOnConnectionStatusInversion - nodebInfo: %s", nodebInfo)
+
+	err := w.retry("UpdateNodebInfoOnConnectionStatusInversion", func() (err error) {
+		err = w.rnibWriter.UpdateNodebInfoOnConnectionStatusInversion(nodebInfo, w.stateChangeMessageChannel, event)
+		return
+	})
+
+	return err
+}
+
 func (w *rNibDataService) retry(rnibFunc string, f func() error) (err error) {
 	attempts := w.maxAttempts