X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fservices%2Frnib_data_service.go;h=63ac4436e746b80636dbfda53fb71de85e143bbe;hb=fba870af318f9c7061fb53bf5ae398f600069b6e;hp=bc6b8ef0b2443b3566fe13ba9566b0dbf23ae1c4;hpb=d36bbc4b8f5a0798b46d9631af1a264979f4a28b;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/services/rnib_data_service.go b/E2Manager/services/rnib_data_service.go index bc6b8ef..63ac443 100644 --- a/E2Manager/services/rnib_data_service.go +++ b/E2Manager/services/rnib_data_service.go @@ -40,6 +40,10 @@ type RNibDataService interface { GetE2TAddresses() ([]string, error) SaveE2TInstance(e2tInstance *entities.E2TInstance) error SaveE2TAddresses(addresses []string) error + GetE2TInstanceNoLogs(address string) (*entities.E2TInstance, error) + GetE2TInstancesNoLogs(addresses []string) ([]*entities.E2TInstance, error) + SaveE2TInstanceNoLogs(e2tInstance *entities.E2TInstance) error + GetE2TAddressesNoLogs() ([]string, error) } type rNibDataService struct { @@ -120,7 +124,6 @@ func (w *rNibDataService) GetListNodebIds() ([]*entities.NbIdentity, error) { } func (w *rNibDataService) GetE2TInstance(address string) (*entities.E2TInstance, error) { - var e2tInstance *entities.E2TInstance = nil err := w.retry("GetE2TInstance", func() (err error) { @@ -135,6 +138,17 @@ func (w *rNibDataService) GetE2TInstance(address string) (*entities.E2TInstance, return e2tInstance, err } +func (w *rNibDataService) GetE2TInstanceNoLogs(address string) (*entities.E2TInstance, error) { + 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) GetE2TInstances(addresses []string) ([]*entities.E2TInstance, error) { w.logger.Infof("#RnibDataService.GetE2TInstances - addresses: %s", addresses) var e2tInstances []*entities.E2TInstance = nil @@ -147,6 +161,18 @@ func (w *rNibDataService) GetE2TInstances(addresses []string) ([]*entities.E2TIn return e2tInstances, err } +func (w *rNibDataService) GetE2TInstancesNoLogs(addresses []string) ([]*entities.E2TInstance, error) { + + var e2tInstances []*entities.E2TInstance = nil + + err := w.retry("GetE2TInstance", func() (err error) { + e2tInstances, err = w.rnibReader.GetE2TInstances(addresses) + return + }) + + return e2tInstances, err +} + func (w *rNibDataService) GetE2TAddresses() ([]string, error) { var e2tAddresses []string = nil @@ -163,8 +189,26 @@ func (w *rNibDataService) GetE2TAddresses() ([]string, error) { return e2tAddresses, err } +func (w *rNibDataService) GetE2TAddressesNoLogs() ([]string, error) { + + var e2tAddresses []string = nil + + err := w.retry("GetE2TAddresses", func() (err error) { + e2tAddresses, err = w.rnibReader.GetE2TAddresses() + return + }) + + return e2tAddresses, err +} + 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) + + return w.SaveE2TInstanceNoLogs(e2tInstance) +} + +func (w *rNibDataService) SaveE2TInstanceNoLogs(e2tInstance *entities.E2TInstance) error { + err := w.retry("SaveE2TInstance", func() (err error) { err = w.rnibWriter.SaveE2TInstance(e2tInstance) return