"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
"gerrit.o-ran-sc.org/r/ric-plt/sdlgo"
"github.com/golang/protobuf/proto"
- "github.com/pkg/errors"
"reflect"
)
*/
type RNibReader interface {
// GetNodeb retrieves responding nodeb entity from redis DB by nodeb inventory name
- GetNodeb(inventoryName string) (*entities.NodebInfo, common.IRNibError)
+ GetNodeb(inventoryName string) (*entities.NodebInfo, error)
// GetNodebByGlobalNbId retrieves responding nodeb entity from redis DB by nodeb global Id
- GetNodebByGlobalNbId(nodeType entities.Node_Type, globalNbId *entities.GlobalNbId) (*entities.NodebInfo, common.IRNibError)
+ GetNodebByGlobalNbId(nodeType entities.Node_Type, globalNbId *entities.GlobalNbId) (*entities.NodebInfo, error)
// GetCellList retrieves the list of cell entities belonging to responding nodeb entity from redis DB by nodeb inventory name
- GetCellList(inventoryName string) (*entities.Cells, common.IRNibError)
+ GetCellList(inventoryName string) (*entities.Cells, error)
// GetListGnbIds retrieves the list of gNodeb identity entities
- GetListGnbIds() (*[]*entities.NbIdentity, common.IRNibError)
+ GetListGnbIds() ([]*entities.NbIdentity, error)
// GetListEnbIds retrieves the list of eNodeb identity entities
- GetListEnbIds() (*[]*entities.NbIdentity, common.IRNibError)
+ GetListEnbIds() ([]*entities.NbIdentity, error)
// Close closes reader's pool
- GetCountGnbList() (int, common.IRNibError)
+ GetCountGnbList() (int, error)
// GetCell retrieves the cell entity belonging to responding nodeb from redis DB by nodeb inventory name and cell pci
- GetCell(inventoryName string, pci uint32) (*entities.Cell, common.IRNibError)
+ GetCell(inventoryName string, pci uint32) (*entities.Cell, error)
// GetCellById retrieves the cell entity from redis DB by cell type and cell Id
- GetCellById(cellType entities.Cell_Type, cellId string) (*entities.Cell, common.IRNibError)
+ GetCellById(cellType entities.Cell_Type, cellId string) (*entities.Cell, error)
// GetListNodebIds returns the full list of Nodeb identity entities
- GetListNodebIds()([]*entities.NbIdentity, common.IRNibError)
+ GetListNodebIds()([]*entities.NbIdentity, error)
// GetRanLoadInformation retrieves nodeb load information entity from redis DB by nodeb inventory name
- GetRanLoadInformation(inventoryName string) (*entities.RanLoadInformation, common.IRNibError)
+ GetRanLoadInformation(inventoryName string) (*entities.RanLoadInformation, error)
}
/*
return &rNibReaderInstance{sdl: &sdlI, namespace: namespace}
},
func(obj interface{}) {
- (*obj.(*rNibReaderInstance).sdl).Close()
+ i, ok := obj.(*rNibReaderInstance)
+ if ok{
+ (*i.sdl).Close()
+ }
})
}
readerPool = common.NewPool(poolSize, newObj, destroyObj)
}
-/*
-GetRNibReader returns RNibReader instance from the pool
-*/
-func GetRNibReader() RNibReader {
- return readerPool.Get().(RNibReader)
-}
-
-func (w *rNibReaderInstance) GetNodeb(inventoryName string) (*entities.NodebInfo, common.IRNibError) {
+func (*rNibReaderInstance) GetNodeb(inventoryName string) (*entities.NodebInfo, error) {
+ w := readerPool.Get().(*rNibReaderInstance)
defer readerPool.Put(w)
key, rNibErr := common.ValidateAndBuildNodeBNameKey(inventoryName)
if rNibErr != nil {
return nil, rNibErr
}
- return w.getNodeb(key)
+ nbInfo := &entities.NodebInfo{}
+ err := w.getByKeyAndUnmarshal(key, nbInfo)
+ if err!= nil{
+ return nil, err
+ }
+ return nbInfo, nil
}
-func (w *rNibReaderInstance) GetNodebByGlobalNbId(nodeType entities.Node_Type, globalNbId *entities.GlobalNbId) (*entities.NodebInfo, common.IRNibError) {
+func (*rNibReaderInstance) GetNodebByGlobalNbId(nodeType entities.Node_Type, globalNbId *entities.GlobalNbId) (*entities.NodebInfo, error) {
+ w := readerPool.Get().(*rNibReaderInstance)
defer readerPool.Put(w)
key, rNibErr := common.ValidateAndBuildNodeBIdKey(nodeType.String(), globalNbId.GetPlmnId(), globalNbId.GetNbId())
if rNibErr != nil {
return nil, rNibErr
}
- return w.getNodeb(key)
+ nbInfo := &entities.NodebInfo{}
+ err := w.getByKeyAndUnmarshal(key, nbInfo)
+ if err!= nil{
+ return nil, err
+ }
+ return nbInfo, nil
}
-func (w *rNibReaderInstance) GetCellList(inventoryName string) (*entities.Cells, common.IRNibError) {
+func (w *rNibReaderInstance) GetCellList(inventoryName string) (*entities.Cells, error) {
cells := &entities.Cells{}
nb, err := w.GetNodeb(inventoryName)
if err != nil {
cells.Type = entities.Cell_LTE_CELL
cells.List = &entities.Cells_ServedCellInfos{ServedCellInfos: &entities.ServedCellInfoList{ServedCells: nb.GetEnb().GetServedCells()}}
return cells, nil
- } else if nb.GetGnb() != nil && len(nb.GetGnb().GetServedNrCells()) > 0 {
+ }
+ if nb.GetGnb() != nil && len(nb.GetGnb().GetServedNrCells()) > 0 {
cells.Type = entities.Cell_NR_CELL
cells.List = &entities.Cells_ServedNrCells{ServedNrCells: &entities.ServedNRCellList{ServedCells: nb.GetGnb().GetServedNrCells()}}
return cells, nil
}
- return nil, common.NewResourceNotFoundError(errors.Errorf("#rNibReader.GetCellList - served cells not found. Responding node RAN name: %s.", inventoryName))
+ return nil, common.NewResourceNotFoundErrorf("#rNibReader.GetCellList - served cells not found. Responding node RAN name: %s.", inventoryName)
}
-func (w *rNibReaderInstance) GetListGnbIds() (*[]*entities.NbIdentity, common.IRNibError) {
+func (*rNibReaderInstance) GetListGnbIds() ([]*entities.NbIdentity, error) {
+ w := readerPool.Get().(*rNibReaderInstance)
defer readerPool.Put(w)
return w.getListNodebIdsByType(entities.Node_GNB.String())
}
-func (w *rNibReaderInstance) GetListEnbIds() (*[]*entities.NbIdentity, common.IRNibError) {
+func (*rNibReaderInstance) GetListEnbIds() ([]*entities.NbIdentity, error) {
+ w := readerPool.Get().(*rNibReaderInstance)
defer readerPool.Put(w)
return w.getListNodebIdsByType(entities.Node_ENB.String())
}
-func (w *rNibReaderInstance) GetCountGnbList() (int, common.IRNibError) {
+func (*rNibReaderInstance) GetCountGnbList() (int, error) {
+ w := readerPool.Get().(*rNibReaderInstance)
defer readerPool.Put(w)
size, err := (*w.sdl).GroupSize(entities.Node_GNB.String())
if err != nil {
return int(size), nil
}
-func (w *rNibReaderInstance) GetCell(inventoryName string, pci uint32) (*entities.Cell, common.IRNibError) {
+func (*rNibReaderInstance) GetCell(inventoryName string, pci uint32) (*entities.Cell, error) {
+ w := readerPool.Get().(*rNibReaderInstance)
defer readerPool.Put(w)
key, rNibErr := common.ValidateAndBuildCellNamePciKey(inventoryName, pci)
if rNibErr != nil {
return nil, rNibErr
}
- return w.getCellByKey(key)
+ cell := &entities.Cell{}
+ err := w.getByKeyAndUnmarshal(key, cell)
+ if err!= nil{
+ return nil, err
+ }
+ return cell, err
}
-func (w *rNibReaderInstance) GetCellById(cellType entities.Cell_Type, cellId string) (*entities.Cell, common.IRNibError) {
+func (*rNibReaderInstance) GetCellById(cellType entities.Cell_Type, cellId string) (*entities.Cell, error) {
+ w := readerPool.Get().(*rNibReaderInstance)
defer readerPool.Put(w)
var key string
- var rNibErr common.IRNibError
+ var rNibErr error
if cellType == entities.Cell_LTE_CELL {
key, rNibErr = common.ValidateAndBuildCellIdKey(cellId)
} else if cellType == entities.Cell_NR_CELL {
key, rNibErr = common.ValidateAndBuildNrCellIdKey(cellId)
} else {
- return nil, common.NewValidationError(errors.Errorf("#rNibReader.GetCellById - invalid cell type: %v", cellType))
+ return nil, common.NewValidationErrorf("#rNibReader.GetCellById - invalid cell type: %v", cellType)
}
if rNibErr != nil {
return nil, rNibErr
}
- return w.getCellByKey(key)
+ cell := &entities.Cell{}
+ err := w.getByKeyAndUnmarshal(key, cell)
+ if err!= nil{
+ return nil, err
+ }
+ return cell, err
}
-func (w *rNibReaderInstance) GetListNodebIds()([]*entities.NbIdentity, common.IRNibError){
+func (*rNibReaderInstance) GetListNodebIds()([]*entities.NbIdentity, error){
+ w := readerPool.Get().(*rNibReaderInstance)
defer readerPool.Put(w)
dataEnb, err := (*w.sdl).GetMembers(entities.Node_ENB.String())
if err != nil{
}
allIds := append(dataEnb, dataGnb...)
allIds = append(allIds, dataUnknown...)
- data, rnibErr := unmarshalIdentityList(allIds)
- return *data, rnibErr
+ data, rnibErr := w.unmarshalIdentityList(allIds)
+ return data, rnibErr
}
-func (w *rNibReaderInstance) GetRanLoadInformation(inventoryName string) (*entities.RanLoadInformation, common.IRNibError){
+func (*rNibReaderInstance) GetRanLoadInformation(inventoryName string) (*entities.RanLoadInformation, error){
+ w := readerPool.Get().(*rNibReaderInstance)
key, rNibErr := common.ValidateAndBuildRanLoadInformationKey(inventoryName)
if rNibErr != nil {
return nil, rNibErr
return loadInfo, err
}
-func (w *rNibReaderInstance) getByKeyAndUnmarshal(key string, entity proto.Message)common.IRNibError{
+func (w *rNibReaderInstance) getByKeyAndUnmarshal(key string, entity proto.Message)error{
data, err := (*w.sdl).Get([]string{key})
if err != nil {
return common.NewInternalError(err)
}
return nil
}
- return common.NewResourceNotFoundError(errors.Errorf("#rNibReader.getByKeyAndUnmarshal - entity of type %s not found. Key: %s", reflect.TypeOf(entity).String(), key))
-}
-
-func (w *rNibReaderInstance) getNodeb(key string) (*entities.NodebInfo, common.IRNibError) {
- data, err := (*w.sdl).Get([]string{key})
- if err != nil {
- return nil, common.NewInternalError(err)
- }
- nb := entities.NodebInfo{}
- if data != nil && data[key] != nil {
- err = proto.Unmarshal([]byte(data[key].(string)), &nb)
- if err != nil {
- return nil, common.NewInternalError(err)
- }
- return &nb, nil
- }
- return nil, common.NewResourceNotFoundError(errors.Errorf("#rNibReader.getNodeb - responding node not found. Key: %s", key))
-}
-
-func (w *rNibReaderInstance) getCellByKey(key string) (*entities.Cell, common.IRNibError) {
- data, err := (*w.sdl).Get([]string{key})
- if err != nil {
- return nil, common.NewInternalError(err)
- }
- cell := entities.Cell{}
- if data != nil && data[key] != nil {
- err = proto.Unmarshal([]byte(data[key].(string)), &cell)
- if err != nil {
- return nil, common.NewInternalError(err)
- }
- return &cell, nil
- }
- return nil, common.NewResourceNotFoundError(errors.Errorf("#rNibReader.getCellByKey - cell not found, key: %s", key))
+ return common.NewResourceNotFoundErrorf("#rNibReader.getByKeyAndUnmarshal - entity of type %s not found. Key: %s", reflect.TypeOf(entity).String(), key)
}
-func (w *rNibReaderInstance) getListNodebIdsByType(nbType string) (*[]*entities.NbIdentity, common.IRNibError) {
+func (w *rNibReaderInstance) getListNodebIdsByType(nbType string) ([]*entities.NbIdentity, error) {
data, err := (*w.sdl).GetMembers(nbType)
if err != nil {
return nil, common.NewInternalError(err)
}
- return unmarshalIdentityList(data)
+ return w.unmarshalIdentityList(data)
}
-func unmarshalIdentityList(data []string) (*[]*entities.NbIdentity, common.IRNibError) {
+func (w *rNibReaderInstance) unmarshalIdentityList(data []string) ([]*entities.NbIdentity, error) {
var members []*entities.NbIdentity
for _, d := range data {
member := entities.NbIdentity{}
}
members = append(members, &member)
}
- return &members, nil
+ return members, nil
}
func Close() {
import (
"encoding/json"
- "errors"
"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
"gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
"github.com/golang/protobuf/proto"
+ "github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"testing"
"time"
name := "name"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
nb := entities.NodebInfo{}
nb.ConnectionStatus = 1
nb.Ip = "localhost"
name := "name"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
var e error
var ret map[string]interface{}
redisKey, rNibErr := common.ValidateAndBuildNodeBNameKey(name)
getNb, er := w.GetNodeb(name)
assert.NotNil(t, er)
assert.Nil(t, getNb)
- assert.Equal(t, 1, er.GetCode())
- assert.EqualValues(t, "1 RESOURCE_NOT_FOUND - #rNibReader.getNodeb - responding node not found. Key: RAN:name", er.Error())
+ assert.IsType(t, &common.ResourceNotFoundError{}, er)
+ assert.EqualValues(t, "#rNibReader.getByKeyAndUnmarshal - entity of type *entities.NodebInfo not found. Key: RAN:name", er.Error())
}
func TestGetNodeBUnmarshalFailure(t *testing.T) {
name := "name"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
var e error
ret := make(map[string]interface{}, 1)
redisKey, rNibErr := common.ValidateAndBuildNodeBNameKey(name)
getNb, er := w.GetNodeb(name)
assert.NotNil(t, er)
assert.Nil(t, getNb)
- assert.Equal(t, 2, er.GetCode())
- assert.EqualValues(t, "2 INTERNAL_ERROR - proto: can't skip unknown wire type 4", er.Error())
+ assert.IsType(t, &common.InternalError{}, er)
+ assert.EqualValues(t, "proto: can't skip unknown wire type 4", er.Error())
}
func TestGetNodeBSdlgoFailure(t *testing.T) {
name := "name"
errMsg := "expected Sdlgo error"
- errMsgExpected := "2 INTERNAL_ERROR - expected Sdlgo error"
+ errMsgExpected := "expected Sdlgo error"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
e := errors.New(errMsg)
var ret map[string]interface{}
redisKey, rNibErr := common.ValidateAndBuildNodeBNameKey(name)
getNb, er := w.GetNodeb(name)
assert.NotNil(t, er)
assert.Nil(t, getNb)
- assert.Equal(t, 2, er.GetCode())
+ assert.IsType(t, &common.InternalError{}, er)
assert.EqualValues(t, errMsgExpected, er.Error())
}
name := "name"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
nb := entities.NodebInfo{}
nb.ConnectionStatus = 1
nb.Ip = "localhost"
name := "name"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
nb := entities.NodebInfo{}
nb.ConnectionStatus = 1
nb.Ip = "localhost"
name := "name"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
var e error
ret := make(map[string]interface{}, 1)
redisKey, rNibErr := common.ValidateAndBuildNodeBNameKey(name)
cells, er := w.GetCellList(name)
assert.NotNil(t, er)
assert.Nil(t, cells)
- assert.Equal(t, 2, er.GetCode())
- assert.EqualValues(t, "2 INTERNAL_ERROR - proto: can't skip unknown wire type 4", er.Error())
+ assert.IsType(t, &common.InternalError{}, er)
+ assert.EqualValues(t, "proto: can't skip unknown wire type 4", er.Error())
}
func TestGetNodeBCellsListNodeNotFoundFailure(t *testing.T) {
name := "name"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
var e error
var ret map[string]interface{}
redisKey, rNibErr := common.ValidateAndBuildNodeBNameKey(name)
cells, er := w.GetCellList(name)
assert.NotNil(t, er)
assert.Nil(t, cells)
- assert.Equal(t, 1, er.GetCode())
- assert.EqualValues(t, "1 RESOURCE_NOT_FOUND - #rNibReader.getNodeb - responding node not found. Key: RAN:name", er.Error())
+ assert.IsType(t, &common.ResourceNotFoundError{}, er)
+ assert.EqualValues(t, "#rNibReader.getByKeyAndUnmarshal - entity of type *entities.NodebInfo not found. Key: RAN:name", er.Error())
}
func TestGetNodeBCellsListNotFoundFailureEnb(t *testing.T) {
name := "name"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
nb := entities.NodebInfo{}
nb.ConnectionStatus = 1
nb.Ip = "localhost"
sdlInstanceMock.On("Get", []string{redisKey}).Return(ret, e)
_, er := w.GetCellList(name)
assert.NotNil(t, er)
- assert.EqualValues(t, "1 RESOURCE_NOT_FOUND - #rNibReader.GetCellList - served cells not found. Responding node RAN name: name.", er.Error())
+ assert.EqualValues(t, "#rNibReader.GetCellList - served cells not found. Responding node RAN name: name.", er.Error())
}
func TestGetNodeBCellsListNotFoundFailureGnb(t *testing.T) {
name := "name"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
nb := entities.NodebInfo{}
nb.ConnectionStatus = 1
nb.Ip = "localhost"
sdlInstanceMock.On("Get", []string{redisKey}).Return(ret, e)
_, er := w.GetCellList(name)
assert.NotNil(t, er)
- assert.EqualValues(t, "1 RESOURCE_NOT_FOUND - #rNibReader.GetCellList - served cells not found. Responding node RAN name: name.", er.Error())
+ assert.EqualValues(t, "#rNibReader.GetCellList - served cells not found. Responding node RAN name: name.", er.Error())
}
func TestCloseOnClosedPoolFailure(t *testing.T) {
readerPool = nil
instanceMock := initSdlInstanceMock(namespace, 1)
- w1 := GetRNibReader()
+ w1 := &rNibReaderInstance{}
+ _, err := w1.GetNodeb("")
+ if err == nil{
+ t.Errorf("#rNibReader_test.TestCloseOnClosedPoolFailure - failed to validate key parameter")
+ }
readerPool.Put(w1)
available, created := readerPool.Stats()
assert.Equal(t, 1, available, "number of available objects in the readerPool should be 1")
func TestCloseFailure(t *testing.T) {
readerPool = nil
instanceMock := initSdlInstanceMock(namespace, 2)
- w1 := GetRNibReader()
- readerPool.Put(w1)
+ w1 := &rNibReaderInstance{}
+ _, err := w1.GetNodeb("")
+ if err == nil{
+ t.Errorf("#rNibReader_test.TestCloseFailure - failed to validate key parameter")
+ }
available, created := readerPool.Stats()
- assert.Equal(t, 1, available, "number of available objects in the readerPool should be 1")
+ assert.Equal(t, 1, available, "number of available objects in the readerPool should be 2")
assert.Equal(t, 1, created, "number of created objects in the readerPool should be 1")
e := errors.New("expected error")
instanceMock.On("Close").Return(e)
func TestGetListGnbIdsUnmarshalFailure(t *testing.T) {
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
var e error
sdlInstanceMock.On("GetMembers", entities.Node_GNB.String()).Return([]string{"data"}, e)
ids, er := w.GetListGnbIds()
assert.NotNil(t, er)
assert.Nil(t, ids)
- assert.Equal(t, 2, er.GetCode())
- assert.Equal(t, "2 INTERNAL_ERROR - proto: can't skip unknown wire type 4", er.Error())
+ assert.IsType(t, &common.InternalError{}, er)
+ assert.Equal(t, "proto: can't skip unknown wire type 4", er.Error())
}
func TestGetListGnbIdsSdlgoFailure(t *testing.T) {
errMsg := "expected Sdlgo error"
- errMsgExpected := "2 INTERNAL_ERROR - expected Sdlgo error"
+ errMsgExpected := "expected Sdlgo error"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
e := errors.New(errMsg)
var data []string
sdlInstanceMock.On("GetMembers", entities.Node_GNB.String()).Return(data, e)
ids, er := w.GetListGnbIds()
assert.NotNil(t, er)
assert.Nil(t, ids)
- assert.Equal(t, 2, er.GetCode())
+ assert.IsType(t, &common.InternalError{}, er)
assert.EqualValues(t, errMsgExpected, er.Error())
}
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
name := "name"
plmnId := "02f829"
sdlInstanceMock.On("GetMembers", entities.Node_ENB.String()).Return([]string{string(data)}, nilError)
errMsg := "expected Sdlgo error"
- errMsgExpected := "2 INTERNAL_ERROR - expected Sdlgo error"
+ errMsgExpected := "expected Sdlgo error"
expectedError := errors.New(errMsg)
var nilData []string
sdlInstanceMock.On("GetMembers", entities.Node_GNB.String()).Return(nilData, expectedError)
ids, er := w.GetListNodebIds()
assert.NotNil(t, er)
assert.Nil(t, ids)
- assert.Equal(t, 2, er.GetCode())
+ assert.IsType(t, &common.InternalError{}, er)
assert.EqualValues(t, errMsgExpected, er.Error())
}
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
name := "name"
plmnId := "02f829"
sdlInstanceMock.On("GetMembers", entities.Node_GNB.String()).Return([]string{string(data)}, nilError)
errMsg := "expected Sdlgo error"
- errMsgExpected := "2 INTERNAL_ERROR - expected Sdlgo error"
+ errMsgExpected := "expected Sdlgo error"
expectedError := errors.New(errMsg)
var nilData []string
sdlInstanceMock.On("GetMembers", entities.Node_ENB.String()).Return(nilData, expectedError)
ids, er := w.GetListNodebIds()
assert.NotNil(t, er)
assert.Nil(t, ids)
- assert.Equal(t, 2, er.GetCode())
+ assert.IsType(t, &common.InternalError{}, er)
assert.EqualValues(t, errMsgExpected, er.Error())
}
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
var nilError error
name := "name"
func TestGetListEnbIdsUnmarshalFailure(t *testing.T) {
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
var e error
sdlInstanceMock.On("GetMembers", entities.Node_ENB.String()).Return([]string{"data"}, e)
ids, er := w.GetListEnbIds()
assert.NotNil(t, er)
assert.Nil(t, ids)
- assert.Equal(t, 2, er.GetCode())
- assert.Equal(t, "2 INTERNAL_ERROR - proto: can't skip unknown wire type 4", er.Error())
+ assert.IsType(t, &common.InternalError{}, er)
+ assert.Equal(t, "proto: can't skip unknown wire type 4", er.Error())
}
func TestGetListEnbIdsOneId(t *testing.T) {
nbId := "4a952a0a"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
nbIdentity := &entities.NbIdentity{InventoryName: name, GlobalNbId: &entities.GlobalNbId{PlmnId: plmnId, NbId: nbId}}
var e error
data, err := proto.Marshal(nbIdentity)
sdlInstanceMock.On("GetMembers", entities.Node_ENB.String()).Return([]string{string(data)}, e)
ids, er := w.GetListEnbIds()
assert.Nil(t, er)
- assert.Len(t, *ids, 1)
- assert.Equal(t, (*ids)[0].GetInventoryName(), name)
- assert.Equal(t, (*ids)[0].GetGlobalNbId().GetPlmnId(), nbIdentity.GetGlobalNbId().GetPlmnId())
- assert.Equal(t, (*ids)[0].GetGlobalNbId().GetNbId(), nbIdentity.GetGlobalNbId().GetNbId())
+ assert.Len(t, ids, 1)
+ assert.Equal(t, (ids)[0].GetInventoryName(), name)
+ assert.Equal(t, (ids)[0].GetGlobalNbId().GetPlmnId(), nbIdentity.GetGlobalNbId().GetPlmnId())
+ assert.Equal(t, (ids)[0].GetGlobalNbId().GetNbId(), nbIdentity.GetGlobalNbId().GetNbId())
}
func TestGetListEnbIdsNoIds(t *testing.T) {
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
var e error
sdlInstanceMock.On("GetMembers", entities.Node_ENB.String()).Return([]string{}, e)
ids, er := w.GetListEnbIds()
assert.Nil(t, er)
- assert.Len(t, *ids, 0)
+ assert.Len(t, ids, 0)
}
func TestGetListEnbIds(t *testing.T) {
listSize := 3
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
idsData := make([]string, listSize)
idsEntities := make([]*entities.NbIdentity, listSize)
for i := 0; i < listSize; i++ {
sdlInstanceMock.On("GetMembers", entities.Node_ENB.String()).Return(idsData, e)
ids, er := w.GetListEnbIds()
assert.Nil(t, er)
- assert.Len(t, *ids, listSize)
- for i, id := range *ids {
+ assert.Len(t, ids, listSize)
+ for i, id := range ids {
assert.Equal(t, id.GetInventoryName(), name)
assert.Equal(t, id.GetGlobalNbId().GetPlmnId(), idsEntities[i].GetGlobalNbId().GetPlmnId())
assert.Equal(t, id.GetGlobalNbId().GetNbId(), idsEntities[i].GetGlobalNbId().GetNbId())
nbId := "4a952a0a"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
nbIdentity := &entities.NbIdentity{InventoryName: name, GlobalNbId: &entities.GlobalNbId{PlmnId: plmnId, NbId: nbId}}
var e error
data, err := proto.Marshal(nbIdentity)
sdlInstanceMock.On("GetMembers", entities.Node_GNB.String()).Return([]string{string(data)}, e)
ids, er := w.GetListGnbIds()
assert.Nil(t, er)
- assert.Len(t, *ids, 1)
- assert.Equal(t, (*ids)[0].GetInventoryName(), name)
- assert.Equal(t, (*ids)[0].GetGlobalNbId().GetPlmnId(), nbIdentity.GetGlobalNbId().GetPlmnId())
- assert.Equal(t, (*ids)[0].GetGlobalNbId().GetNbId(), nbIdentity.GetGlobalNbId().GetNbId())
+ assert.Len(t, ids, 1)
+ assert.Equal(t, (ids)[0].GetInventoryName(), name)
+ assert.Equal(t, (ids)[0].GetGlobalNbId().GetPlmnId(), nbIdentity.GetGlobalNbId().GetPlmnId())
+ assert.Equal(t, (ids)[0].GetGlobalNbId().GetNbId(), nbIdentity.GetGlobalNbId().GetNbId())
}
func TestGetListGnbIdsNoIds(t *testing.T) {
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
var e error
sdlInstanceMock.On("GetMembers", entities.Node_GNB.String()).Return([]string{}, e)
ids, er := w.GetListGnbIds()
assert.Nil(t, er)
- assert.Len(t, *ids, 0)
+ assert.Len(t, ids, 0)
}
func TestGetListGnbIds(t *testing.T) {
listSize := 3
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
idsData := make([]string, listSize)
idsEntities := make([]*entities.NbIdentity, listSize)
for i := 0; i < listSize; i++ {
sdlInstanceMock.On("GetMembers", entities.Node_GNB.String()).Return(idsData, e)
ids, er := w.GetListGnbIds()
assert.Nil(t, er)
- assert.Len(t, *ids, listSize)
- for i, id := range *ids {
+ assert.Len(t, ids, listSize)
+ for i, id := range ids {
assert.Equal(t, id.GetInventoryName(), name)
assert.Equal(t, id.GetGlobalNbId().GetPlmnId(), idsEntities[i].GetGlobalNbId().GetPlmnId())
assert.Equal(t, id.GetGlobalNbId().GetNbId(), idsEntities[i].GetGlobalNbId().GetNbId())
func TestGetListEnbIdsSdlgoFailure(t *testing.T) {
errMsg := "expected Sdlgo error"
- errMsgExpected := "2 INTERNAL_ERROR - expected Sdlgo error"
+ errMsgExpected := "expected Sdlgo error"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
e := errors.New(errMsg)
var data []string
sdlInstanceMock.On("GetMembers", entities.Node_ENB.String()).Return(data, e)
ids, er := w.GetListEnbIds()
assert.NotNil(t, er)
assert.Nil(t, ids)
- assert.Equal(t, 2, er.GetCode())
+ assert.IsType(t, &common.InternalError{}, er)
assert.EqualValues(t, errMsgExpected, er.Error())
}
func TestGetCountGnbListOneId(t *testing.T) {
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
var e error
sdlInstanceMock.On("GroupSize", entities.Node_GNB.String()).Return(1, e)
count, er := w.GetCountGnbList()
func TestGetCountGnbList(t *testing.T) {
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
var e error
sdlInstanceMock.On("GroupSize", entities.Node_GNB.String()).Return(3, e)
count, er := w.GetCountGnbList()
func TestGetCountGnbListSdlgoFailure(t *testing.T) {
errMsg := "expected Sdlgo error"
- errMsgExpected := "2 INTERNAL_ERROR - expected Sdlgo error"
+ errMsgExpected := "expected Sdlgo error"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
e := errors.New(errMsg)
var count int
sdlInstanceMock.On("GroupSize", entities.Node_GNB.String()).Return(count, e)
count, er := w.GetCountGnbList()
assert.NotNil(t, er)
assert.Equal(t, 0, count)
- assert.Equal(t, 2, er.GetCode())
+ assert.IsType(t, &common.InternalError{}, er)
assert.EqualValues(t, errMsgExpected, er.Error())
}
var pci uint32 = 10
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
cellEntity := entities.Cell{Type: entities.Cell_LTE_CELL, Cell: &entities.Cell_ServedCellInfo{ServedCellInfo: &entities.ServedCellInfo{Pci: pci}}}
cellData, err := proto.Marshal(&cellEntity)
if err != nil {
var pci uint32
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
var e error
var ret map[string]interface{}
key, rNibErr := common.ValidateAndBuildCellNamePciKey(name, pci)
cell, er := w.GetCell(name, pci)
assert.NotNil(t, er)
assert.Nil(t, cell)
- assert.Equal(t, 1, er.GetCode())
- assert.EqualValues(t, "1 RESOURCE_NOT_FOUND - #rNibReader.getCellByKey - cell not found, key: PCI:name:00", er.Error())
+ assert.IsType(t, &common.ResourceNotFoundError{}, er)
+ assert.EqualValues(t, "#rNibReader.getByKeyAndUnmarshal - entity of type *entities.Cell not found. Key: PCI:name:00", er.Error())
}
func TestGetCellUnmarshalFailure(t *testing.T) {
var pci uint32
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
var e error
ret := make(map[string]interface{}, 1)
key, rNibErr := common.ValidateAndBuildCellNamePciKey(name, pci)
cell, er := w.GetCell(name, pci)
assert.NotNil(t, er)
assert.Nil(t, cell)
- assert.Equal(t, 2, er.GetCode())
- assert.EqualValues(t, "2 INTERNAL_ERROR - proto: can't skip unknown wire type 4", er.Error())
+ assert.IsType(t, &common.InternalError{}, er)
+ assert.EqualValues(t, "proto: can't skip unknown wire type 4", er.Error())
}
func TestGetCellSdlgoFailure(t *testing.T) {
name := "name"
var pci uint32
errMsg := "expected Sdlgo error"
- errMsgExpected := "2 INTERNAL_ERROR - expected Sdlgo error"
+ errMsgExpected := "expected Sdlgo error"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
e := errors.New(errMsg)
var ret map[string]interface{}
key, rNibErr := common.ValidateAndBuildCellNamePciKey(name, pci)
cell, er := w.GetCell(name, pci)
assert.NotNil(t, er)
assert.Nil(t, cell)
- assert.Equal(t, 2, er.GetCode())
+ assert.IsType(t, &common.InternalError{}, er)
assert.EqualValues(t, errMsgExpected, er.Error())
}
func TestGetNodebById(t *testing.T) {
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
nb := entities.NodebInfo{NodeType: entities.Node_ENB}
nb.ConnectionStatus = 1
nb.Ip = "localhost"
nbId := "4a952a0a"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
var e error
key, rNibErr := common.ValidateAndBuildNodeBIdKey(entities.Node_ENB.String(), plmnId, nbId)
if rNibErr != nil {
getNb, er := w.GetNodebByGlobalNbId(entities.Node_ENB, globalNbId)
assert.NotNil(t, er)
assert.Nil(t, getNb)
- assert.Equal(t, 1, er.GetCode())
- assert.EqualValues(t, "1 RESOURCE_NOT_FOUND - #rNibReader.getNodeb - responding node not found. Key: ENB:02f829:4a952a0a", er.Error())
+ assert.IsType(t, &common.ResourceNotFoundError{}, er)
+ assert.EqualValues(t, "#rNibReader.getByKeyAndUnmarshal - entity of type *entities.NodebInfo not found. Key: ENB:02f829:4a952a0a", er.Error())
}
func TestGetNodebByIdNotFoundFailureGnb(t *testing.T) {
nbId := "4a952a0a"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
var e error
key, rNibErr := common.ValidateAndBuildNodeBIdKey(entities.Node_GNB.String(), plmnId, nbId)
if rNibErr != nil {
getNb, er := w.GetNodebByGlobalNbId(entities.Node_GNB, globalNbId)
assert.NotNil(t, er)
assert.Nil(t, getNb)
- assert.Equal(t, 1, er.GetCode())
- assert.EqualValues(t, "1 RESOURCE_NOT_FOUND - #rNibReader.getNodeb - responding node not found. Key: GNB:02f829:4a952a0a", er.Error())
+ assert.IsType(t, &common.ResourceNotFoundError{}, er)
+ assert.EqualValues(t, "#rNibReader.getByKeyAndUnmarshal - entity of type *entities.NodebInfo not found. Key: GNB:02f829:4a952a0a", er.Error())
}
func TestGetNodeByIdUnmarshalFailure(t *testing.T) {
nbId := "4a952a0a"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
key, rNibErr := common.ValidateAndBuildNodeBIdKey(entities.Node_ENB.String(), plmnId, nbId)
if rNibErr != nil {
t.Errorf("Failed to validate nodeb identity, plmnId: %s, nbId: %s", plmnId, nbId)
getNb, er := w.GetNodebByGlobalNbId(entities.Node_ENB, globalNbId)
assert.NotNil(t, er)
assert.Nil(t, getNb)
- assert.Equal(t, 2, er.GetCode())
- assert.EqualValues(t, "2 INTERNAL_ERROR - proto: can't skip unknown wire type 4", er.Error())
+ assert.IsType(t, &common.InternalError{}, er)
+ assert.EqualValues(t, "proto: can't skip unknown wire type 4", er.Error())
}
func TestGetNodeByIdSdlgoFailure(t *testing.T) {
plmnId := "02f829"
nbId := "4a952a0a"
errMsg := "expected Sdlgo error"
- errMsgExpected := "2 INTERNAL_ERROR - expected Sdlgo error"
+ errMsgExpected := "expected Sdlgo error"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
key, rNibErr := common.ValidateAndBuildNodeBIdKey(entities.Node_GNB.String(), plmnId, nbId)
if rNibErr != nil {
t.Errorf("Failed to validate nodeb identity, plmnId: %s, nbId: %s", plmnId, nbId)
getNb, er := w.GetNodebByGlobalNbId(entities.Node_GNB, globalNbId)
assert.NotNil(t, er)
assert.Nil(t, getNb)
- assert.Equal(t, 2, er.GetCode())
+ assert.IsType(t, &common.InternalError{}, er)
assert.EqualValues(t, errMsgExpected, er.Error())
}
var pci uint32 = 10
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
cellEntity := entities.Cell{Type: entities.Cell_LTE_CELL, Cell: &entities.Cell_ServedCellInfo{ServedCellInfo: &entities.ServedCellInfo{Pci: pci}}}
cellData, err := proto.Marshal(&cellEntity)
if err != nil {
cellId := "bbbb"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
var e error
var ret map[string]interface{}
key, rNibErr := common.ValidateAndBuildCellIdKey(cellId)
cell, er := w.GetCellById(entities.Cell_LTE_CELL, cellId)
assert.NotNil(t, er)
assert.Nil(t, cell)
- assert.Equal(t, 1, er.GetCode())
- assert.EqualValues(t, "1 RESOURCE_NOT_FOUND - #rNibReader.getCellByKey - cell not found, key: CELL:bbbb", er.Error())
+ assert.IsType(t, &common.ResourceNotFoundError{}, er)
+ assert.EqualValues(t, "#rNibReader.getByKeyAndUnmarshal - entity of type *entities.Cell not found. Key: CELL:bbbb", er.Error())
}
func TestGetCellByIdNotFoundFailureGnb(t *testing.T) {
cellId := "bbbb"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
var e error
var ret map[string]interface{}
key, rNibErr := common.ValidateAndBuildNrCellIdKey(cellId)
cell, er := w.GetCellById(entities.Cell_NR_CELL, cellId)
assert.NotNil(t, er)
assert.Nil(t, cell)
- assert.Equal(t, 1, er.GetCode())
- assert.EqualValues(t, "1 RESOURCE_NOT_FOUND - #rNibReader.getCellByKey - cell not found, key: NRCELL:bbbb", er.Error())
+ assert.IsType(t, &common.ResourceNotFoundError{}, er)
+ assert.EqualValues(t, "#rNibReader.getByKeyAndUnmarshal - entity of type *entities.Cell not found. Key: NRCELL:bbbb", er.Error())
}
func TestGetCellByIdTypeValidationFailure(t *testing.T) {
cellId := "dddd"
readerPool = nil
initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
cell, er := w.GetCellById(5, cellId)
assert.NotNil(t, er)
assert.Nil(t, cell)
- assert.Equal(t, 3, er.GetCode())
- assert.EqualValues(t, "3 VALIDATION_ERROR - #rNibReader.GetCellById - invalid cell type: 5", er.Error())
+ assert.IsType(t, &common.ValidationError{}, er)
+ assert.EqualValues(t, "#rNibReader.GetCellById - invalid cell type: 5", er.Error())
}
func TestGetCellByIdValidationFailureGnb(t *testing.T) {
cellId := ""
readerPool = nil
initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
cell, er := w.GetCellById(entities.Cell_NR_CELL, cellId)
assert.NotNil(t, er)
assert.Nil(t, cell)
- assert.Equal(t, 3, er.GetCode())
- assert.EqualValues(t, "3 VALIDATION_ERROR - #utils.ValidateAndBuildNrCellIdKey - an empty cell id received", er.Error())
+ assert.IsType(t, &common.ValidationError{}, er)
+ assert.EqualValues(t, "#utils.ValidateAndBuildNrCellIdKey - an empty cell id received", er.Error())
}
func TestGetCellByIdValidationFailureEnb(t *testing.T) {
cellId := ""
readerPool = nil
initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
cell, er := w.GetCellById(entities.Cell_LTE_CELL, cellId)
assert.NotNil(t, er)
assert.Nil(t, cell)
- assert.Equal(t, 3, er.GetCode())
- assert.EqualValues(t, "3 VALIDATION_ERROR - #utils.ValidateAndBuildCellIdKey - an empty cell id received", er.Error())
+ assert.IsType(t, &common.ValidationError{}, er)
+ assert.EqualValues(t, "#utils.ValidateAndBuildCellIdKey - an empty cell id received", er.Error())
}
func TestGetRanLoadInformation(t *testing.T) {
name := "name"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
loadInfo := generateRanLoadInformation()
var e error
data, err := proto.Marshal(loadInfo)
assert.EqualValues(t, expected, actual)
}
+func TestGetRanLoadInformationValidationFailure(t *testing.T) {
+ name := ""
+ readerPool = nil
+ initSdlInstanceMock(namespace, 1)
+ w := &rNibReaderInstance{}
+ getNb, er := w.GetRanLoadInformation(name)
+ assert.NotNil(t, er)
+ assert.Nil(t, getNb)
+ assert.IsType(t, &common.ValidationError{}, er)
+ assert.EqualValues(t, "#utils.ValidateAndBuildRanLoadInformationKey - an empty inventory name received", er.Error())
+}
+
func TestGetRanLoadInformationNotFoundFailure(t *testing.T) {
name := "name"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
var e error
var ret map[string]interface{}
redisKey, rNibErr := common.ValidateAndBuildRanLoadInformationKey(name)
getNb, er := w.GetRanLoadInformation(name)
assert.NotNil(t, er)
assert.Nil(t, getNb)
- assert.Equal(t, 1, er.GetCode())
- assert.EqualValues(t, "1 RESOURCE_NOT_FOUND - #rNibReader.getByKeyAndUnmarshal - entity of type *entities.RanLoadInformation not found. Key: LOAD:name", er.Error())
+ assert.IsType(t, &common.ResourceNotFoundError{}, er)
+ assert.EqualValues(t, "#rNibReader.getByKeyAndUnmarshal - entity of type *entities.RanLoadInformation not found. Key: LOAD:name", er.Error())
}
func TestGetRanLoadInformationUnmarshalFailure(t *testing.T) {
name := "name"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
var e error
ret := make(map[string]interface{}, 1)
redisKey, rNibErr := common.ValidateAndBuildRanLoadInformationKey(name)
getNb, er := w.GetRanLoadInformation(name)
assert.NotNil(t, er)
assert.Nil(t, getNb)
- assert.Equal(t, 2, er.GetCode())
- assert.EqualValues(t, "2 INTERNAL_ERROR - proto: can't skip unknown wire type 4", er.Error())
+ assert.IsType(t, &common.InternalError{}, er)
+ assert.EqualValues(t, "proto: can't skip unknown wire type 4", er.Error())
}
func TestGetRanLoadInformationSdlgoFailure(t *testing.T) {
name := "name"
errMsg := "expected Sdlgo error"
- errMsgExpected := "2 INTERNAL_ERROR - expected Sdlgo error"
+ errMsgExpected := "expected Sdlgo error"
readerPool = nil
sdlInstanceMock := initSdlInstanceMock(namespace, 1)
- w := GetRNibReader()
+ w := &rNibReaderInstance{}
e := errors.New(errMsg)
var ret map[string]interface{}
redisKey, rNibErr := common.ValidateAndBuildRanLoadInformationKey(name)
getNb, er := w.GetRanLoadInformation(name)
assert.NotNil(t, er)
assert.Nil(t, getNb)
- assert.Equal(t, 2, er.GetCode())
+ assert.IsType(t, &common.InternalError{}, er)
assert.EqualValues(t, errMsgExpected, er.Error())
}
}
compInformationItem := &entities.CompInformationItem{
- CompHypothesisSets: []*entities.CompHypothesisSet{&entities.CompHypothesisSet{CellId: "789", CompHypothesis:"xxx"}},
+ CompHypothesisSets: []*entities.CompHypothesisSet{{CellId: "789", CompHypothesis: "xxx"}},
BenefitMetric:50,
}
}
//integration tests
-
+//
//func TestGetEnbInteg(t *testing.T){
// name := "nameEnb1"
// Init("namespace", 1)
-// w := GetRNibReader()
+// w := &rNibReaderInstance{}
// nb, err := w.GetNodeb(name)
// if err != nil{
// fmt.Println(err)
//func TestGetEnbCellsInteg(t *testing.T){
// name := "nameEnb1"
// Init("namespace", 1)
-// w := GetRNibReader()
+// w := &rNibReaderInstance{}
// cells, err := w.GetCellList(name)
// if err != nil{
// fmt.Println(err)
//func TestGetGnbInteg(t *testing.T){
// name := "nameGnb1"
// Init("namespace", 1)
-// w := GetRNibReader()
+// w := &rNibReaderInstance{}
// nb, err := w.GetNodeb(name)
// if err != nil{
// fmt.Println(err)
//func TestGetGnbCellsInteg(t *testing.T){
// name := "nameGnb1"
// Init("namespace", 1)
-// w := GetRNibReader()
+// w := &rNibReaderInstance{}
// cells, err := w.GetCellList(name)
// if err != nil{
// fmt.Println(err)
//
//func TestGetListEnbIdsInteg(t *testing.T) {
// Init("namespace", 1)
-// w := GetRNibReader()
+// w := &rNibReaderInstance{}
// ids, err := w.GetListEnbIds()
// if err != nil{
// fmt.Println(err)
// } else {
-// for _, id := range *ids{
+// for _, id := range ids{
// fmt.Printf("#TestGetListEnbIdsInteg - ENB ID: %s\n", id)
// }
// }
//
//func TestGetListGnbIdsInteg(t *testing.T) {
// Init("namespace", 1)
-// w := GetRNibReader()
+// w := &rNibReaderInstance{}
// ids, err := w.GetListGnbIds()
// if err != nil{
// fmt.Println(err)
// } else {
-// for _, id := range *ids{
+// for _, id := range ids{
// fmt.Printf("#TestGetListGnbIdsInteg - GNB ID: %s\n", id)
// }
// }
//
//func TestGetCountGnbListInteg(t *testing.T) {
// Init("namespace", 1)
-// w := GetRNibReader()
+// w := &rNibReaderInstance{}
// count, err := w.GetCountGnbList()
// if err != nil{
// fmt.Println(err)
// name := "nameGnb7"
// pci := 0x0a
// Init("namespace", 1)
-// w := GetRNibReader()
+// w := &rNibReaderInstance{}
// cell, err := w.GetCell(name, uint32(pci))
// if err != nil{
// fmt.Println(err)
// name := "nameEnb1"
// pci := 0x22
// Init("namespace", 1)
-// w := GetRNibReader()
+// w := &rNibReaderInstance{}
// cell, err := w.GetCell(name, uint32(pci))
// if err != nil {
// fmt.Println(err)
//
//func TestGetEnbCellByIdInteg(t *testing.T){
// Init("namespace", 1)
-// w := GetRNibReader()
+// w := &rNibReaderInstance{}
// cell, err := w.GetCellById(entities.Cell_NR_CELL, "45d")
// if err != nil{
// fmt.Println(err)
//
//func TestGetListNbIdsInteg(t *testing.T) {
// Init("e2Manager", 1)
-// w := GetRNibReader()
+// w := &rNibReaderInstance{}
// ids, err := w.GetListNodebIds()
// if err != nil{
// fmt.Println(err)
//
//func TestGetRanLoadInformationInteg(t *testing.T){
// Init("e2Manager", 1)
-// w := GetRNibReader()
+// w := &rNibReaderInstance{}
// ranLoadInformation, err := w.GetRanLoadInformation("ran_integ")
// if err != nil{
-// t.Errorf("#rNibReader_test.TestGetRanLoadInformationInteg - Failed to save RanLoadInformation entity. Error: %v", err)
+// t.Errorf("#rNibReader_test.TestGetRanLoadInformationInteg - Failed to get RanLoadInformation entity. Error: %v", err)
// }
// assert.NotNil(t, ranLoadInformation)
// fmt.Printf("#rNibReader_test.TestGetRanLoadInformationInteg - GNB ID: %s\n", ranLoadInformation)