X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fservices%2Frnib_data_service.go;h=c053171ca340d9bca790a5eb90b158e84e4df42f;hb=refs%2Fchanges%2F20%2F4520%2F2;hp=1274c533e93530a5de61ab16649c559cb249fc28;hpb=efcb4528362460aa2249d319c9752b63bb720fe2;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/services/rnib_data_service.go b/E2Manager/services/rnib_data_service.go index 1274c53..c053171 100644 --- a/E2Manager/services/rnib_data_service.go +++ b/E2Manager/services/rnib_data_service.go @@ -17,7 +17,6 @@ // This source code is part of the near-RT RIC (RAN Intelligent Controller) // platform project (RICP). - package services import ( @@ -32,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) @@ -47,6 +47,19 @@ type RNibDataService interface { GetE2TInstancesNoLogs(addresses []string) ([]*entities.E2TInstance, error) SaveE2TInstanceNoLogs(e2tInstance *entities.E2TInstance) error GetE2TAddressesNoLogs() ([]string, error) + RemoveE2TInstance(e2tAddress string) error + UpdateGnbCells(nodebInfo *entities.NodebInfo, servedNrCells []*entities.ServedNRCell) error + RemoveServedNrCells(inventoryName string, servedNrCells []*entities.ServedNRCell) 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 + UpdateNbIdentity(nodeType entities.Node_Type, oldNbIdentities *entities.NbIdentity, newNbIdentities *entities.NbIdentity) error } type rNibDataService struct { @@ -67,6 +80,59 @@ func NewRnibDataService(logger *logger.Logger, config *configuration.Configurati } } +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 + }) + + 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) + + err := w.retry("UpdateGnbCells", func() (err error) { + err = w.rnibWriter.UpdateGnbCells(nodebInfo, servedNrCells) + return + }) + + return err +} + func (w *rNibDataService) UpdateNodebInfo(nodebInfo *entities.NodebInfo) error { w.logger.Infof("#RnibDataService.UpdateNodebInfo - nodebInfo: %s", nodebInfo) @@ -78,11 +144,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 }) @@ -101,7 +178,6 @@ func (w *rNibDataService) SaveRanLoadInformation(inventoryName string, ranLoadIn } func (w *rNibDataService) GetNodeb(ranName string) (*entities.NodebInfo, error) { - w.logger.Infof("#RnibDataService.GetNodeb - RAN name: %s", ranName) var nodeb *entities.NodebInfo = nil @@ -110,12 +186,14 @@ func (w *rNibDataService) GetNodeb(ranName string) (*entities.NodebInfo, error) return }) + if err == nil { + 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 } func (w *rNibDataService) GetListNodebIds() ([]*entities.NbIdentity, error) { - w.logger.Infof("#RnibDataService.GetListNodebIds") - var nodeIds []*entities.NbIdentity = nil err := w.retry("GetListNodebIds", func() (err error) { @@ -123,6 +201,10 @@ func (w *rNibDataService) GetListNodebIds() ([]*entities.NbIdentity, error) { return }) + if err == nil { + w.logger.Infof("#RnibDataService.GetListNodebIds - RANs count: %d", len(nodeIds)) + } + return nodeIds, err } @@ -205,7 +287,7 @@ func (w *rNibDataService) GetE2TAddressesNoLogs() ([]string, error) { } func (w *rNibDataService) SaveE2TInstance(e2tInstance *entities.E2TInstance) error { - w.logger.Infof("#RnibDataService.SaveE2TInstance - E2T instance address: %s, state: %s, associated RANs count: %d, keep Alive ts: %d", e2tInstance.Address, e2tInstance.State, len(e2tInstance.AssociatedRanList), e2tInstance.KeepAliveTimestamp) + w.logger.Infof("#RnibDataService.SaveE2TInstance - E2T instance address: %s, podName: %s, state: %s, associated RANs count: %d, keep Alive ts: %d", e2tInstance.Address, e2tInstance.PodName, e2tInstance.State, len(e2tInstance.AssociatedRanList), e2tInstance.KeepAliveTimestamp) return w.SaveE2TInstanceNoLogs(e2tInstance) } @@ -231,6 +313,55 @@ func (w *rNibDataService) SaveE2TAddresses(addresses []string) error { return err } +func (w *rNibDataService) RemoveE2TInstance(e2tAddress string) error { + w.logger.Infof("#RnibDataService.RemoveE2TInstance - e2tAddress: %s", e2tAddress) + + err := w.retry("RemoveE2TInstance", func() (err error) { + err = w.rnibWriter.RemoveE2TInstance(e2tAddress) + return + }) + + return err +} + +func (w *rNibDataService) GetGeneralConfiguration() (*entities.GeneralConfiguration, error) { + var generalConfiguration *entities.GeneralConfiguration = nil + + err := w.retry("GetGeneralConfiguration", func() (err error) { + generalConfiguration, err = w.rnibReader.GetGeneralConfiguration() + return + }) + + return generalConfiguration, err +} + +func (w *rNibDataService) SaveGeneralConfiguration(config *entities.GeneralConfiguration) error { + 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() @@ -240,6 +371,37 @@ func (w *rNibDataService) PingRnib() bool { return !isRnibConnectionError(err) } +func (w *rNibDataService) UpdateNodebInfoOnConnectionStatusInversion(nodebInfo *entities.NodebInfo, event string) error { + w.logger.Infof("#RnibDataService.UpdateNodebInfoOnConnectionStatusInversion - event: %s, nodebInfo: %s", event, nodebInfo) + + err := w.retry("UpdateNodebInfoOnConnectionStatusInversion", func() (err error) { + 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 + }) + + 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) retry(rnibFunc string, f func() error) (err error) { attempts := w.maxAttempts