X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=reader%2FrNibReader_test.go;h=35e9cb9b266a4025b815bc931e6cca4600542c94;hb=refs%2Ftags%2Fv1.0.14;hp=105c0ba07ee4ff40cd78ce6210221033ce7e1fbb;hpb=286ce41c7d5049e688a40f68e4c6681a645add3d;p=ric-plt%2Fnodeb-rnib.git diff --git a/reader/rNibReader_test.go b/reader/rNibReader_test.go index 105c0ba..35e9cb9 100644 --- a/reader/rNibReader_test.go +++ b/reader/rNibReader_test.go @@ -18,8 +18,8 @@ package reader import ( "errors" - "gerrit.ranco-dev-tools.eastus.cloudapp.azure.com/ric-plt/nodeb-rnib.git/common" - "gerrit.ranco-dev-tools.eastus.cloudapp.azure.com/ric-plt/nodeb-rnib.git/entities" + "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/stretchr/testify/assert" "testing" @@ -56,8 +56,8 @@ func TestInitPool(t *testing.T) { assert.Equal(t, 0, created, "number of created objects in the readerPool should be 0") } -func initSdlInstanceMock(namespace string, poolSize int) * MockSdlInstance { - sdlInstanceMock := new( MockSdlInstance) +func initSdlInstanceMock(namespace string, poolSize int) *MockSdlInstance { + sdlInstanceMock := new(MockSdlInstance) initPool(poolSize, func() interface{} { sdlI := common.ISdlInstance(sdlInstanceMock) return &rNibReaderInstance{sdl: &sdlI, namespace: namespace} @@ -78,15 +78,15 @@ func TestGetNodeB(t *testing.T) { nb.Ip = "localhost" nb.Port = 5656 enb := entities.Enb{} - cell := entities.ServedCellInfo{Tac:"tac"} + cell := entities.ServedCellInfo{Tac: "tac"} enb.ServedCells = []*entities.ServedCellInfo{&cell} - nb.Configuration = &entities.NodebInfo_Enb{Enb:&enb} + nb.Configuration = &entities.NodebInfo_Enb{Enb: &enb} var e error data, err := proto.Marshal(&nb) if err != nil { t.Errorf("#rNibReader_test.TestGetNb - Failed to marshal ENB instance. Error: %v", err) } - ret := map[string]interface{}{"RAN:" + name:string(data)} + ret := map[string]interface{}{"RAN:" + name: string(data)} sdlInstanceMock.On("Get", []string{"RAN:" + name}).Return(ret, e) getNb, er := w.GetNodeb(name) assert.Nil(t, er) @@ -109,7 +109,7 @@ func TestGetNodeBNotFoundFailure(t *testing.T) { 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 name not found", er.Error()) + assert.EqualValues(t, "1 RESOURCE_NOT_FOUND - #rNibReader.getNodeb - responding node not found. Key: RAN:name", er.Error()) } func TestGetNodeBUnmarshalFailure(t *testing.T) { @@ -118,8 +118,8 @@ func TestGetNodeBUnmarshalFailure(t *testing.T) { sdlInstanceMock := initSdlInstanceMock(namespace, 1) w := GetRNibReader() var e error - ret := make( map[string]interface{}, 1) - ret["RAN:" + name] = "data" + ret := make(map[string]interface{}, 1) + ret["RAN:"+name] = "data" sdlInstanceMock.On("Get", []string{"RAN:" + name}).Return(ret, e) getNb, er := w.GetNodeb(name) assert.NotNil(t, er) @@ -155,15 +155,15 @@ func TestGetNodeBCellsListEnb(t *testing.T) { nb.Ip = "localhost" nb.Port = 5656 enb := entities.Enb{} - cell := entities.ServedCellInfo{Tac:"tac"} + cell := entities.ServedCellInfo{Tac: "tac"} enb.ServedCells = []*entities.ServedCellInfo{&cell} - nb.Configuration = &entities.NodebInfo_Enb{Enb:&enb} + nb.Configuration = &entities.NodebInfo_Enb{Enb: &enb} var e error data, err := proto.Marshal(&nb) if err != nil { t.Errorf("#rNibReader_test.GetNodeBCellsList - Failed to marshal ENB instance. Error: %v", err) } - ret := map[string]interface{}{"RAN:" + name:string(data)} + ret := map[string]interface{}{"RAN:" + name: string(data)} sdlInstanceMock.On("Get", []string{"RAN:" + name}).Return(ret, e) cells, er := w.GetCellList(name) assert.Nil(t, er) @@ -184,15 +184,15 @@ func TestGetNodeBCellsListGnb(t *testing.T) { nb.Port = 5656 nb.NodeType = entities.Node_GNB gnb := entities.Gnb{} - cell := entities.ServedNRCell{ServedNrCellInformation:&entities.ServedNRCellInformation{NrPci:10}} + cell := entities.ServedNRCell{ServedNrCellInformation: &entities.ServedNRCellInformation{NrPci: 10}} gnb.ServedNrCells = []*entities.ServedNRCell{&cell} - nb.Configuration = &entities.NodebInfo_Gnb{Gnb:&gnb} + nb.Configuration = &entities.NodebInfo_Gnb{Gnb: &gnb} var e error data, err := proto.Marshal(&nb) if err != nil { t.Errorf("#rNibReader_test.GetNodeBCellsList - Failed to marshal GNB instance. Error: %v", err) } - ret := map[string]interface{}{"RAN:" + name:string(data)} + ret := map[string]interface{}{"RAN:" + name: string(data)} sdlInstanceMock.On("Get", []string{"RAN:" + name}).Return(ret, e) cells, er := w.GetCellList(name) assert.Nil(t, er) @@ -208,8 +208,8 @@ func TestGetNodeBCellsListNodeUnmarshalFailure(t *testing.T) { sdlInstanceMock := initSdlInstanceMock(namespace, 1) w := GetRNibReader() var e error - ret := make( map[string]interface{}, 1) - ret["RAN:" + name] = "data" + ret := make(map[string]interface{}, 1) + ret["RAN:"+name] = "data" sdlInstanceMock.On("Get", []string{"RAN:" + name}).Return(ret, e) cells, er := w.GetCellList(name) assert.NotNil(t, er) @@ -230,7 +230,7 @@ func TestGetNodeBCellsListNodeNotFoundFailure(t *testing.T) { 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 name not found", er.Error()) + assert.EqualValues(t, "1 RESOURCE_NOT_FOUND - #rNibReader.getNodeb - responding node not found. Key: RAN:name", er.Error()) } func TestGetNodeBCellsListNotFoundFailureEnb(t *testing.T) { @@ -243,13 +243,13 @@ func TestGetNodeBCellsListNotFoundFailureEnb(t *testing.T) { nb.Ip = "localhost" nb.Port = 5656 enb := entities.Enb{} - nb.Configuration = &entities.NodebInfo_Enb{Enb:&enb} + nb.Configuration = &entities.NodebInfo_Enb{Enb: &enb} var e error data, err := proto.Marshal(&nb) if err != nil { t.Errorf("#rNibReader_test.TestGetNbCellsListNotFoundFailure - Failed to marshal ENB instance. Error: %v", err) } - ret := map[string]interface{}{"RAN:" + name:string(data)} + ret := map[string]interface{}{"RAN:" + name: string(data)} sdlInstanceMock.On("Get", []string{"RAN:" + name}).Return(ret, e) _, er := w.GetCellList(name) assert.NotNil(t, er) @@ -266,13 +266,13 @@ func TestGetNodeBCellsListNotFoundFailureGnb(t *testing.T) { nb.Ip = "localhost" nb.Port = 5656 gnb := entities.Gnb{} - nb.Configuration = &entities.NodebInfo_Gnb{Gnb:&gnb} + nb.Configuration = &entities.NodebInfo_Gnb{Gnb: &gnb} var e error data, err := proto.Marshal(&nb) if err != nil { t.Errorf("#rNibReader_test.TestGetNbCellsListNotFoundFailure - Failed to marshal ENB instance. Error: %v", err) } - ret := map[string]interface{}{"RAN:" + name:string(data)} + ret := map[string]interface{}{"RAN:" + name: string(data)} sdlInstanceMock.On("Get", []string{"RAN:" + name}).Return(ret, e) _, er := w.GetCellList(name) assert.NotNil(t, er) @@ -290,7 +290,7 @@ func TestCloseOnClosedPoolFailure(t *testing.T) { var e error instanceMock.On("Close").Return(e) Close() - assert.Panics(t, func(){Close()}) + assert.Panics(t, func() { Close() }) } func TestCloseFailure(t *testing.T) { @@ -314,7 +314,7 @@ func TestGetListGnbIdsUnmarshalFailure(t *testing.T) { sdlInstanceMock := initSdlInstanceMock(namespace, 1) w := GetRNibReader() var e error - sdlInstanceMock.On("GetMembers", "GNB").Return([]string{"data"}, e) + sdlInstanceMock.On("GetMembers", GnbType).Return([]string{"data"}, e) ids, er := w.GetListGnbIds() assert.NotNil(t, er) assert.Nil(t, ids) @@ -330,12 +330,96 @@ func TestGetListGnbIdsSdlgoFailure(t *testing.T) { w := GetRNibReader() e := errors.New(errMsg) var data []string - sdlInstanceMock.On("GetMembers", "GNB").Return(data, e) + sdlInstanceMock.On("GetMembers", GnbType).Return(data, e) ids, er := w.GetListGnbIds() assert.NotNil(t, er) assert.Nil(t, ids) assert.Equal(t, 2, er.GetCode()) - assert.EqualValues(t, errMsgExpected,er.Error()) + assert.EqualValues(t, errMsgExpected, er.Error()) +} + +func TestGetListNodesIdsGnbSdlgoFailure(t *testing.T) { + + readerPool = nil + sdlInstanceMock := initSdlInstanceMock(namespace, 1) + w := GetRNibReader() + + name := "name" + plmnId := "02f829" + nbId := "4a952a0a" + nbIdentity := &entities.NbIdentity{InventoryName: name, GlobalNbId: &entities.GlobalNbId{PlmnId: plmnId, NbId: nbId}} + var nilError error + data, err := proto.Marshal(nbIdentity) + if err != nil { + t.Errorf("#rNibReader_test.TestGetListNodesIdsGnbSdlgoFailure - Failed to marshal nodeb identity entity. Error: %v", err) + } + sdlInstanceMock.On("GetMembers", EnbType).Return([]string{string(data)}, nilError) + + errMsg := "expected Sdlgo error" + errMsgExpected := "2 INTERNAL_ERROR - expected Sdlgo error" + expectedError := errors.New(errMsg) + var nilData []string + sdlInstanceMock.On("GetMembers", GnbType).Return(nilData, expectedError) + + ids, er := w.GetListNodebIds() + assert.NotNil(t, er) + assert.Nil(t, ids) + assert.Equal(t, 2, er.GetCode()) + assert.EqualValues(t, errMsgExpected, er.Error()) +} + +func TestGetListNodesIdsEnbSdlgoFailure(t *testing.T) { + + readerPool = nil + sdlInstanceMock := initSdlInstanceMock(namespace, 1) + w := GetRNibReader() + + name := "name" + plmnId := "02f829" + nbId := "4a952a0a" + nbIdentity := &entities.NbIdentity{InventoryName: name, GlobalNbId: &entities.GlobalNbId{PlmnId: plmnId, NbId: nbId}} + var nilError error + data, err := proto.Marshal(nbIdentity) + if err != nil { + t.Errorf("#rNibReader_test.TestGetListNodesIdsEnbSdlgoFailure - Failed to marshal nodeb identity entity. Error: %v", err) + } + sdlInstanceMock.On("GetMembers", GnbType).Return([]string{string(data)}, nilError) + + errMsg := "expected Sdlgo error" + errMsgExpected := "2 INTERNAL_ERROR - expected Sdlgo error" + expectedError := errors.New(errMsg) + var nilData []string + sdlInstanceMock.On("GetMembers", EnbType).Return(nilData, expectedError) + + ids, er := w.GetListNodebIds() + assert.NotNil(t, er) + assert.Nil(t, ids) + assert.Equal(t, 2, er.GetCode()) + assert.EqualValues(t, errMsgExpected, er.Error()) +} + +func TestGetListNodesIdsEnbSdlgoSuccess(t *testing.T) { + + readerPool = nil + sdlInstanceMock := initSdlInstanceMock(namespace, 1) + w := GetRNibReader() + + name := "name" + plmnId := "02f829" + nbId := "4a952a0a" + nbIdentity := &entities.NbIdentity{InventoryName: name, GlobalNbId: &entities.GlobalNbId{PlmnId: plmnId, NbId: nbId}} + var nilError error + data, err := proto.Marshal(nbIdentity) + if err != nil { + t.Errorf("#rNibReader_test.TestGetListNodesIdsEnbSdlgoFailure - Failed to marshal nodeb identity entity. Error: %v", err) + } + sdlInstanceMock.On("GetMembers", GnbType).Return([]string{string(data)}, nilError) + sdlInstanceMock.On("GetMembers", EnbType).Return([]string{string(data)}, nilError) + + ids, er := w.GetListNodebIds() + assert.Nil(t, er) + assert.NotNil(t, ids) + assert.Len(t, ids, 2) } func TestGetListEnbIdsUnmarshalFailure(t *testing.T) { @@ -343,7 +427,7 @@ func TestGetListEnbIdsUnmarshalFailure(t *testing.T) { sdlInstanceMock := initSdlInstanceMock(namespace, 1) w := GetRNibReader() var e error - sdlInstanceMock.On("GetMembers", "ENB").Return([]string{"data"}, e) + sdlInstanceMock.On("GetMembers", EnbType).Return([]string{"data"}, e) ids, er := w.GetListEnbIds() assert.NotNil(t, er) assert.Nil(t, ids) @@ -358,13 +442,13 @@ func TestGetListEnbIdsOneId(t *testing.T) { readerPool = nil sdlInstanceMock := initSdlInstanceMock(namespace, 1) w := GetRNibReader() - nbIdentity := &entities.NbIdentity{InventoryName:name, GlobalNbId:&entities.GlobalNbId{PlmnId:plmnId, NbId:nbId}} + nbIdentity := &entities.NbIdentity{InventoryName: name, GlobalNbId: &entities.GlobalNbId{PlmnId: plmnId, NbId: nbId}} var e error data, err := proto.Marshal(nbIdentity) if err != nil { t.Errorf("#rNibReader_test.TestGetListEnbIds - Failed to marshal nodeb identity entity. Error: %v", err) } - sdlInstanceMock.On("GetMembers", "ENB").Return([]string{string(data)}, e) + sdlInstanceMock.On("GetMembers", EnbType).Return([]string{string(data)}, e) ids, er := w.GetListEnbIds() assert.Nil(t, er) assert.Len(t, *ids, 1) @@ -378,7 +462,7 @@ func TestGetListEnbIdsNoIds(t *testing.T) { sdlInstanceMock := initSdlInstanceMock(namespace, 1) w := GetRNibReader() var e error - sdlInstanceMock.On("GetMembers", "ENB").Return([]string{}, e) + sdlInstanceMock.On("GetMembers", EnbType).Return([]string{}, e) ids, er := w.GetListEnbIds() assert.Nil(t, er) assert.Len(t, *ids, 0) @@ -394,8 +478,8 @@ func TestGetListEnbIds(t *testing.T) { w := GetRNibReader() idsData := make([]string, listSize) idsEntities := make([]*entities.NbIdentity, listSize) - for i:=0; i< listSize ;i++{ - nbIdentity := &entities.NbIdentity{InventoryName:name, GlobalNbId:&entities.GlobalNbId{PlmnId:string(plmnId + i), NbId:string(nbId + i)}} + for i := 0; i < listSize; i++ { + nbIdentity := &entities.NbIdentity{InventoryName: name, GlobalNbId: &entities.GlobalNbId{PlmnId: string(plmnId + i), NbId: string(nbId + i)}} data, err := proto.Marshal(nbIdentity) if err != nil { t.Errorf("#rNibReader_test.TestGetListEnbIds - Failed to marshal nodeb identity entity. Error: %v", err) @@ -404,11 +488,11 @@ func TestGetListEnbIds(t *testing.T) { idsEntities[i] = nbIdentity } var e error - sdlInstanceMock.On("GetMembers", "ENB").Return(idsData, e) + sdlInstanceMock.On("GetMembers", EnbType).Return(idsData, e) ids, er := w.GetListEnbIds() assert.Nil(t, er) assert.Len(t, *ids, listSize) - for i, id :=range *ids{ + 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()) @@ -422,13 +506,13 @@ func TestGetListGnbIdsOneId(t *testing.T) { readerPool = nil sdlInstanceMock := initSdlInstanceMock(namespace, 1) w := GetRNibReader() - nbIdentity := &entities.NbIdentity{InventoryName:name, GlobalNbId:&entities.GlobalNbId{PlmnId:plmnId, NbId:nbId}} + nbIdentity := &entities.NbIdentity{InventoryName: name, GlobalNbId: &entities.GlobalNbId{PlmnId: plmnId, NbId: nbId}} var e error data, err := proto.Marshal(nbIdentity) if err != nil { t.Errorf("#rNibReader_test.TestGetListGnbIds - Failed to marshal nodeb identity entity. Error: %v", err) } - sdlInstanceMock.On("GetMembers", "GNB").Return([]string{string(data)}, e) + sdlInstanceMock.On("GetMembers", GnbType).Return([]string{string(data)}, e) ids, er := w.GetListGnbIds() assert.Nil(t, er) assert.Len(t, *ids, 1) @@ -442,7 +526,7 @@ func TestGetListGnbIdsNoIds(t *testing.T) { sdlInstanceMock := initSdlInstanceMock(namespace, 1) w := GetRNibReader() var e error - sdlInstanceMock.On("GetMembers", "GNB").Return([]string{}, e) + sdlInstanceMock.On("GetMembers", GnbType).Return([]string{}, e) ids, er := w.GetListGnbIds() assert.Nil(t, er) assert.Len(t, *ids, 0) @@ -458,8 +542,8 @@ func TestGetListGnbIds(t *testing.T) { w := GetRNibReader() idsData := make([]string, listSize) idsEntities := make([]*entities.NbIdentity, listSize) - for i:=0; i< listSize ;i++{ - nbIdentity := &entities.NbIdentity{InventoryName:name, GlobalNbId:&entities.GlobalNbId{PlmnId:string(plmnId + i), NbId:string(nbId + i)}} + for i := 0; i < listSize; i++ { + nbIdentity := &entities.NbIdentity{InventoryName: name, GlobalNbId: &entities.GlobalNbId{PlmnId: string(plmnId + i), NbId: string(nbId + i)}} data, err := proto.Marshal(nbIdentity) if err != nil { t.Errorf("#rNibReader_test.TestGetListGnbIds - Failed to marshal nodeb identity entity. Error: %v", err) @@ -468,11 +552,11 @@ func TestGetListGnbIds(t *testing.T) { idsEntities[i] = nbIdentity } var e error - sdlInstanceMock.On("GetMembers", "GNB").Return(idsData, e) + sdlInstanceMock.On("GetMembers", GnbType).Return(idsData, e) ids, er := w.GetListGnbIds() assert.Nil(t, er) assert.Len(t, *ids, listSize) - for i, id :=range *ids{ + 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()) @@ -487,7 +571,7 @@ func TestGetListEnbIdsSdlgoFailure(t *testing.T) { w := GetRNibReader() e := errors.New(errMsg) var data []string - sdlInstanceMock.On("GetMembers", "ENB").Return(data, e) + sdlInstanceMock.On("GetMembers", EnbType).Return(data, e) ids, er := w.GetListEnbIds() assert.NotNil(t, er) assert.Nil(t, ids) @@ -496,45 +580,22 @@ func TestGetListEnbIdsSdlgoFailure(t *testing.T) { } func TestGetCountGnbListOneId(t *testing.T) { - name := "name" - plmnId := "02f829" - nbId := "4a952a0a" readerPool = nil sdlInstanceMock := initSdlInstanceMock(namespace, 1) w := GetRNibReader() - nbIdentity := &entities.NbIdentity{InventoryName:name, GlobalNbId:&entities.GlobalNbId{PlmnId:plmnId, NbId:nbId}} var e error - data, err := proto.Marshal(nbIdentity) - if err != nil { - t.Errorf("#rNibReader_test.TestGetCountGnbList - Failed to marshal nodeb identity entity. Error: %v", err) - } - sdlInstanceMock.On("GetMembers", "GNB").Return([]string{string(data)}, e) + sdlInstanceMock.On("GroupSize", GnbType).Return(1, e) count, er := w.GetCountGnbList() assert.Nil(t, er) assert.Equal(t, count, 1) } func TestGetCountGnbList(t *testing.T) { - listSize := 3 - name := "name" - plmnId := 0x02f823 - nbId := 0x4a952a1f readerPool = nil sdlInstanceMock := initSdlInstanceMock(namespace, 1) w := GetRNibReader() var e error - idsData := make([]string, listSize) - idsEntities := make([]*entities.NbIdentity, listSize) - for i:=0; i< listSize ;i++{ - nbIdentity := &entities.NbIdentity{InventoryName:name, GlobalNbId:&entities.GlobalNbId{PlmnId:string(plmnId + i), NbId:string(nbId + i)}} - data, err := proto.Marshal(nbIdentity) - if err != nil { - t.Errorf("#rNibReader_test.TestGetListGnbIds - Failed to marshal nodeb identity entity. Error: %v", err) - } - idsData[i] = string(data) - idsEntities[i] = nbIdentity - } - sdlInstanceMock.On("GetMembers", "GNB").Return(idsData, e) + sdlInstanceMock.On("GroupSize", GnbType).Return(3, e) count, er := w.GetCountGnbList() assert.Nil(t, er) assert.Equal(t, count, 3) @@ -547,8 +608,8 @@ func TestGetCountGnbListSdlgoFailure(t *testing.T) { sdlInstanceMock := initSdlInstanceMock(namespace, 1) w := GetRNibReader() e := errors.New(errMsg) - var data []string - sdlInstanceMock.On("GetMembers", "GNB").Return(data, e) + var count int + sdlInstanceMock.On("GroupSize", GnbType).Return(count, e) count, er := w.GetCountGnbList() assert.NotNil(t, er) assert.Equal(t, 0, count) @@ -558,12 +619,11 @@ func TestGetCountGnbListSdlgoFailure(t *testing.T) { func TestGetCell(t *testing.T) { name := "name" - var pci uint32 - pci = 10 + var pci uint32 = 10 readerPool = nil sdlInstanceMock := initSdlInstanceMock(namespace, 1) w := GetRNibReader() - cellEntity := entities.Cell{Type:entities.Cell_LTE_CELL, Cell:&entities.Cell_ServedCellInfo{ServedCellInfo:&entities.ServedCellInfo{Pci:pci}}} + 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 { t.Errorf("#rNibReader_test.TestGetCell - Failed to marshal Cell entity. Error: %v", err) @@ -573,7 +633,7 @@ func TestGetCell(t *testing.T) { if rNibErr != nil { t.Errorf("#rNibReader_test.TestGetCell - failed to validate key parameter") } - ret := map[string]interface{}{key:string(cellData)} + ret := map[string]interface{}{key: string(cellData)} sdlInstanceMock.On("Get", []string{key}).Return(ret, e) cell, er := w.GetCell(name, pci) assert.Nil(t, er) @@ -610,7 +670,7 @@ func TestGetCellUnmarshalFailure(t *testing.T) { sdlInstanceMock := initSdlInstanceMock(namespace, 1) w := GetRNibReader() var e error - ret := make( map[string]interface{}, 1) + ret := make(map[string]interface{}, 1) key, rNibErr := common.ValidateAndBuildCellNamePciKey(name, pci) if rNibErr != nil { t.Errorf("#rNibReader_test.TestGetCellUnmarshalFailure - failed to validate key parameter") @@ -650,14 +710,14 @@ func TestGetNodebById(t *testing.T) { readerPool = nil sdlInstanceMock := initSdlInstanceMock(namespace, 1) w := GetRNibReader() - nb := entities.NodebInfo{NodeType:entities.Node_ENB} + nb := entities.NodebInfo{NodeType: entities.Node_ENB} nb.ConnectionStatus = 1 nb.Ip = "localhost" nb.Port = 5656 enb := entities.Enb{} - cell := entities.ServedCellInfo{Tac:"tac"} + cell := entities.ServedCellInfo{Tac: "tac"} enb.ServedCells = []*entities.ServedCellInfo{&cell} - nb.Configuration = &entities.NodebInfo_Enb{Enb:&enb} + nb.Configuration = &entities.NodebInfo_Enb{Enb: &enb} var e error data, err := proto.Marshal(&nb) if err != nil { @@ -667,12 +727,12 @@ func TestGetNodebById(t *testing.T) { plmnId := "02f829" nbId := "4a952a0a" key, rNibErr := common.ValidateAndBuildNodeBIdKey(entities.Node_ENB.String(), plmnId, nbId) - if rNibErr != nil{ + if rNibErr != nil { t.Errorf("Failed to validate nodeb identity, plmnId: %s, nbId: %s", plmnId, nbId) } - ret := map[string]interface{}{key:string(data)} + ret := map[string]interface{}{key: string(data)} sdlInstanceMock.On("Get", []string{key}).Return(ret, e) - globalNbId := &entities.GlobalNbId{PlmnId:plmnId, NbId:nbId} + globalNbId := &entities.GlobalNbId{PlmnId: plmnId, NbId: nbId} getNb, er := w.GetNodebByGlobalNbId(entities.Node_ENB, globalNbId) assert.Nil(t, er) assert.Equal(t, getNb.Ip, nb.Ip) @@ -690,17 +750,17 @@ func TestGetNodebByIdNotFoundFailureEnb(t *testing.T) { w := GetRNibReader() var e error key, rNibErr := common.ValidateAndBuildNodeBIdKey(entities.Node_ENB.String(), plmnId, nbId) - if rNibErr != nil{ + if rNibErr != nil { t.Errorf("Failed to validate nodeb identity, plmnId: %s, nbId: %s", plmnId, nbId) } var ret map[string]interface{} sdlInstanceMock.On("Get", []string{key}).Return(ret, e) - globalNbId := &entities.GlobalNbId{PlmnId:plmnId, NbId:nbId} + globalNbId := &entities.GlobalNbId{PlmnId: plmnId, NbId: nbId} 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.GetNodebByGlobalNbId - responding node not found, global nodeb Id: ENB:02f829:4a952a0a", er.Error()) + assert.EqualValues(t, "1 RESOURCE_NOT_FOUND - #rNibReader.getNodeb - responding node not found. Key: ENB:02f829:4a952a0a", er.Error()) } func TestGetNodebByIdNotFoundFailureGnb(t *testing.T) { @@ -711,17 +771,17 @@ func TestGetNodebByIdNotFoundFailureGnb(t *testing.T) { w := GetRNibReader() var e error key, rNibErr := common.ValidateAndBuildNodeBIdKey(entities.Node_GNB.String(), plmnId, nbId) - if rNibErr != nil{ + if rNibErr != nil { t.Errorf("Failed to validate nodeb identity, plmnId: %s, nbId: %s", plmnId, nbId) } var ret map[string]interface{} sdlInstanceMock.On("Get", []string{key}).Return(ret, e) - globalNbId := &entities.GlobalNbId{PlmnId:plmnId, NbId:nbId} + globalNbId := &entities.GlobalNbId{PlmnId: plmnId, NbId: nbId} 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.GetNodebByGlobalNbId - responding node not found, global nodeb Id: GNB:02f829:4a952a0a", er.Error()) + assert.EqualValues(t, "1 RESOURCE_NOT_FOUND - #rNibReader.getNodeb - responding node not found. Key: GNB:02f829:4a952a0a", er.Error()) } func TestGetNodeByIdUnmarshalFailure(t *testing.T) { @@ -731,14 +791,14 @@ func TestGetNodeByIdUnmarshalFailure(t *testing.T) { sdlInstanceMock := initSdlInstanceMock(namespace, 1) w := GetRNibReader() key, rNibErr := common.ValidateAndBuildNodeBIdKey(entities.Node_ENB.String(), plmnId, nbId) - if rNibErr != nil{ + if rNibErr != nil { t.Errorf("Failed to validate nodeb identity, plmnId: %s, nbId: %s", plmnId, nbId) } var e error - ret := make( map[string]interface{}, 1) + ret := make(map[string]interface{}, 1) ret[key] = "data" sdlInstanceMock.On("Get", []string{key}).Return(ret, e) - globalNbId := &entities.GlobalNbId{PlmnId:plmnId, NbId:nbId} + globalNbId := &entities.GlobalNbId{PlmnId: plmnId, NbId: nbId} getNb, er := w.GetNodebByGlobalNbId(entities.Node_ENB, globalNbId) assert.NotNil(t, er) assert.Nil(t, getNb) @@ -755,13 +815,13 @@ func TestGetNodeByIdSdlgoFailure(t *testing.T) { sdlInstanceMock := initSdlInstanceMock(namespace, 1) w := GetRNibReader() key, rNibErr := common.ValidateAndBuildNodeBIdKey(entities.Node_GNB.String(), plmnId, nbId) - if rNibErr != nil{ + if rNibErr != nil { t.Errorf("Failed to validate nodeb identity, plmnId: %s, nbId: %s", plmnId, nbId) } e := errors.New(errMsg) var ret map[string]interface{} sdlInstanceMock.On("Get", []string{key}).Return(ret, e) - globalNbId := &entities.GlobalNbId{PlmnId:plmnId, NbId:nbId} + globalNbId := &entities.GlobalNbId{PlmnId: plmnId, NbId: nbId} getNb, er := w.GetNodebByGlobalNbId(entities.Node_GNB, globalNbId) assert.NotNil(t, er) assert.Nil(t, getNb) @@ -771,12 +831,11 @@ func TestGetNodeByIdSdlgoFailure(t *testing.T) { func TestGetCellById(t *testing.T) { cellId := "aaaa" - var pci uint32 - pci = 10 + var pci uint32 = 10 readerPool = nil sdlInstanceMock := initSdlInstanceMock(namespace, 1) w := GetRNibReader() - cellEntity := entities.Cell{Type:entities.Cell_LTE_CELL, Cell:&entities.Cell_ServedCellInfo{ServedCellInfo:&entities.ServedCellInfo{Pci:pci}}} + 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 { t.Errorf("#rNibReader_test.TestGetCellById - Failed to marshal Cell entity. Error: %v", err) @@ -786,7 +845,7 @@ func TestGetCellById(t *testing.T) { if rNibErr != nil { t.Errorf("#rNibReader_test.TestGetCellById - failed to validate key parameter") } - ret := map[string]interface{}{key:string(cellData)} + ret := map[string]interface{}{key: string(cellData)} sdlInstanceMock.On("Get", []string{key}).Return(ret, e) cell, er := w.GetCellById(entities.Cell_LTE_CELL, cellId) assert.Nil(t, er) @@ -996,4 +1055,4 @@ func TestGetCellByIdValidationFailureEnb(t *testing.T) { // } else if cell != nil{ // fmt.Printf("responding node type NR Cell: %v\n", cell.GetServedNrCell()) // } -//} \ No newline at end of file +//}