"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"
- "github.com/julienschmidt/httprouter"
+ "github.com/gorilla/mux"
"github.com/pkg/errors"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
t.Errorf("#nodeb_controller_test.TestHandleRequestSuccess - failed to initialize logger, error: %s", err)
}
- rmrMessengerMock :=&mocks.RmrMessengerMock{}
- mbuf := rmrCgo.NewMBuf(tests.MessageType, tests.MaxMsgSize,"RanName", &tests.DummyPayload, &tests.DummyXAction)
+ rmrMessengerMock := &mocks.RmrMessengerMock{}
+ mbuf := rmrCgo.NewMBuf(tests.MessageType, tests.MaxMsgSize, "RanName", &tests.DummyPayload, &tests.DummyXAction)
rmrMessengerMock.On("SendMsg",
mock.AnythingOfType(fmt.Sprintf("%T", mbuf)),
writer := httptest.NewRecorder()
handleRequest(writer, log, rmrMessengerMock, tests.GetHttpRequest(), x2SetupMessageType)
- assert.Equal(t, writer.Result().StatusCode, http.StatusOK)
+ assert.Equal(t, http.StatusOK, writer.Result().StatusCode)
}
func TestHandleRequestFailure_InvalidRequestDetails(t *testing.T) {
func TestHandleHealthCheckRequest(t *testing.T) {
rc := NewNodebController(nil, nil, nil, nil)
writer := httptest.NewRecorder()
- rc.HandleHealthCheckRequest(writer, nil, nil)
+ rc.HandleHealthCheckRequest(writer, nil)
assert.Equal(t, writer.Result().StatusCode, http.StatusOK)
}
func handleRequest(writer *httptest.ResponseRecorder, log *logger.Logger, rmrMessengerMock *mocks.RmrMessengerMock,
request *http.Request, messageType string) {
rmrService := getRmrService(rmrMessengerMock, log)
- params := []httprouter.Param{{Key: "messageType", Value: messageType}}
+ request = mux.SetURLVars(request, map[string]string{"messageType": messageType})
var nodebInfo *entities.NodebInfo
var nbIdentity *entities.NbIdentity
return &rnibWriterMock
}
- NewNodebController(log, rmrService, rnibReaderProvider, rnibWriterProvider).HandleRequest(writer, request, params)
+ NewNodebController(log, rmrService, rnibReaderProvider, rnibWriterProvider).HandleRequest(writer, request)
}
func getRmrService(rmrMessengerMock *mocks.RmrMessengerMock, log *logger.Logger) *services.RmrService {
rmrMessenger := rmrCgo.RmrMessenger(rmrMessengerMock)
messageChannel := make(chan *models.NotificationResponse)
rmrMessengerMock.On("Init", tests.GetPort(), tests.MaxMsgSize, tests.Flags, log).Return(&rmrMessenger)
- return services.NewRmrService(services.NewRmrConfig(tests.Port, tests.MaxMsgSize, tests.Flags, log), rmrMessenger, make(sessions.E2Sessions), messageChannel)
+ return services.NewRmrService(services.NewRmrConfig(tests.Port, tests.MaxMsgSize, tests.Flags, log), rmrMessenger, make(sessions.E2Sessions), messageChannel)
}
-
func executeGetNodeb(logger *logger.Logger, writer *httptest.ResponseRecorder, rnibReaderProvider func() reader.RNibReader) {
req, _ := http.NewRequest("GET", "/nodeb", nil)
+ req = mux.SetURLVars(req, map[string]string{"ranName": "testNode"})
- params := []httprouter.Param{{Key: "ranName", Value: "testNode"}}
-
- NewNodebController(logger, nil, rnibReaderProvider, nil).GetNodeb(writer, req, params)
+ NewNodebController(logger, nil, rnibReaderProvider, nil).GetNodeb(writer, req)
}
func TestNodebController_GetNodeb_Success(t *testing.T) {
rnibReaderMock := mocks.RnibReaderMock{}
- var rnibError common.IRNibError
+ var rnibError error
rnibReaderMock.On("GetNodeb", "testNode").Return(&entities.NodebInfo{}, rnibError)
rnibReaderProvider := func() reader.RNibReader {
writer := httptest.NewRecorder()
rnibReaderMock := mocks.RnibReaderMock{}
- rnibError := common.NewResourceNotFoundError(errors.Errorf("#reader.GetNodeb - responding node %s not found", "testNode"))
+ rnibError := common.NewResourceNotFoundErrorf("#reader.GetNodeb - responding node %s not found", "testNode")
var nodebInfo *entities.NodebInfo
rnibReaderMock.On("GetNodeb", "testNode").Return(nodebInfo, rnibError)
func executeGetNodebIdList(logger *logger.Logger, writer *httptest.ResponseRecorder, rnibReaderProvider func() reader.RNibReader) {
req, _ := http.NewRequest("GET", "/nodeb-ids", nil)
- NewNodebController(logger, nil, rnibReaderProvider, nil ).GetNodebIdList(writer,req,nil)
+ NewNodebController(logger, nil, rnibReaderProvider, nil ).GetNodebIdList(writer,req)
}
func TestNodebController_GetNodebIdList_Success(t *testing.T) {
logger, err := logger.InitLogger(logger.InfoLevel)
- if err!=nil{
+ if err != nil {
t.Errorf("#nodeb_controller_test.TestNodebController_GetNodebIdList_Success - failed to initialize logger, error: %s", err)
}
writer := httptest.NewRecorder()
rnibReaderMock := mocks.RnibReaderMock{}
- var rnibError common.IRNibError
-
- enbList := []*entities.NbIdentity{&entities.NbIdentity{InventoryName:"test1", GlobalNbId: &entities.GlobalNbId{PlmnId:"plmnId1",NbId: "nbId1"}}}
- gnbList := []*entities.NbIdentity{&entities.NbIdentity{InventoryName:"test2", GlobalNbId: &entities.GlobalNbId{PlmnId:"plmnId2",NbId: "nbId2"}}}
-
- rnibReaderMock.On("GetListEnbIds").Return(&enbList, rnibError)
- rnibReaderMock.On("GetListGnbIds").Return(&gnbList, rnibError)
+ var rnibError error
+ nbList := []*entities.NbIdentity{
+ {InventoryName:"test1", GlobalNbId: &entities.GlobalNbId{PlmnId:"plmnId1",NbId: "nbId1"}},
+ {InventoryName:"test2", GlobalNbId: &entities.GlobalNbId{PlmnId:"plmnId2",NbId: "nbId2"}},
+ {InventoryName:"test3", GlobalNbId: &entities.GlobalNbId{PlmnId:"",NbId: ""}},
+ }
+ rnibReaderMock.On("GetListNodebIds").Return(nbList, rnibError)
- rnibReaderProvider:= func() reader.RNibReader {
+ rnibReaderProvider := func() reader.RNibReader {
return &rnibReaderMock
}
executeGetNodebIdList(logger, writer, rnibReaderProvider)
assert.Equal(t, writer.Result().StatusCode, http.StatusOK)
bodyBytes, err := ioutil.ReadAll(writer.Body)
- assert.Equal(t, "[{\"inventoryName\":\"test1\",\"globalNbId\":{\"plmnId\":\"plmnId1\",\"nbId\":\"nbId1\"}},{\"inventoryName\":\"test2\",\"globalNbId\":{\"plmnId\":\"plmnId2\",\"nbId\":\"nbId2\"}}]",string(bodyBytes) )
+ assert.Equal(t, "[{\"inventoryName\":\"test1\",\"globalNbId\":{\"plmnId\":\"plmnId1\",\"nbId\":\"nbId1\"}},{\"inventoryName\":\"test2\",\"globalNbId\":{\"plmnId\":\"plmnId2\",\"nbId\":\"nbId2\"}},{\"inventoryName\":\"test3\",\"globalNbId\":{}}]",string(bodyBytes) )
}
func TestNodebController_GetNodebIdList_EmptyList(t *testing.T) {
log, err := logger.InitLogger(logger.InfoLevel)
- if err!=nil{
+ if err != nil {
t.Errorf("#nodeb_controller_test.TestNodebController_GetNodebIdList_EmptyList - failed to initialize logger, error: %s", err)
}
rnibReaderMock := mocks.RnibReaderMock{}
- var rnibError common.IRNibError
- enbList := []*entities.NbIdentity{}
- gnbList := []*entities.NbIdentity{}
+ var rnibError error
+ nbList := []*entities.NbIdentity{}
+ rnibReaderMock.On("GetListNodebIds").Return(nbList, rnibError)
- rnibReaderMock.On("GetListEnbIds").Return(&enbList, rnibError)
- rnibReaderMock.On("GetListGnbIds").Return(&gnbList, rnibError)
-
- rnibReaderProvider:= func() reader.RNibReader {
+ rnibReaderProvider := func() reader.RNibReader {
return &rnibReaderMock
}
rnibReaderMock := mocks.RnibReaderMock{}
rnibError := common.NewInternalError(errors.New("#reader.GetEnbIdList - Internal Error"))
- var enbList *[]*entities.NbIdentity
- rnibReaderMock.On("GetListEnbIds").Return(enbList, rnibError)
+ var nbList []*entities.NbIdentity
+ rnibReaderMock.On("GetListNodebIds").Return(nbList, rnibError)
rnibReaderProvider := func() reader.RNibReader {
return &rnibReaderMock
executeGetNodebIdList(logger, writer, rnibReaderProvider)
assert.Equal(t, writer.Result().StatusCode, http.StatusInternalServerError)
-}
-
-func TestNodebController_GetNodebIdList_Success_One(t *testing.T) {
- logger, err := logger.InitLogger(logger.InfoLevel)
-
- if err!=nil{
- t.Errorf("#nodeb_controller_test.TestNodebController_GetNodebIdList_Success - failed to initialize logger, error: %s", err)
- }
-
- writer := httptest.NewRecorder()
-
- rnibReaderMock := mocks.RnibReaderMock{}
- var rnibError common.IRNibError
-
- enbList := []*entities.NbIdentity{}
- gnbList := []*entities.NbIdentity{&entities.NbIdentity{InventoryName:"test2", GlobalNbId: &entities.GlobalNbId{PlmnId:"plmnId2",NbId: "nbId2"}}}
-
- rnibReaderMock.On("GetListEnbIds").Return(&enbList, rnibError)
- rnibReaderMock.On("GetListGnbIds").Return(&gnbList, rnibError)
-
-
- rnibReaderProvider:= func() reader.RNibReader {
- return &rnibReaderMock
- }
-
- executeGetNodebIdList(logger, writer, rnibReaderProvider)
- assert.Equal(t, writer.Result().StatusCode, http.StatusOK)
- bodyBytes, err := ioutil.ReadAll(writer.Body)
- assert.Equal(t, "[{\"inventoryName\":\"test2\",\"globalNbId\":{\"plmnId\":\"plmnId2\",\"nbId\":\"nbId2\"}}]",string(bodyBytes) )
-}
-
-func TestNodebController_GetNodebIdList_Success_Many(t *testing.T) {
- logger, err := logger.InitLogger(logger.InfoLevel)
-
- if err!=nil{
- t.Errorf("#nodeb_controller_test.TestNodebController_GetNodebIdList_Success - failed to initialize logger, error: %s", err)
- }
-
- writer := httptest.NewRecorder()
-
- rnibReaderMock := mocks.RnibReaderMock{}
- var rnibError common.IRNibError
-
- enbList := []*entities.NbIdentity{&entities.NbIdentity{InventoryName:"test1", GlobalNbId: &entities.GlobalNbId{PlmnId:"plmnId1",NbId: "nbId1"}}}
- gnbList := []*entities.NbIdentity{&entities.NbIdentity{InventoryName:"test2", GlobalNbId: &entities.GlobalNbId{PlmnId:"plmnId2",NbId: "nbId2"}}, {InventoryName:"test3", GlobalNbId: &entities.GlobalNbId{PlmnId:"plmnId3",NbId: "nbId3"}}}
-
- rnibReaderMock.On("GetListEnbIds").Return(&enbList, rnibError)
- rnibReaderMock.On("GetListGnbIds").Return(&gnbList, rnibError)
-
-
- rnibReaderProvider:= func() reader.RNibReader {
- return &rnibReaderMock
- }
-
- executeGetNodebIdList(logger, writer, rnibReaderProvider)
- assert.Equal(t, writer.Result().StatusCode, http.StatusOK)
- bodyBytes, err := ioutil.ReadAll(writer.Body)
- assert.Equal(t, "[{\"inventoryName\":\"test1\",\"globalNbId\":{\"plmnId\":\"plmnId1\",\"nbId\":\"nbId1\"}},{\"inventoryName\":\"test2\",\"globalNbId\":{\"plmnId\":\"plmnId2\",\"nbId\":\"nbId2\"}},{\"inventoryName\":\"test3\",\"globalNbId\":{\"plmnId\":\"plmnId3\",\"nbId\":\"nbId3\"}}]",string(bodyBytes) )
}
\ No newline at end of file