Code Review
/
ric-plt
/
nodeb-rnib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[RICPLT-1897] GetListNodebIds API has been changed. After code review
[ric-plt/nodeb-rnib.git]
/
reader
/
rNibReader.go
diff --git
a/reader/rNibReader.go
b/reader/rNibReader.go
index
0509326
..
49ee38c
100644
(file)
--- a/
reader/rNibReader.go
+++ b/
reader/rNibReader.go
@@
-58,11
+58,6
@@
type RNibReader interface {
GetRanLoadInformation(inventoryName string) (*entities.RanLoadInformation, common.IRNibError)
}
GetRanLoadInformation(inventoryName string) (*entities.RanLoadInformation, common.IRNibError)
}
-const(
- EnbType = "ENB"
- GnbType = "GNB"
-)
-
/*
Init initializes the infrastructure required for the RNibReader instance
*/
/*
Init initializes the infrastructure required for the RNibReader instance
*/
@@
-126,17
+121,17
@@
func (w *rNibReaderInstance) GetCellList(inventoryName string) (*entities.Cells,
func (w *rNibReaderInstance) GetListGnbIds() (*[]*entities.NbIdentity, common.IRNibError) {
defer readerPool.Put(w)
func (w *rNibReaderInstance) GetListGnbIds() (*[]*entities.NbIdentity, common.IRNibError) {
defer readerPool.Put(w)
- return w.getListNodebIdsByType(
GnbType
)
+ return w.getListNodebIdsByType(
entities.Node_GNB.String()
)
}
func (w *rNibReaderInstance) GetListEnbIds() (*[]*entities.NbIdentity, common.IRNibError) {
defer readerPool.Put(w)
}
func (w *rNibReaderInstance) GetListEnbIds() (*[]*entities.NbIdentity, common.IRNibError) {
defer readerPool.Put(w)
- return w.getListNodebIdsByType(
EnbType
)
+ return w.getListNodebIdsByType(
entities.Node_ENB.String()
)
}
func (w *rNibReaderInstance) GetCountGnbList() (int, common.IRNibError) {
defer readerPool.Put(w)
}
func (w *rNibReaderInstance) GetCountGnbList() (int, common.IRNibError) {
defer readerPool.Put(w)
- size, err := (*w.sdl).GroupSize(
GnbType
)
+ size, err := (*w.sdl).GroupSize(
entities.Node_GNB.String()
)
if err != nil {
return 0, common.NewInternalError(err)
}
if err != nil {
return 0, common.NewInternalError(err)
}
@@
-171,15
+166,21
@@
func (w *rNibReaderInstance) GetCellById(cellType entities.Cell_Type, cellId str
func (w *rNibReaderInstance) GetListNodebIds()([]*entities.NbIdentity, common.IRNibError){
defer readerPool.Put(w)
func (w *rNibReaderInstance) GetListNodebIds()([]*entities.NbIdentity, common.IRNibError){
defer readerPool.Put(w)
- dataEnb, err := (*w.sdl).GetMembers(EnbType)
+ dataEnb, err := (*w.sdl).GetMembers(entities.Node_ENB.String())
+ if err != nil{
+ return nil, common.NewInternalError(err)
+ }
+ dataGnb, err := (*w.sdl).GetMembers(entities.Node_GNB.String())
if err != nil{
return nil, common.NewInternalError(err)
}
if err != nil{
return nil, common.NewInternalError(err)
}
- data
Gnb, err := (*w.sdl).GetMembers(GnbType
)
+ data
Unknown, err := (*w.sdl).GetMembers(entities.Node_UNKNOWN.String()
)
if err != nil{
return nil, common.NewInternalError(err)
}
if err != nil{
return nil, common.NewInternalError(err)
}
- data, rnibErr := unmarshalIdentityList(append(dataEnb, dataGnb...))
+ allIds := append(dataEnb, dataGnb...)
+ allIds = append(allIds, dataUnknown...)
+ data, rnibErr := unmarshalIdentityList(allIds)
return *data, rnibErr
}
return *data, rnibErr
}
@@
-266,4
+267,4
@@
func unmarshalIdentityList(data []string) (*[]*entities.NbIdentity, common.IRNib
func Close() {
readerPool.Close()
func Close() {
readerPool.Close()
-}
+}
\ No newline at end of file