)
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)
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 {
- logger *logger.Logger
- rnibReader reader.RNibReader
- rnibWriter rNibWriter.RNibWriter
- maxAttempts int
- retryInterval time.Duration
- stateChangeMessageChannel string
+ 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,
- stateChangeMessageChannel: config.StateChangeMessageChannel,
+ 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)
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)
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
})
return
})
- if err == nil {
- w.logger.Infof("#RnibDataService.GetGeneralConfiguration - enableRic: %t", generalConfiguration.EnableRic)
- }
-
return generalConfiguration, err
}
func (w *rNibDataService) SaveGeneralConfiguration(config *entities.GeneralConfiguration) error {
- w.logger.Infof("#RnibDataService.SaveGeneralConfiguration - configuration: %+v", *config)
-
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()
}
func (w *rNibDataService) UpdateNodebInfoOnConnectionStatusInversion(nodebInfo *entities.NodebInfo, event string) error {
- w.logger.Infof("#RnibDataService.UpdateNodebInfoOnConnectionStatusInversion - nodebInfo: %s", nodebInfo)
+ w.logger.Infof("#RnibDataService.UpdateNodebInfoOnConnectionStatusInversion - event: %s, nodebInfo: %s", event, nodebInfo)
err := w.retry("UpdateNodebInfoOnConnectionStatusInversion", func() (err error) {
- err = w.rnibWriter.UpdateNodebInfoOnConnectionStatusInversion(nodebInfo, w.stateChangeMessageChannel, event)
+ 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
})