[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 7125271..e2b5dc4 100644 (file)
--- a/E2Manager/services/rnib_data_service.go
+++ b/E2Manager/services/rnib_data_service.go
@@ -33,6 +33,7 @@ import (
 type RNibDataService interface {
        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)
@@ -57,6 +58,7 @@ type RNibDataService interface {
        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 {
@@ -141,6 +143,17 @@ func (w *rNibDataService) UpdateNodebInfo(nodebInfo *entities.NodebInfo) error {
        return err
 }
 
+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)
 
@@ -368,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