[RIC-587] Update E2 Setup existing nodeb behavior

[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 2ab34d2..e2b5dc4 100644 (file)
--- a/E2Manager/services/rnib_data_service.go
+++ b/E2Manager/services/rnib_data_service.go
@@ -31,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)
@@ -53,26 +54,53 @@ type RNibDataService interface {
        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 {
-       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
 }
 
 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,
        }
 }
 
+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)
@@ -83,6 +111,8 @@ func (w *rNibDataService) RemoveServedNrCells(inventoryName string, servedNrCell
 }
 
 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
@@ -113,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
        })
 
@@ -302,6 +343,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()
@@ -322,6 +381,17 @@ func (w *rNibDataService) UpdateNodebInfoOnConnectionStatusInversion(nodebInfo *
        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