Merge "[RICPLT-1528] xApp Mock improvements..." into PI3

[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 02f8e1d..1ac2068 100644 (file)
--- a/E2Manager/services/rnib_data_service.go
+++ b/E2Manager/services/rnib_data_service.go
@@ -21,9 +21,9 @@ import (
        "e2mgr/configuration"
        "e2mgr/logger"
        "e2mgr/rNibWriter"
+       "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader"
-       "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
        "net"
        "time"
 )
@@ -35,23 +35,27 @@ type RNibDataService interface {
        GetNodeb(ranName string) (*entities.NodebInfo, error)
        GetListNodebIds() ([]*entities.NbIdentity, error)
        PingRnib() bool
+       GetE2TInstance(address string) (*entities.E2TInstance, error)
+       GetE2TInfoList() ([]*entities.E2TInstanceInfo, error)
+       SaveE2TInstance(e2tInstance *entities.E2TInstance) error
+       SaveE2TInfoList(e2tInfoList []*entities.E2TInstanceInfo) error
 }
 
 type rNibDataService struct {
-       logger             *logger.Logger
-       rnibReaderProvider func() reader.RNibReader
-       rnibWriterProvider func() 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, rnibReaderProvider func() reader.RNibReader, rnibWriterProvider func() rNibWriter.RNibWriter) *rNibDataService {
+func NewRnibDataService(logger *logger.Logger, config *configuration.Configuration, rnibReader reader.RNibReader, rnibWriter rNibWriter.RNibWriter) *rNibDataService {
        return &rNibDataService{
-               logger:             logger,
-               rnibReaderProvider: rnibReaderProvider,
-               rnibWriterProvider: rnibWriterProvider,
-               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,
        }
 }
 
@@ -59,7 +63,7 @@ func (w *rNibDataService) UpdateNodebInfo(nodebInfo *entities.NodebInfo) error {
        w.logger.Infof("#RnibDataService.UpdateNodebInfo - nodebInfo: %s", nodebInfo)
 
        err := w.retry("UpdateNodebInfo", func() (err error) {
-               err = w.rnibWriterProvider().UpdateNodebInfo(nodebInfo)
+               err = w.rnibWriter.UpdateNodebInfo(nodebInfo)
                return
        })
 
@@ -70,7 +74,7 @@ func (w *rNibDataService) SaveNodeb(nbIdentity *entities.NbIdentity, nb *entitie
        w.logger.Infof("#RnibDataService.SaveNodeb - nbIdentity: %s, nodebInfo: %s", nbIdentity, nb)
 
        err := w.retry("SaveNodeb", func() (err error) {
-               err = w.rnibWriterProvider().SaveNodeb(nbIdentity, nb)
+               err = w.rnibWriter.SaveNodeb(nbIdentity, nb)
                return
        })
 
@@ -81,7 +85,7 @@ func (w *rNibDataService) SaveRanLoadInformation(inventoryName string, ranLoadIn
        w.logger.Infof("#RnibDataService.SaveRanLoadInformation - inventoryName: %s, ranLoadInformation: %s", inventoryName, ranLoadInformation)
 
        err := w.retry("SaveRanLoadInformation", func() (err error) {
-               err = w.rnibWriterProvider().SaveRanLoadInformation(inventoryName, ranLoadInformation)
+               err = w.rnibWriter.SaveRanLoadInformation(inventoryName, ranLoadInformation)
                return
        })
 
@@ -94,7 +98,7 @@ func (w *rNibDataService) GetNodeb(ranName string) (*entities.NodebInfo, error)
        var nodeb *entities.NodebInfo = nil
 
        err := w.retry("GetNodeb", func() (err error) {
-               nodeb, err = w.rnibReaderProvider().GetNodeb(ranName)
+               nodeb, err = w.rnibReader.GetNodeb(ranName)
                return
        })
 
@@ -107,16 +111,63 @@ func (w *rNibDataService) GetListNodebIds() ([]*entities.NbIdentity, error) {
        var nodeIds []*entities.NbIdentity = nil
 
        err := w.retry("GetListNodebIds", func() (err error) {
-               nodeIds, err = w.rnibReaderProvider().GetListNodebIds()
+               nodeIds, err = w.rnibReader.GetListNodebIds()
                return
        })
 
        return nodeIds, err
 }
 
+func (w *rNibDataService) GetE2TInstance(address string) (*entities.E2TInstance, error) {
+       w.logger.Infof("#RnibDataService.GetE2TInstance")
+
+       var e2tInstance *entities.E2TInstance = nil
+
+       err := w.retry("GetE2TInstance", func() (err error) {
+               e2tInstance, err = w.rnibReader.GetE2TInstance(address)
+               return
+       })
+
+       return e2tInstance, err
+}
+func (w *rNibDataService) GetE2TInfoList() ([]*entities.E2TInstanceInfo, error) {
+       w.logger.Infof("#RnibDataService.GetE2TInfoList")
+
+       var e2tInfoList []*entities.E2TInstanceInfo = nil
+
+       err := w.retry("GetE2TInfoList", func() (err error) {
+               e2tInfoList, err = w.rnibReader.GetE2TInfoList()
+               return
+       })
+
+       return e2tInfoList, err
+}
+
+func (w *rNibDataService) SaveE2TInstance(e2tInstance *entities.E2TInstance) error {
+       w.logger.Infof("#RnibDataService.SaveE2TInstance")
+
+       err := w.retry("SaveE2TInstance", func() (err error) {
+               err = w.rnibWriter.SaveE2TInstance(e2tInstance)
+               return
+       })
+
+       return err
+}
+
+func (w *rNibDataService) SaveE2TInfoList(e2tInfoList []*entities.E2TInstanceInfo) error {
+       w.logger.Infof("#RnibDataService.SaveE2TInfoList")
+
+       err := w.retry("SaveE2TInfoList", func() (err error) {
+               err = w.rnibWriter.SaveE2TInfoList(e2tInfoList)
+               return
+       })
+
+       return err
+}
+
 func (w *rNibDataService) PingRnib() bool {
        err := w.retry("GetListNodebIds", func() (err error) {
-               _, err = w.rnibReaderProvider().GetListNodebIds()
+               _, err = w.rnibReader.GetListNodebIds()
                return
        })
 
@@ -144,7 +195,6 @@ func (w *rNibDataService) retry(rnibFunc string, f func() error) (err error) {
        }
 }
 
-
 func isRnibConnectionError(err error) bool {
        internalErr, ok := err.(*common.InternalError)
        if !ok {