Merge "merge of Natalia - change rnib errors"

[ric-plt/e2mgr.git] / E2Manager / services / rnib_reader_service.go

diff --git a/E2Manager/services/rnib_reader_service.go b/E2Manager/services/rnib_reader_service.go
index a598243..4b014d7 100644 (file)
--- a/E2Manager/services/rnib_reader_service.go
+++ b/E2Manager/services/rnib_reader_service.go
@@ -18,7 +18,6 @@
 package services
 
 import (
-       "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"
 )
@@ -31,26 +30,12 @@ func NewRnibReaderService(rnibReaderProvider func() reader.RNibReader) *RnibRead
        return &RnibReaderService{rnibReaderProvider}
 }
 
-func (s RnibReaderService) GetNodeb(ranName string) (*entities.NodebInfo, common.IRNibError) {
+func (s RnibReaderService) GetNodeb(ranName string) (*entities.NodebInfo, error) {
        return s.rnibReaderProvider().GetNodeb(ranName)
 }
 
-func (s  RnibReaderService) GetNodebIdList()(*[]*entities.NbIdentity, common.IRNibError) {
-       enbIdList, err := s.rnibReaderProvider().GetListEnbIds()
-
-       if (err != nil) {
-               return nil, err
-       }
-
-       gnbIdList, err := s.rnibReaderProvider().GetListGnbIds()
-
-       if (err != nil) {
-               return nil, err
-       }
-
-       nodebIdList := append(*enbIdList, *gnbIdList...)
-
-       return &nodebIdList, nil
+func (s  RnibReaderService) GetNodebIdList()([]*entities.NbIdentity, error) {
+       return s.rnibReaderProvider().GetListNodebIds()
 }