X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=E2Manager%2Fcontrollers%2Fnodeb_controller_test.go;h=fc59673bfc6d57fa44cde84b8dca00680ae0287e;hb=611eba27c24f595a57f7c55068605a57788ead95;hp=47b4bc8723e41d253bad60f7813c440a35763d8f;hpb=f1035e286c9cdb58fd786daf4d6c5cc9bea45a37;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/controllers/nodeb_controller_test.go b/E2Manager/controllers/nodeb_controller_test.go index 47b4bc8..fc59673 100644 --- a/E2Manager/controllers/nodeb_controller_test.go +++ b/E2Manager/controllers/nodeb_controller_test.go @@ -24,7 +24,6 @@ import ( "e2mgr/clients" "e2mgr/configuration" "e2mgr/e2managererrors" - "e2mgr/e2pdus" "e2mgr/logger" "e2mgr/managers" "e2mgr/mocks" @@ -38,6 +37,7 @@ import ( "fmt" "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/jsonpb" "github.com/gorilla/mux" "github.com/pkg/errors" "github.com/stretchr/testify/assert" @@ -48,19 +48,28 @@ import ( "net/http/httptest" "strings" "testing" + "unsafe" ) const ( RanName = "test" AssociatedE2TInstanceAddress = "10.0.2.15:38000" + CorruptedJson = "{\"errorCode\":401,\"errorMessage\":\"corrupted json\"}" ValidationFailureJson = "{\"errorCode\":402,\"errorMessage\":\"Validation error\"}" ResourceNotFoundJson = "{\"errorCode\":404,\"errorMessage\":\"Resource not found\"}" + NodebExistsJson = "{\"errorCode\":406,\"errorMessage\":\"Nodeb already exists\"}" RnibErrorJson = "{\"errorCode\":500,\"errorMessage\":\"RNIB error\"}" + InternalErrorJson = "{\"errorCode\":501,\"errorMessage\":\"Internal Server Error. Please try again later\"}" + AddEnbUrl = "/nodeb/enb" ) var ( - ServedNrCellInformationRequiredFields = []string{"cellId", "choiceNrMode", "nrMode", "nrPci", "servedPlmns"} - NrNeighbourInformationRequiredFields = []string{"nrCgi", "choiceNrMode", "nrMode", "nrPci"} + ServedNrCellInformationRequiredFields = []string{"cellId", "choiceNrMode", "nrMode", "servedPlmns"} + NrNeighbourInformationRequiredFields = []string{"nrCgi", "choiceNrMode", "nrMode"} + AddEnbRequestRequiredFields = []string{"ranName", "enb", "globalNbId"} + GlobalIdRequiredFields = []string{"plmnId", "nbId"} + EnbRequiredFields = []string{"enbType", "servedCells"} + ServedCellRequiredFields = []string{"broadcastPlmns", "cellId", "choiceEutraMode", "eutraMode", "tac"} ) type controllerGetNodebTestContext struct { @@ -83,13 +92,59 @@ type getNodebInfoResult struct { rnibError error } +type updateGnbCellsParams struct { + err error +} + +type saveNodebParams struct { + nodebInfo *entities.NodebInfo + nbIdentity *entities.NbIdentity + err error +} + +type removeServedNrCellsParams struct { + servedNrCells []*entities.ServedNRCell + err error +} + type controllerUpdateGnbTestContext struct { + getNodebInfoResult *getNodebInfoResult + removeServedNrCellsParams *removeServedNrCellsParams + updateGnbCellsParams *updateGnbCellsParams + requestBody map[string]interface{} + expectedStatusCode int + expectedJsonResponse string +} + +type controllerAddEnbTestContext struct { getNodebInfoResult *getNodebInfoResult + saveNodebParams *saveNodebParams requestBody map[string]interface{} expectedStatusCode int expectedJsonResponse string } +func generateServedNrCells(cellIds ...string) []*entities.ServedNRCell { + + servedNrCells := []*entities.ServedNRCell{} + + for _, v := range cellIds { + servedNrCells = append(servedNrCells, &entities.ServedNRCell{ServedNrCellInformation: &entities.ServedNRCellInformation{ + CellId: v, + ChoiceNrMode: &entities.ServedNRCellInformation_ChoiceNRMode{ + Fdd: &entities.ServedNRCellInformation_ChoiceNRMode_FddInfo{ + + }, + }, + NrMode: entities.Nr_FDD, + NrPci: 5, + ServedPlmns: []string{"whatever"}, + }}) + } + + return servedNrCells +} + func buildNrNeighbourInformation(propToOmit string) map[string]interface{} { ret := map[string]interface{}{ "nrCgi": "whatever", @@ -127,6 +182,68 @@ func buildServedNrCellInformation(propToOmit string) map[string]interface{} { return ret } +func buildServedCell(propToOmit string) map[string]interface{} { + ret := map[string]interface{}{ + "cellId": "whatever", + "choiceEutraMode": map[string]interface{}{ + "fdd": map[string]interface{}{}, + }, + "eutraMode": 1, + "pci": 1, + "tac": "whatever3", + "broadcastPlmns": []interface{}{ + "whatever", + }, + } + + if len(propToOmit) != 0 { + delete(ret, propToOmit) + } + + return ret +} + +func getAddEnbRequest(propToOmit string) map[string]interface{} { + ret := map[string]interface{}{ + "ranName": RanName, + "globalNbId": buildGlobalNbId(""), + "enb": buildEnb(""), + } + + if len(propToOmit) != 0 { + delete(ret, propToOmit) + } + + return ret +} + +func buildEnb(propToOmit string) map[string]interface{} { + ret := map[string]interface{}{ + "enbType": 1, + "servedCells": []interface{}{ + buildServedCell(""), + }} + + if len(propToOmit) != 0 { + delete(ret, propToOmit) + } + + return ret +} + +func buildGlobalNbId(propToOmit string) map[string]interface{} { + ret := map[string]interface{}{ + "plmnId": "whatever", + "nbId": "whatever2", + } + + if len(propToOmit) != 0 { + delete(ret, propToOmit) + } + + return ret +} + func setupControllerTest(t *testing.T) (*NodebController, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.RmrMessengerMock, *mocks.E2TInstancesManagerMock) { log := initLog(t) config := configuration.ParseConfiguration() @@ -138,108 +255,63 @@ func setupControllerTest(t *testing.T) (*NodebController, *mocks.RnibReaderMock, rnibDataService := services.NewRnibDataService(log, config, readerMock, writerMock) rmrSender := getRmrSender(rmrMessengerMock, log) - ranSetupManager := managers.NewRanSetupManager(log, rmrSender, rnibDataService) e2tInstancesManager := &mocks.E2TInstancesManagerMock{} httpClientMock := &mocks.HttpClientMock{} rmClient := clients.NewRoutingManagerClient(log, config, httpClientMock) - e2tAssociationManager := managers.NewE2TAssociationManager(log, rnibDataService, e2tInstancesManager, rmClient) - handlerProvider := httpmsghandlerprovider.NewIncomingRequestHandlerProvider(log, rmrSender, config, rnibDataService, ranSetupManager, e2tInstancesManager, e2tAssociationManager, rmClient) + ranListManager := &mocks.RanListManagerMock{} + ranAlarmService := &mocks.RanAlarmServiceMock{} + ranConnectStatusChangeManager := managers.NewRanConnectStatusChangeManager(log, rnibDataService, ranListManager, ranAlarmService) + nodebValidator := managers.NewNodebValidator() + handlerProvider := httpmsghandlerprovider.NewIncomingRequestHandlerProvider(log, rmrSender, config, rnibDataService, e2tInstancesManager, rmClient, ranConnectStatusChangeManager, nodebValidator) controller := NewNodebController(log, handlerProvider) return controller, readerMock, writerMock, rmrMessengerMock, e2tInstancesManager } -func TestX2SetupInvalidBody(t *testing.T) { - - controller, _, _, _, _ := setupControllerTest(t) - - header := http.Header{} - header.Set("Content-Type", "application/json") - httpRequest, _ := http.NewRequest("POST", "http://localhost:3800/v1/nodeb/x2-setup", strings.NewReader("{}{}")) - httpRequest.Header = header +func TestShutdownHandlerRnibError(t *testing.T) { + controller, _, _, _, e2tInstancesManagerMock := setupControllerTest(t) + e2tInstancesManagerMock.On("GetE2TAddresses").Return([]string{}, e2managererrors.NewRnibDbError()) writer := httptest.NewRecorder() - controller.X2Setup(writer, httpRequest) + + controller.Shutdown(writer, tests.GetHttpRequest()) var errorResponse = parseJsonRequest(t, writer.Body) - assert.Equal(t, http.StatusBadRequest, writer.Result().StatusCode) - assert.Equal(t, e2managererrors.NewInvalidJsonError().Code, errorResponse.Code) + assert.Equal(t, http.StatusInternalServerError, writer.Result().StatusCode) + assert.Equal(t, errorResponse.Code, e2managererrors.NewRnibDbError().Code) } -func TestX2SetupSuccess(t *testing.T) { - - controller, readerMock, writerMock, rmrMessengerMock, _ := setupControllerTest(t) - - ranName := "test" - nb := &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, AssociatedE2TInstanceAddress: "10.0.2.15:8989"} - readerMock.On("GetNodeb", ranName).Return(nb, nil) - var nbUpdated = *nb - nbUpdated.ConnectionAttempts = 0 - writerMock.On("UpdateNodebInfo", &nbUpdated).Return(nil) - - var nbUpdated2 = &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1, AssociatedE2TInstanceAddress: "10.0.2.15:8989"} - writerMock.On("UpdateNodebInfo", nbUpdated2).Return(nil) - - payload := e2pdus.PackedX2setupRequest - var xAction []byte - msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), ranName, &payload, &xAction) - - rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(msg, nil) +func TestSetGeneralConfigurationHandlerRnibError(t *testing.T) { + controller, readerMock, _, _, _ := setupControllerTest(t) - header := http.Header{} - header.Set("Content-Type", "application/json") - httpRequest := tests.GetHttpRequest() - httpRequest.Header = header + configuration := &entities.GeneralConfiguration{} + readerMock.On("GetGeneralConfiguration").Return(configuration, e2managererrors.NewRnibDbError()) writer := httptest.NewRecorder() - controller.X2Setup(writer, httpRequest) - assert.Equal(t, http.StatusNoContent, writer.Result().StatusCode) -} - -func TestEndcSetupSuccess(t *testing.T) { - - controller, readerMock, writerMock, rmrMessengerMock, _ := setupControllerTest(t) - - ranName := "test" - nb := &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_ENDC_X2_SETUP_REQUEST, AssociatedE2TInstanceAddress: "10.0.2.15:8989"} - readerMock.On("GetNodeb", ranName).Return(nb, nil) - var nbUpdated = *nb - nbUpdated.ConnectionAttempts = 0 - writerMock.On("UpdateNodebInfo", &nbUpdated).Return(nil) + httpRequest, _ := http.NewRequest("PUT", "https://localhost:3800/v1/nodeb/parameters", strings.NewReader("{\"enableRic\":false}")) - var nbUpdated2 = &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_ENDC_X2_SETUP_REQUEST, ConnectionAttempts: 1, AssociatedE2TInstanceAddress: "10.0.2.15:8989"} - writerMock.On("UpdateNodebInfo", nbUpdated2).Return(nil) + controller.SetGeneralConfiguration(writer, httpRequest) - payload := e2pdus.PackedEndcX2setupRequest - var xAction []byte - msg := rmrCgo.NewMBuf(rmrCgo.RIC_ENDC_X2_SETUP_REQ, len(payload), ranName, &payload, &xAction) - - rmrMessengerMock.On("SendMsg", mock.Anything, true).Return(msg, nil) - - header := http.Header{} - header.Set("Content-Type", "application/json") - httpRequest := tests.GetHttpRequest() - httpRequest.Header = header - - writer := httptest.NewRecorder() - controller.EndcSetup(writer, httpRequest) + var errorResponse = parseJsonRequest(t, writer.Body) - assert.Equal(t, http.StatusNoContent, writer.Result().StatusCode) + assert.Equal(t, http.StatusInternalServerError, writer.Result().StatusCode) + assert.Equal(t, e2managererrors.NewRnibDbError().Code, errorResponse.Code) } -func TestShutdownHandlerRnibError(t *testing.T) { - controller, _, _, _, e2tInstancesManagerMock := setupControllerTest(t) - e2tInstancesManagerMock.On("GetE2TAddresses").Return([]string{}, e2managererrors.NewRnibDbError()) +func TestSetGeneralConfigurationInvalidJson(t *testing.T) { + controller, _, _, _, _ := setupControllerTest(t) writer := httptest.NewRecorder() - controller.Shutdown(writer, tests.GetHttpRequest()) + httpRequest, _ := http.NewRequest("PUT", "https://localhost:3800/v1/nodeb/parameters", strings.NewReader("{\"enableRic\":false, \"someValue\":false}")) + + controller.SetGeneralConfiguration(writer, httpRequest) var errorResponse = parseJsonRequest(t, writer.Body) - assert.Equal(t, http.StatusInternalServerError, writer.Result().StatusCode) - assert.Equal(t, errorResponse.Code, e2managererrors.NewRnibDbError().Code) + assert.Equal(t, http.StatusBadRequest, writer.Result().StatusCode) + assert.Equal(t, e2managererrors.NewInvalidJsonError().Code, errorResponse.Code) } func controllerGetNodebTestExecuter(t *testing.T, context *controllerGetNodebTestContext) { @@ -265,23 +337,103 @@ func controllerGetNodebIdListTestExecuter(t *testing.T, context *controllerGetNo assert.Equal(t, context.expectedJsonResponse, string(bodyBytes)) } -func controllerUpdateGnbTestExecuter(t *testing.T, context *controllerUpdateGnbTestContext) { - controller, readerMock, _, _, _ := setupControllerTest(t) - writer := httptest.NewRecorder() - +func activateControllerUpdateGnbMocks(context *controllerUpdateGnbTestContext, readerMock *mocks.RnibReaderMock, writerMock *mocks.RnibWriterMock) { if context.getNodebInfoResult != nil { readerMock.On("GetNodeb", RanName).Return(context.getNodebInfoResult.nodebInfo, context.getNodebInfoResult.rnibError) } + if context.removeServedNrCellsParams != nil { + writerMock.On("RemoveServedNrCells", RanName, context.removeServedNrCellsParams.servedNrCells).Return(context.removeServedNrCellsParams.err) + } + + if context.updateGnbCellsParams != nil { + updatedNodebInfo := *context.getNodebInfoResult.nodebInfo + gnb := entities.Gnb{} + _ = jsonpb.Unmarshal(getJsonRequestAsBuffer(context.requestBody), &gnb) + updatedGnb := *updatedNodebInfo.GetGnb() + updatedGnb.ServedNrCells = gnb.ServedNrCells + writerMock.On("UpdateGnbCells", &updatedNodebInfo, gnb.ServedNrCells).Return(context.updateGnbCellsParams.err) + } +} + +func assertControllerUpdateGnb(t *testing.T, context *controllerUpdateGnbTestContext, writer *httptest.ResponseRecorder, readerMock *mocks.RnibReaderMock, writerMock *mocks.RnibWriterMock) { + assert.Equal(t, context.expectedStatusCode, writer.Result().StatusCode) + bodyBytes, _ := ioutil.ReadAll(writer.Body) + assert.Equal(t, context.expectedJsonResponse, string(bodyBytes)) + readerMock.AssertExpectations(t) + writerMock.AssertExpectations(t) +} + +func assertControllerAddEnb(t *testing.T, context *controllerAddEnbTestContext, writer *httptest.ResponseRecorder, readerMock *mocks.RnibReaderMock, writerMock *mocks.RnibWriterMock) { + assert.Equal(t, context.expectedStatusCode, writer.Result().StatusCode) + bodyBytes, _ := ioutil.ReadAll(writer.Body) + assert.Equal(t, context.expectedJsonResponse, string(bodyBytes)) + readerMock.AssertExpectations(t) + writerMock.AssertExpectations(t) +} + +func buildUpdateGnbRequest(context *controllerUpdateGnbTestContext) *http.Request { updateGnbUrl := fmt.Sprintf("/nodeb/%s/update", RanName) requestBody := getJsonRequestAsBuffer(context.requestBody) - req, _ := http.NewRequest(http.MethodGet, updateGnbUrl, requestBody) + req, _ := http.NewRequest(http.MethodPut, updateGnbUrl, requestBody) req.Header.Set("Content-Type", "application/json") req = mux.SetURLVars(req, map[string]string{"ranName": RanName}) + return req +} + +func buildAddEnbRequest(context *controllerAddEnbTestContext) *http.Request { + requestBody := getJsonRequestAsBuffer(context.requestBody) + req, _ := http.NewRequest(http.MethodPost, AddEnbUrl, requestBody) + req.Header.Set("Content-Type", "application/json") + return req +} + +func controllerUpdateGnbTestExecuter(t *testing.T, context *controllerUpdateGnbTestContext) { + controller, readerMock, writerMock, _, _ := setupControllerTest(t) + writer := httptest.NewRecorder() + + activateControllerUpdateGnbMocks(context, readerMock, writerMock) + req := buildUpdateGnbRequest(context) controller.UpdateGnb(writer, req) - assert.Equal(t, context.expectedStatusCode, writer.Result().StatusCode) - bodyBytes, _ := ioutil.ReadAll(writer.Body) - assert.Equal(t, context.expectedJsonResponse, string(bodyBytes)) + assertControllerUpdateGnb(t, context, writer, readerMock, writerMock) +} + +func activateControllerAddEnbMocks(context *controllerAddEnbTestContext, readerMock *mocks.RnibReaderMock, writerMock *mocks.RnibWriterMock, addEnbRequest *models.AddEnbRequest) { + if context.getNodebInfoResult != nil { + readerMock.On("GetNodeb", RanName).Return(context.getNodebInfoResult.nodebInfo, context.getNodebInfoResult.rnibError) + } + + if context.saveNodebParams != nil { + nodebInfo := entities.NodebInfo{ + RanName: addEnbRequest.RanName, + Ip: addEnbRequest.Ip, + Port: addEnbRequest.Port, + NodeType: entities.Node_ENB, + GlobalNbId: addEnbRequest.GlobalNbId, + Configuration: &entities.NodebInfo_Enb{Enb: addEnbRequest.Enb}, + ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, + } + + nbIdentity := entities.NbIdentity{InventoryName: addEnbRequest.RanName, GlobalNbId: addEnbRequest.GlobalNbId} + + writerMock.On("SaveNodeb", &nbIdentity, &nodebInfo).Return(context.saveNodebParams.err) + } +} + +func controllerAddEnbTestExecuter(t *testing.T, context *controllerAddEnbTestContext) { + controller, readerMock, writerMock, _, _ := setupControllerTest(t) + writer := httptest.NewRecorder() + r := buildAddEnbRequest(context) + body, _ := ioutil.ReadAll(io.LimitReader(r.Body, LimitRequest)) + + addEnbRequest := models.AddEnbRequest{} + + _ = json.Unmarshal(body, &addEnbRequest) + activateControllerAddEnbMocks(context, readerMock, writerMock, &addEnbRequest) + r = buildAddEnbRequest(context) + defer r.Body.Close() + controller.AddEnb(writer, r) + assertControllerAddEnb(t, context, writer, readerMock, writerMock) } func TestControllerUpdateGnbEmptyServedNrCells(t *testing.T) { @@ -367,7 +519,7 @@ func TestControllerUpdateGnbMissingNeighbourInfoFddOrTdd(t *testing.T) { "servedNrCells": []interface{}{ map[string]interface{}{ "servedNrCellInformation": buildServedNrCellInformation(""), - "nrNeighbourInfos": []interface{}{ + "nrNeighbourInfos": []interface{}{ nrNeighbourInfo, }, }, @@ -389,7 +541,7 @@ func TestControllerUpdateGnbMissingNrNeighbourInformationRequiredProp(t *testing "servedNrCells": []interface{}{ map[string]interface{}{ "servedNrCellInformation": buildServedNrCellInformation(""), - "nrNeighbourInfos": []interface{}{ + "nrNeighbourInfos": []interface{}{ buildNrNeighbourInformation(v), }, }, @@ -403,59 +555,132 @@ func TestControllerUpdateGnbMissingNrNeighbourInformationRequiredProp(t *testing } } -func TestControllerUpdateGnbValidServedNrCellInformationAndNrNeighbourInfoGetNodebSuccess(t *testing.T) { +func TestControllerUpdateGnbValidServedNrCellInformationGetNodebNotFound(t *testing.T) { + context := controllerUpdateGnbTestContext{ + getNodebInfoResult: &getNodebInfoResult{ + nodebInfo: nil, + rnibError: common.NewResourceNotFoundError("#reader.GetNodeb - Not found Error"), + }, + requestBody: map[string]interface{}{ + "servedNrCells": []interface{}{ + map[string]interface{}{ + "servedNrCellInformation": buildServedNrCellInformation(""), + }, + }, + }, + expectedStatusCode: http.StatusNotFound, + expectedJsonResponse: ResourceNotFoundJson, + } + + controllerUpdateGnbTestExecuter(t, &context) +} + +func TestControllerUpdateGnbValidServedNrCellInformationGetNodebInternalError(t *testing.T) { context := controllerUpdateGnbTestContext{ getNodebInfoResult: &getNodebInfoResult{ - nodebInfo: &entities.NodebInfo{RanName: RanName, ConnectionStatus: entities.ConnectionStatus_CONNECTED, AssociatedE2TInstanceAddress: AssociatedE2TInstanceAddress}, + nodebInfo: nil, + rnibError: common.NewInternalError(errors.New("#reader.GetNodeb - Internal Error")), + }, + requestBody: map[string]interface{}{ + "servedNrCells": []interface{}{ + map[string]interface{}{ + "servedNrCellInformation": buildServedNrCellInformation(""), + }, + }, + }, + expectedStatusCode: http.StatusInternalServerError, + expectedJsonResponse: RnibErrorJson, + } + + controllerUpdateGnbTestExecuter(t, &context) +} + +func TestControllerUpdateGnbGetNodebSuccessInvalidGnbConfiguration(t *testing.T) { + context := controllerUpdateGnbTestContext{ + getNodebInfoResult: &getNodebInfoResult{ + nodebInfo: &entities.NodebInfo{ + RanName: RanName, + ConnectionStatus: entities.ConnectionStatus_CONNECTED, + AssociatedE2TInstanceAddress: AssociatedE2TInstanceAddress, + }, rnibError: nil, }, requestBody: map[string]interface{}{ "servedNrCells": []interface{}{ map[string]interface{}{ "servedNrCellInformation": buildServedNrCellInformation(""), - "nrNeighbourInfos": []interface{}{ + "nrNeighbourInfos": []interface{}{ buildNrNeighbourInformation(""), }, }, }, }, - expectedStatusCode: http.StatusOK, - expectedJsonResponse: "{\"ranName\":\"test\",\"connectionStatus\":\"CONNECTED\",\"associatedE2tInstanceAddress\":\"10.0.2.15:38000\"}", + expectedStatusCode: http.StatusInternalServerError, + expectedJsonResponse: InternalErrorJson, } controllerUpdateGnbTestExecuter(t, &context) } -func TestControllerUpdateGnbValidServedNrCellInformationGetNodebNotFound(t *testing.T) { +func TestControllerUpdateGnbGetNodebSuccessRemoveServedNrCellsFailure(t *testing.T) { + oldServedNrCells := generateServedNrCells("whatever1", "whatever2") context := controllerUpdateGnbTestContext{ + removeServedNrCellsParams: &removeServedNrCellsParams{ + err: common.NewInternalError(errors.New("#writer.UpdateGnbCells - Internal Error")), + servedNrCells: oldServedNrCells, + }, getNodebInfoResult: &getNodebInfoResult{ - nodebInfo: nil, - rnibError: common.NewResourceNotFoundError("#reader.GetNodeb - Not found Error"), + nodebInfo: &entities.NodebInfo{ + RanName: RanName, + ConnectionStatus: entities.ConnectionStatus_CONNECTED, + AssociatedE2TInstanceAddress: AssociatedE2TInstanceAddress, + Configuration: &entities.NodebInfo_Gnb{Gnb: &entities.Gnb{ServedNrCells: oldServedNrCells}}, + }, + rnibError: nil, }, requestBody: map[string]interface{}{ "servedNrCells": []interface{}{ map[string]interface{}{ "servedNrCellInformation": buildServedNrCellInformation(""), + "nrNeighbourInfos": []interface{}{ + buildNrNeighbourInformation(""), + }, }, }, }, - expectedStatusCode: http.StatusNotFound, - expectedJsonResponse: ResourceNotFoundJson, + expectedStatusCode: http.StatusInternalServerError, + expectedJsonResponse: RnibErrorJson, } controllerUpdateGnbTestExecuter(t, &context) } -func TestControllerUpdateGnbValidServedNrCellInformationGetNodebInternalError(t *testing.T) { +func TestControllerUpdateGnbGetNodebSuccessUpdateGnbCellsFailure(t *testing.T) { + oldServedNrCells := generateServedNrCells("whatever1", "whatever2") context := controllerUpdateGnbTestContext{ + removeServedNrCellsParams: &removeServedNrCellsParams{ + err: nil, + servedNrCells: oldServedNrCells, + }, + updateGnbCellsParams: &updateGnbCellsParams{ + err: common.NewInternalError(errors.New("#writer.UpdateGnbCells - Internal Error")), + }, getNodebInfoResult: &getNodebInfoResult{ - nodebInfo: nil, - rnibError: common.NewInternalError(errors.New("#reader.GetNodeb - Internal Error")), + nodebInfo: &entities.NodebInfo{ + RanName: RanName, + ConnectionStatus: entities.ConnectionStatus_CONNECTED, + AssociatedE2TInstanceAddress: AssociatedE2TInstanceAddress, + Configuration: &entities.NodebInfo_Gnb{Gnb: &entities.Gnb{ServedNrCells: oldServedNrCells}}, + }, + rnibError: nil, }, requestBody: map[string]interface{}{ "servedNrCells": []interface{}{ map[string]interface{}{ "servedNrCellInformation": buildServedNrCellInformation(""), + "nrNeighbourInfos": []interface{}{ + buildNrNeighbourInformation(""), + }, }, }, }, @@ -466,10 +691,200 @@ func TestControllerUpdateGnbValidServedNrCellInformationGetNodebInternalError(t controllerUpdateGnbTestExecuter(t, &context) } +func TestControllerUpdateGnbSuccess(t *testing.T) { + context := controllerUpdateGnbTestContext{ + updateGnbCellsParams: &updateGnbCellsParams{ + err: nil, + }, + getNodebInfoResult: &getNodebInfoResult{ + nodebInfo: &entities.NodebInfo{ + RanName: RanName, + ConnectionStatus: entities.ConnectionStatus_CONNECTED, + AssociatedE2TInstanceAddress: AssociatedE2TInstanceAddress, + Configuration: &entities.NodebInfo_Gnb{Gnb: &entities.Gnb{}}, + }, + rnibError: nil, + }, + requestBody: map[string]interface{}{ + "servedNrCells": []interface{}{ + map[string]interface{}{ + "servedNrCellInformation": buildServedNrCellInformation(""), + "nrNeighbourInfos": []interface{}{ + buildNrNeighbourInformation(""), + }, + }, + }, + }, + expectedStatusCode: http.StatusOK, + expectedJsonResponse: "{\"ranName\":\"test\",\"connectionStatus\":\"CONNECTED\",\"gnb\":{\"servedNrCells\":[{\"servedNrCellInformation\":{\"nrPci\":1,\"cellId\":\"whatever\",\"servedPlmns\":[\"whatever\"],\"nrMode\":\"FDD\",\"choiceNrMode\":{\"fdd\":{}}},\"nrNeighbourInfos\":[{\"nrPci\":1,\"nrCgi\":\"whatever\",\"nrMode\":\"FDD\",\"choiceNrMode\":{\"tdd\":{}}}]}]},\"associatedE2tInstanceAddress\":\"10.0.2.15:38000\"}", + } + + controllerUpdateGnbTestExecuter(t, &context) +} + +func TestControllerAddEnbGetNodebInternalError(t *testing.T) { + context := controllerAddEnbTestContext{ + getNodebInfoResult: &getNodebInfoResult{ + nodebInfo: nil, + rnibError: common.NewInternalError(errors.New("#reader.GetNodeb - Internal Error")), + }, + requestBody: getAddEnbRequest(""), + expectedStatusCode: http.StatusInternalServerError, + expectedJsonResponse: RnibErrorJson, + } + + controllerAddEnbTestExecuter(t, &context) +} + +func TestControllerAddEnbNodebExistsFailure(t *testing.T) { + context := controllerAddEnbTestContext{ + getNodebInfoResult: &getNodebInfoResult{ + nodebInfo: &entities.NodebInfo{}, + rnibError: nil, + }, + requestBody: getAddEnbRequest(""), + expectedStatusCode: http.StatusBadRequest, + expectedJsonResponse: NodebExistsJson, + } + + controllerAddEnbTestExecuter(t, &context) +} + +func TestControllerAddEnbSaveNodebFailure(t *testing.T) { + context := controllerAddEnbTestContext{ + saveNodebParams: &saveNodebParams{ + err: common.NewInternalError(errors.New("#reader.SaveeNodeb - Internal Error")), + }, + getNodebInfoResult: &getNodebInfoResult{ + nodebInfo: nil, + rnibError: common.NewResourceNotFoundError("#reader.GetNodeb - Not found Error"), + }, + requestBody: getAddEnbRequest(""), + expectedStatusCode: http.StatusInternalServerError, + expectedJsonResponse: RnibErrorJson, + } + + controllerAddEnbTestExecuter(t, &context) +} + +func TestControllerAddEnbMissingRequiredRequestProps(t *testing.T) { + + for _, v := range AddEnbRequestRequiredFields { + context := controllerAddEnbTestContext{ + requestBody: getAddEnbRequest(v), + expectedStatusCode: http.StatusBadRequest, + expectedJsonResponse: ValidationFailureJson, + } + + controllerAddEnbTestExecuter(t, &context) + } +} + +func TestControllerAddEnbInvalidRequest(t *testing.T) { + controller, _, _, _, _ := setupControllerTest(t) + writer := httptest.NewRecorder() + + // Invalid json: attribute name without quotes (should be "cause":). + invalidJson := strings.NewReader("{ranName:\"whatever\"") + req, _ := http.NewRequest(http.MethodPost, AddEnbUrl, invalidJson) + + controller.AddEnb(writer, req) + assert.Equal(t, http.StatusBadRequest, writer.Result().StatusCode) + bodyBytes, _ := ioutil.ReadAll(writer.Body) + assert.Equal(t, CorruptedJson, string(bodyBytes)) + +} + +func TestControllerAddEnbMissingRequiredGlobalNbIdProps(t *testing.T) { + + r := getAddEnbRequest("") + + for _, v := range GlobalIdRequiredFields { + r["globalNbId"] = buildGlobalNbId(v) + + context := controllerAddEnbTestContext{ + requestBody: r, + expectedStatusCode: http.StatusBadRequest, + expectedJsonResponse: ValidationFailureJson, + } + + controllerAddEnbTestExecuter(t, &context) + } +} + +func TestControllerAddEnbMissingRequiredEnbProps(t *testing.T) { + + r := getAddEnbRequest("") + + for _, v := range EnbRequiredFields { + r["enb"] = buildEnb(v) + + context := controllerAddEnbTestContext{ + requestBody: r, + expectedStatusCode: http.StatusBadRequest, + expectedJsonResponse: ValidationFailureJson, + } + + controllerAddEnbTestExecuter(t, &context) + } +} + +func TestControllerAddEnbMissingRequiredServedCellProps(t *testing.T) { + + r := getAddEnbRequest("") + + for _, v := range ServedCellRequiredFields { + enb := r["enb"] + + enbMap, _ := enb.(map[string]interface{}) + + enbMap["servedCells"] = []interface{}{ + buildServedCell(v), + } + + context := controllerAddEnbTestContext{ + requestBody: r, + expectedStatusCode: http.StatusBadRequest, + expectedJsonResponse: ValidationFailureJson, + } + + controllerAddEnbTestExecuter(t, &context) + } +} + +func TestControllerAddEnbSuccess(t *testing.T) { + context := controllerAddEnbTestContext{ + saveNodebParams: &saveNodebParams{ + err: nil, + }, + getNodebInfoResult: &getNodebInfoResult{ + nodebInfo: nil, + rnibError: common.NewResourceNotFoundError("#reader.GetNodeb - Not found Error"), + }, + requestBody: map[string]interface{}{ + "ranName": RanName, + "globalNbId": map[string]interface{}{ + "plmnId": "whatever", + "nbId": "whatever2", + }, + "enb": map[string]interface{}{ + "enbType": 1, + "servedCells": []interface{}{ + buildServedCell(""), + }, + }, + }, + expectedStatusCode: http.StatusCreated, + expectedJsonResponse: "{\"ranName\":\"test\",\"connectionStatus\":\"DISCONNECTED\",\"globalNbId\":{\"plmnId\":\"whatever\",\"nbId\":\"whatever2\"},\"nodeType\":\"ENB\",\"enb\":{\"enbType\":\"MACRO_ENB\",\"servedCells\":[{\"pci\":1,\"cellId\":\"whatever\",\"tac\":\"whatever3\",\"broadcastPlmns\":[\"whatever\"],\"choiceEutraMode\":{\"fdd\":{}},\"eutraMode\":\"FDD\"}]}}", + } + + controllerAddEnbTestExecuter(t, &context) +} + func getJsonRequestAsBuffer(requestJson map[string]interface{}) *bytes.Buffer { b := new(bytes.Buffer) _ = json.NewEncoder(b).Encode(requestJson) - return b; + return b } func TestControllerGetNodebSuccess(t *testing.T) { @@ -565,7 +980,7 @@ func TestHeaderValidationFailed(t *testing.T) { header := &http.Header{} - controller.handleRequest(writer, header, httpmsghandlerprovider.ShutdownRequest, nil, true) + controller.handleRequest(writer, header, httpmsghandlerprovider.ShutdownRequest, nil, true, 0) var errorResponse = parseJsonRequest(t, writer.Body) err := e2managererrors.NewHeaderValidationError() @@ -657,7 +1072,7 @@ func parseJsonRequest(t *testing.T, r io.Reader) models.ErrorResponse { if err != nil { t.Errorf("Error cannot deserialize json request") } - json.Unmarshal(body, &errorResponse) + _ = json.Unmarshal(body, &errorResponse) return errorResponse } @@ -676,7 +1091,8 @@ func TestX2ResetHandleSuccessfulRequestedCause(t *testing.T) { ranName := "test1" payload := []byte{0x00, 0x07, 0x00, 0x08, 0x00, 0x00, 0x01, 0x00, 0x05, 0x40, 0x01, 0x40} var xAction []byte - msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_RESET, len(payload), ranName, &payload, &xAction) + var msgSrc unsafe.Pointer + msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_RESET, len(payload), ranName, &payload, &xAction, msgSrc) rmrMessengerMock.On("SendMsg", msg, mock.Anything).Return(msg, nil) writer := httptest.NewRecorder() @@ -702,7 +1118,8 @@ func TestX2ResetHandleSuccessfulRequestedDefault(t *testing.T) { // o&m intervention payload := []byte{0x00, 0x07, 0x00, 0x08, 0x00, 0x00, 0x01, 0x00, 0x05, 0x40, 0x01, 0x64} var xAction []byte - msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_RESET, len(payload), ranName, &payload, &xAction) + var msgSrc unsafe.Pointer + msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_RESET, len(payload), ranName, &payload, &xAction, msgSrc) rmrMessengerMock.On("SendMsg", msg, true).Return(msg, nil) writer := httptest.NewRecorder() @@ -712,12 +1129,13 @@ func TestX2ResetHandleSuccessfulRequestedDefault(t *testing.T) { // no body b := new(bytes.Buffer) + data4Req := map[string]interface{}{} + _ = json.NewEncoder(b).Encode(data4Req) req, _ := http.NewRequest("PUT", "https://localhost:3800/nodeb-reset", b) req = mux.SetURLVars(req, map[string]string{"ranName": ranName}) controller.X2Reset(writer, req) assert.Equal(t, http.StatusNoContent, writer.Result().StatusCode) - } func TestX2ResetHandleFailureInvalidBody(t *testing.T) {