//
// Copyright 2019 AT&T Intellectual Property
// Copyright 2019 Nokia
+// Copyright (c) 2020 Samsung Electronics Co., Ltd. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
)
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)
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
+ UpdateNbIdentity(nodeType entities.Node_Type, oldNbIdentities *entities.NbIdentity, newNbIdentities *entities.NbIdentity) error
+ UpdateNbIdentities(nodeType entities.Node_Type, oldNbIdentities []*entities.NbIdentity, newNbIdentities []*entities.NbIdentity) 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)
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
})
})
if err == nil {
- w.logger.Infof("#RnibDataService.GetNodeb - RAN name: %s, connection status: %s, associated E2T: %s", nodeb.RanName, nodeb.ConnectionStatus, nodeb.AssociatedE2TInstanceAddress)
+ w.logger.Infof("#RnibDataService.GetNodeb - RAN name: %s, connection status: %s, associated E2T: %s, setup from network: %t", nodeb.RanName, nodeb.ConnectionStatus, nodeb.AssociatedE2TInstanceAddress, nodeb.SetupFromNetwork)
}
return nodeb, err
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) UpdateNbIdentity(nodeType entities.Node_Type, oldNbIdentity *entities.NbIdentity, newNbIdentity *entities.NbIdentity) error {
+ err := w.retry("UpdateNbIdentities", func() (err error) {
+ err = w.rnibWriter.UpdateNbIdentities(nodeType, []*entities.NbIdentity{oldNbIdentity}, []*entities.NbIdentity{newNbIdentity})
+ return
+ })
+
+ return err
+}
+
+func (w *rNibDataService) UpdateNbIdentities(nodeType entities.Node_Type, oldNbIdentities []*entities.NbIdentity, newNbIdentities []*entities.NbIdentity) error {
+ err := w.retry("UpdateNbIdentities", func() (err error) {
+ err = w.rnibWriter.UpdateNbIdentities(nodeType, oldNbIdentities, newNbIdentities)
+ return
+ })
+
+ return err
+}
+
func (w *rNibDataService) retry(rnibFunc string, f func() error) (err error) {
attempts := w.maxAttempts