X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fcontrollers%2Fnodeb_controller_test.go;h=97303204fd91954b4a7cf945cbf8f30e7bd7c1f8;hb=1bf79dda6f002618a7e00fa95b54914d5a273fa1;hp=7ee44d74edad16de7f230a501fbe0f13ba6e942c;hpb=5830d4db63151dd466533673fd76d842302f0034;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/controllers/nodeb_controller_test.go b/E2Manager/controllers/nodeb_controller_test.go index 7ee44d7..9730320 100644 --- a/E2Manager/controllers/nodeb_controller_test.go +++ b/E2Manager/controllers/nodeb_controller_test.go @@ -67,6 +67,7 @@ var ( ServedNrCellInformationRequiredFields = []string{"cellId", "choiceNrMode", "nrMode", "servedPlmns"} NrNeighbourInformationRequiredFields = []string{"nrCgi", "choiceNrMode", "nrMode"} AddEnbRequestRequiredFields = []string{"ranName", "enb", "globalNbId"} + UpdateEnbRequestRequiredFields = []string{"enb"} GlobalIdRequiredFields = []string{"plmnId", "nbId"} EnbRequiredFields = []string{"enbType", "servedCells"} ServedCellRequiredFields = []string{"broadcastPlmns", "cellId", "choiceEutraMode", "eutraMode", "tac"} @@ -96,10 +97,21 @@ type updateGnbCellsParams struct { err error } +type updateEnbCellsParams struct { + err error +} + type saveNodebParams struct { - nodebInfo *entities.NodebInfo - nbIdentity *entities.NbIdentity - err error + err error +} + +type addNbIdentityParams struct { + err error +} + +type removeServedCellsParams struct { + servedCellInfo []*entities.ServedCellInfo + err error } type removeServedNrCellsParams struct { @@ -107,6 +119,15 @@ type removeServedNrCellsParams struct { err error } +type controllerUpdateEnbTestContext struct { + getNodebInfoResult *getNodebInfoResult + removeServedCellsParams *removeServedCellsParams + updateEnbCellsParams *updateEnbCellsParams + requestBody map[string]interface{} + expectedStatusCode int + expectedJsonResponse string +} + type controllerUpdateGnbTestContext struct { getNodebInfoResult *getNodebInfoResult removeServedNrCellsParams *removeServedNrCellsParams @@ -119,11 +140,18 @@ type controllerUpdateGnbTestContext struct { type controllerAddEnbTestContext struct { getNodebInfoResult *getNodebInfoResult saveNodebParams *saveNodebParams + addNbIdentityParams *addNbIdentityParams requestBody map[string]interface{} expectedStatusCode int expectedJsonResponse string } +type controllerDeleteEnbTestContext struct { + getNodebInfoResult *getNodebInfoResult + expectedStatusCode int + expectedJsonResponse string +} + func generateServedNrCells(cellIds ...string) []*entities.ServedNRCell { servedNrCells := []*entities.ServedNRCell{} @@ -145,6 +173,24 @@ func generateServedNrCells(cellIds ...string) []*entities.ServedNRCell { return servedNrCells } +func generateServedCells(cellIds ...string) []*entities.ServedCellInfo { + + var servedCells []*entities.ServedCellInfo + + for i, v := range cellIds { + servedCells = append(servedCells, &entities.ServedCellInfo{ + CellId: v, + ChoiceEutraMode: &entities.ChoiceEUTRAMode{ + Fdd: &entities.FddInfo{}, + }, + Pci: uint32(i + 1), + BroadcastPlmns: []string{"whatever"}, + }) + } + + return servedCells +} + func buildNrNeighbourInformation(propToOmit string) map[string]interface{} { ret := map[string]interface{}{ "nrCgi": "whatever", @@ -203,6 +249,18 @@ func buildServedCell(propToOmit string) map[string]interface{} { return ret } +func getUpdateEnbRequest(propToOmit string) map[string]interface{} { + ret := map[string]interface{}{ + "enb": buildEnb(propToOmit), + } + + if len(propToOmit) != 0 { + delete(ret, propToOmit) + } + + return ret +} + func getAddEnbRequest(propToOmit string) map[string]interface{} { ret := map[string]interface{}{ "ranName": RanName, @@ -244,7 +302,7 @@ func buildGlobalNbId(propToOmit string) map[string]interface{} { return ret } -func setupControllerTest(t *testing.T) (*NodebController, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.RmrMessengerMock, *mocks.E2TInstancesManagerMock) { +func setupControllerTest(t *testing.T) (*NodebController, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.RmrMessengerMock, *mocks.E2TInstancesManagerMock, managers.RanListManager) { log := initLog(t) config := configuration.ParseConfiguration() @@ -258,19 +316,50 @@ func setupControllerTest(t *testing.T) (*NodebController, *mocks.RnibReaderMock, e2tInstancesManager := &mocks.E2TInstancesManagerMock{} httpClientMock := &mocks.HttpClientMock{} rmClient := clients.NewRoutingManagerClient(log, config, httpClientMock) - ranListManager := &mocks.RanListManagerMock{} + ranListManager := managers.NewRanListManager(log, rnibDataService) ranAlarmService := &mocks.RanAlarmServiceMock{} ranConnectStatusChangeManager := managers.NewRanConnectStatusChangeManager(log, rnibDataService, ranListManager, ranAlarmService) nodebValidator := managers.NewNodebValidator() updateEnbManager := managers.NewUpdateEnbManager(log, rnibDataService, nodebValidator) - handlerProvider := httpmsghandlerprovider.NewIncomingRequestHandlerProvider(log, rmrSender, config, rnibDataService, e2tInstancesManager, rmClient, ranConnectStatusChangeManager, nodebValidator, updateEnbManager) + handlerProvider := httpmsghandlerprovider.NewIncomingRequestHandlerProvider(log, rmrSender, config, rnibDataService, e2tInstancesManager, rmClient, ranConnectStatusChangeManager, nodebValidator, updateEnbManager, ranListManager) controller := NewNodebController(log, handlerProvider) - return controller, readerMock, writerMock, rmrMessengerMock, e2tInstancesManager + return controller, readerMock, writerMock, rmrMessengerMock, e2tInstancesManager, ranListManager +} + +func setupDeleteEnbControllerTest(t *testing.T, preAddNbIdentity bool) (*NodebController, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *entities.NbIdentity) { + log := initLog(t) + config := configuration.ParseConfiguration() + + rmrMessengerMock := &mocks.RmrMessengerMock{} + readerMock := &mocks.RnibReaderMock{} + + writerMock := &mocks.RnibWriterMock{} + + rnibDataService := services.NewRnibDataService(log, config, readerMock, writerMock) + rmrSender := getRmrSender(rmrMessengerMock, log) + e2tInstancesManager := &mocks.E2TInstancesManagerMock{} + httpClientMock := &mocks.HttpClientMock{} + rmClient := clients.NewRoutingManagerClient(log, config, httpClientMock) + ranListManager := managers.NewRanListManager(log, rnibDataService) + var nbIdentity *entities.NbIdentity + if preAddNbIdentity { + nbIdentity = &entities.NbIdentity{InventoryName: RanName, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, GlobalNbId: &entities.GlobalNbId{PlmnId: "plmnId1", NbId: "nbId1"}} + writerMock.On("AddNbIdentity", entities.Node_ENB, nbIdentity).Return(nil) + ranListManager.AddNbIdentity(entities.Node_ENB, nbIdentity) + } + ranAlarmService := &mocks.RanAlarmServiceMock{} + ranConnectStatusChangeManager := managers.NewRanConnectStatusChangeManager(log, rnibDataService, ranListManager, ranAlarmService) + nodebValidator := managers.NewNodebValidator() + updateEnbManager := managers.NewUpdateEnbManager(log, rnibDataService, nodebValidator) + + handlerProvider := httpmsghandlerprovider.NewIncomingRequestHandlerProvider(log, rmrSender, config, rnibDataService, e2tInstancesManager, rmClient, ranConnectStatusChangeManager, nodebValidator, updateEnbManager, ranListManager) + controller := NewNodebController(log, handlerProvider) + return controller, readerMock, writerMock, nbIdentity } func TestShutdownHandlerRnibError(t *testing.T) { - controller, _, _, _, e2tInstancesManagerMock := setupControllerTest(t) + controller, _, _, _, e2tInstancesManagerMock, _ := setupControllerTest(t) e2tInstancesManagerMock.On("GetE2TAddresses").Return([]string{}, e2managererrors.NewRnibDbError()) writer := httptest.NewRecorder() @@ -284,7 +373,7 @@ func TestShutdownHandlerRnibError(t *testing.T) { } func TestSetGeneralConfigurationHandlerRnibError(t *testing.T) { - controller, readerMock, _, _, _ := setupControllerTest(t) + controller, readerMock, _, _, _ , _:= setupControllerTest(t) configuration := &entities.GeneralConfiguration{} readerMock.On("GetGeneralConfiguration").Return(configuration, e2managererrors.NewRnibDbError()) @@ -302,7 +391,7 @@ func TestSetGeneralConfigurationHandlerRnibError(t *testing.T) { } func TestSetGeneralConfigurationInvalidJson(t *testing.T) { - controller, _, _, _, _ := setupControllerTest(t) + controller, _, _, _, _, _ := setupControllerTest(t) writer := httptest.NewRecorder() @@ -317,7 +406,7 @@ func TestSetGeneralConfigurationInvalidJson(t *testing.T) { } func controllerGetNodebTestExecuter(t *testing.T, context *controllerGetNodebTestContext) { - controller, readerMock, _, _, _ := setupControllerTest(t) + controller, readerMock, _, _, _, _ := setupControllerTest(t) writer := httptest.NewRecorder() readerMock.On("GetNodeb", context.ranName).Return(context.nodebInfo, context.rnibError) req, _ := http.NewRequest(http.MethodGet, "/nodeb", nil) @@ -329,16 +418,39 @@ func controllerGetNodebTestExecuter(t *testing.T, context *controllerGetNodebTes } func controllerGetNodebIdListTestExecuter(t *testing.T, context *controllerGetNodebIdListTestContext) { - controller, readerMock, _, _, _ := setupControllerTest(t) + controller, readerMock, _, _, _, ranListManager := setupControllerTest(t) writer := httptest.NewRecorder() readerMock.On("GetListNodebIds").Return(context.nodebIdList, context.rnibError) - req, _ := http.NewRequest(http.MethodGet, "/nodeb/ids", nil) + + err := ranListManager.InitNbIdentityMap() + if err != nil { + t.Errorf("Error cannot init identity") + } + + req, _ := http.NewRequest(http.MethodGet, "/nodeb/states", nil) controller.GetNodebIdList(writer, req) assert.Equal(t, context.expectedStatusCode, writer.Result().StatusCode) bodyBytes, _ := ioutil.ReadAll(writer.Body) assert.Equal(t, context.expectedJsonResponse, string(bodyBytes)) } +func activateControllerUpdateEnbMocks(context *controllerUpdateEnbTestContext, readerMock *mocks.RnibReaderMock, writerMock *mocks.RnibWriterMock, updateEnbRequest *models.UpdateEnbRequest) { + if context.getNodebInfoResult != nil { + readerMock.On("GetNodeb", RanName).Return(context.getNodebInfoResult.nodebInfo, context.getNodebInfoResult.rnibError) + } + + if context.removeServedCellsParams != nil { + writerMock.On("RemoveServedCells", RanName, context.removeServedCellsParams.servedCellInfo).Return(context.removeServedCellsParams.err) + } + + if context.updateEnbCellsParams != nil { + updatedNodebInfo := *context.getNodebInfoResult.nodebInfo + updatedNodebInfo.Configuration = &entities.NodebInfo_Enb{Enb: updateEnbRequest.Enb} + + writerMock.On("UpdateEnb", &updatedNodebInfo, updateEnbRequest.Enb.ServedCells).Return(context.updateEnbCellsParams.err) + } +} + 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) @@ -366,6 +478,14 @@ func assertControllerUpdateGnb(t *testing.T, context *controllerUpdateGnbTestCon writerMock.AssertExpectations(t) } +func assertControllerUpdateEnb(t *testing.T, context *controllerUpdateEnbTestContext, 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) @@ -374,6 +494,23 @@ func assertControllerAddEnb(t *testing.T, context *controllerAddEnbTestContext, writerMock.AssertExpectations(t) } +func assertControllerDeleteEnb(t *testing.T, context *controllerDeleteEnbTestContext, 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 buildUpdateEnbRequest(context *controllerUpdateEnbTestContext) *http.Request { + updateEnbUrl := fmt.Sprintf("/nodeb/enb/%s", RanName) + requestBody := getJsonRequestAsBuffer(context.requestBody) + req, _ := http.NewRequest(http.MethodPut, updateEnbUrl, requestBody) + req.Header.Set("Content-Type", "application/json") + req = mux.SetURLVars(req, map[string]string{"ranName": RanName}) + return req +} + func buildUpdateGnbRequest(context *controllerUpdateGnbTestContext) *http.Request { updateGnbUrl := fmt.Sprintf("/nodeb/%s/update", RanName) requestBody := getJsonRequestAsBuffer(context.requestBody) @@ -390,8 +527,27 @@ func buildAddEnbRequest(context *controllerAddEnbTestContext) *http.Request { return req } +func controllerUpdateEnbTestExecuter(t *testing.T, context *controllerUpdateEnbTestContext) { + controller, readerMock, writerMock, _, _, _ := setupControllerTest(t) + writer := httptest.NewRecorder() + + r := buildUpdateEnbRequest(context) + body, _ := ioutil.ReadAll(io.LimitReader(r.Body, LimitRequest)) + + updateEnbRequest := models.UpdateEnbRequest{} + _ = json.Unmarshal(body, &updateEnbRequest) + + activateControllerUpdateEnbMocks(context, readerMock, writerMock, &updateEnbRequest) + r = buildUpdateEnbRequest(context) + defer r.Body.Close() + + controller.UpdateEnb(writer, r) + + assertControllerUpdateEnb(t, context, writer, readerMock, writerMock) +} + func controllerUpdateGnbTestExecuter(t *testing.T, context *controllerUpdateGnbTestContext) { - controller, readerMock, writerMock, _, _ := setupControllerTest(t) + controller, readerMock, writerMock, _, _, _ := setupControllerTest(t) writer := httptest.NewRecorder() activateControllerUpdateGnbMocks(context, readerMock, writerMock) @@ -416,14 +572,17 @@ func activateControllerAddEnbMocks(context *controllerAddEnbTestContext, readerM ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, } - nbIdentity := entities.NbIdentity{InventoryName: addEnbRequest.RanName, GlobalNbId: addEnbRequest.GlobalNbId} + writerMock.On("SaveNodeb", &nodebInfo).Return(context.saveNodebParams.err) + } - writerMock.On("SaveNodeb", &nbIdentity, &nodebInfo).Return(context.saveNodebParams.err) + if context.addNbIdentityParams != nil { + nbIdentity := entities.NbIdentity{InventoryName: addEnbRequest.RanName, GlobalNbId: addEnbRequest.GlobalNbId, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED} + writerMock.On("AddNbIdentity", entities.Node_ENB, &nbIdentity).Return(context.addNbIdentityParams.err) } } func controllerAddEnbTestExecuter(t *testing.T, context *controllerAddEnbTestContext) { - controller, readerMock, writerMock, _, _ := setupControllerTest(t) + controller, readerMock, writerMock, _, _, _ := setupControllerTest(t) writer := httptest.NewRecorder() r := buildAddEnbRequest(context) body, _ := ioutil.ReadAll(io.LimitReader(r.Body, LimitRequest)) @@ -438,6 +597,23 @@ func controllerAddEnbTestExecuter(t *testing.T, context *controllerAddEnbTestCon assertControllerAddEnb(t, context, writer, readerMock, writerMock) } +func controllerDeleteEnbTestExecuter(t *testing.T, context *controllerDeleteEnbTestContext, preAddNbIdentity bool) { + controller, readerMock, writerMock, nbIdentity := setupDeleteEnbControllerTest(t, preAddNbIdentity) + readerMock.On("GetNodeb", RanName).Return(context.getNodebInfoResult.nodebInfo, context.getNodebInfoResult.rnibError) + if context.getNodebInfoResult.rnibError == nil && context.getNodebInfoResult.nodebInfo.GetNodeType() == entities.Node_ENB { + writerMock.On("RemoveEnb", context.getNodebInfoResult.nodebInfo).Return(nil) + if preAddNbIdentity { + writerMock.On("RemoveNbIdentity", entities.Node_ENB, nbIdentity).Return(nil) + } + } + writer := httptest.NewRecorder() + r, _ := http.NewRequest(http.MethodDelete, AddEnbUrl+"/"+RanName, nil) + r.Header.Set("Content-Type", "application/json") + r = mux.SetURLVars(r, map[string]string{"ranName": RanName}) + controller.DeleteEnb(writer, r) + assertControllerDeleteEnb(t, context, writer, readerMock, writerMock) +} + func TestControllerUpdateGnbEmptyServedNrCells(t *testing.T) { context := controllerUpdateGnbTestContext{ getNodebInfoResult: nil, @@ -724,6 +900,187 @@ func TestControllerUpdateGnbSuccess(t *testing.T) { controllerUpdateGnbTestExecuter(t, &context) } +func TestControllerUpdateEnbInvalidRequest(t *testing.T) { + controller, _, _, _, _, _ := setupControllerTest(t) + + writer := httptest.NewRecorder() + invalidJson := strings.NewReader("{enb:\"whatever\"") + + updateEnbUrl := fmt.Sprintf("/nodeb/enb/%s", RanName) + req, _ := http.NewRequest(http.MethodPut, updateEnbUrl, invalidJson) + req.Header.Set("Content-Type", "application/json") + req = mux.SetURLVars(req, map[string]string{"ranName": RanName}) + + controller.UpdateEnb(writer, req) + + assert.Equal(t, http.StatusBadRequest, writer.Result().StatusCode) + bodyBytes, _ := ioutil.ReadAll(writer.Body) + assert.Equal(t, CorruptedJson, string(bodyBytes)) +} + +func TestControllerUpdateEnbEmptyEnbType(t *testing.T) { + context := controllerUpdateEnbTestContext{ + getNodebInfoResult: nil, + requestBody: getUpdateEnbRequest(EnbRequiredFields[0]), + expectedStatusCode: http.StatusBadRequest, + expectedJsonResponse: ValidationFailureJson, + } + + controllerUpdateEnbTestExecuter(t, &context) +} + +func TestControllerUpdateEnbEmptyServedCells(t *testing.T) { + context := controllerUpdateEnbTestContext{ + getNodebInfoResult: nil, + requestBody: getUpdateEnbRequest(EnbRequiredFields[1]), + expectedStatusCode: http.StatusBadRequest, + expectedJsonResponse: ValidationFailureJson, + } + + controllerUpdateEnbTestExecuter(t, &context) +} + +func TestControllerUpdateEnbMissingEnb(t *testing.T) { + context := controllerUpdateEnbTestContext{ + getNodebInfoResult: nil, + requestBody: getUpdateEnbRequest(UpdateEnbRequestRequiredFields[0]), + expectedStatusCode: http.StatusBadRequest, + expectedJsonResponse: ValidationFailureJson, + } + + controllerUpdateEnbTestExecuter(t, &context) +} + +func TestControllerUpdateEnbValidServedCellsGetNodebNotFound(t *testing.T) { + context := controllerUpdateEnbTestContext{ + getNodebInfoResult: &getNodebInfoResult{ + nodebInfo: nil, + rnibError: common.NewResourceNotFoundError("#reader.GetNodeb - Not found Error"), + }, + requestBody: getUpdateEnbRequest(""), + expectedStatusCode: http.StatusNotFound, + expectedJsonResponse: ResourceNotFoundJson, + } + + controllerUpdateEnbTestExecuter(t, &context) +} + +func TestControllerUpdateEnbValidServedCellsGetNodebInternalError(t *testing.T) { + context := controllerUpdateEnbTestContext{ + getNodebInfoResult: &getNodebInfoResult{ + nodebInfo: nil, + rnibError: common.NewInternalError(errors.New("#reader.GetNodeb - Internal Error")), + }, + requestBody: getUpdateEnbRequest(""), + expectedStatusCode: http.StatusInternalServerError, + expectedJsonResponse: RnibErrorJson, + } + + controllerUpdateEnbTestExecuter(t, &context) +} + +func TestControllerUpdateEnbGetNodebSuccessGnbTypeFailure(t *testing.T) { + oldServedCells := generateServedCells("whatever1", "whatever2") + context := controllerUpdateEnbTestContext{ + getNodebInfoResult: &getNodebInfoResult{ + nodebInfo: &entities.NodebInfo{ + RanName: RanName, + ConnectionStatus: entities.ConnectionStatus_CONNECTED, + AssociatedE2TInstanceAddress: AssociatedE2TInstanceAddress, + NodeType: entities.Node_GNB, + Configuration: &entities.NodebInfo_Enb{Enb: &entities.Enb{ServedCells: oldServedCells}}, + }, + rnibError: nil, + }, + requestBody: getUpdateEnbRequest(""), + expectedStatusCode: http.StatusBadRequest, + expectedJsonResponse: ValidationFailureJson, + } + + controllerUpdateEnbTestExecuter(t, &context) +} + +func TestControllerUpdateEnbGetNodebSuccessRemoveServedCellsFailure(t *testing.T) { + oldServedCells := generateServedCells("whatever1", "whatever2") + context := controllerUpdateEnbTestContext{ + removeServedCellsParams: &removeServedCellsParams{ + err: common.NewInternalError(errors.New("#writer.RemoveServedCells - Internal Error")), + servedCellInfo: oldServedCells, + }, + getNodebInfoResult: &getNodebInfoResult{ + nodebInfo: &entities.NodebInfo{ + RanName: RanName, + ConnectionStatus: entities.ConnectionStatus_CONNECTED, + AssociatedE2TInstanceAddress: AssociatedE2TInstanceAddress, + NodeType: entities.Node_ENB, + Configuration: &entities.NodebInfo_Enb{Enb: &entities.Enb{ServedCells: oldServedCells}}, + }, + rnibError: nil, + }, + requestBody: getUpdateEnbRequest(""), + expectedStatusCode: http.StatusInternalServerError, + expectedJsonResponse: RnibErrorJson, + } + + controllerUpdateEnbTestExecuter(t, &context) +} + +func TestControllerUpdateEnbGetNodebSuccessUpdateEnbFailure(t *testing.T) { + oldServedCells := generateServedCells("whatever1", "whatever2") + context := controllerUpdateEnbTestContext{ + removeServedCellsParams: &removeServedCellsParams{ + err: nil, + servedCellInfo: oldServedCells, + }, + updateEnbCellsParams: &updateEnbCellsParams{ + err: common.NewInternalError(errors.New("#writer.UpdateEnb - Internal Error")), + }, + getNodebInfoResult: &getNodebInfoResult{ + nodebInfo: &entities.NodebInfo{ + RanName: RanName, + ConnectionStatus: entities.ConnectionStatus_CONNECTED, + AssociatedE2TInstanceAddress: AssociatedE2TInstanceAddress, + NodeType: entities.Node_ENB, + Configuration: &entities.NodebInfo_Enb{Enb: &entities.Enb{ServedCells: oldServedCells, EnbType: entities.EnbType_MACRO_ENB}}, + }, + rnibError: nil, + }, + requestBody: getUpdateEnbRequest(""), + expectedStatusCode: http.StatusInternalServerError, + expectedJsonResponse: RnibErrorJson, + } + + controllerUpdateEnbTestExecuter(t, &context) +} + +func TestControllerUpdateEnbSuccess(t *testing.T) { + oldServedCells := generateServedCells("whatever1", "whatever2") + context := controllerUpdateEnbTestContext{ + removeServedCellsParams: &removeServedCellsParams{ + err: nil, + servedCellInfo: oldServedCells, + }, + updateEnbCellsParams: &updateEnbCellsParams{ + err: nil, + }, + getNodebInfoResult: &getNodebInfoResult{ + nodebInfo: &entities.NodebInfo{ + RanName: RanName, + ConnectionStatus: entities.ConnectionStatus_CONNECTED, + AssociatedE2TInstanceAddress: AssociatedE2TInstanceAddress, + NodeType: entities.Node_ENB, + Configuration: &entities.NodebInfo_Enb{Enb: &entities.Enb{ServedCells: oldServedCells, EnbType: entities.EnbType_MACRO_ENB}}, + }, + rnibError: nil, + }, + requestBody: getUpdateEnbRequest(""), + expectedStatusCode: http.StatusOK, + expectedJsonResponse: "{\"ranName\":\"test\",\"connectionStatus\":\"CONNECTED\",\"nodeType\":\"ENB\",\"enb\":{\"enbType\":\"MACRO_ENB\",\"servedCells\":[{\"pci\":1,\"cellId\":\"whatever\",\"tac\":\"whatever3\",\"broadcastPlmns\":[\"whatever\"],\"choiceEutraMode\":{\"fdd\":{}},\"eutraMode\":\"FDD\"}]},\"associatedE2tInstanceAddress\":\"10.0.2.15:38000\"}", + } + + controllerUpdateEnbTestExecuter(t, &context) +} + func TestControllerAddEnbGetNodebInternalError(t *testing.T) { context := controllerAddEnbTestContext{ getNodebInfoResult: &getNodebInfoResult{ @@ -769,6 +1126,26 @@ func TestControllerAddEnbSaveNodebFailure(t *testing.T) { controllerAddEnbTestExecuter(t, &context) } +func TestControllerAddEnbAddNbIdentityFailure(t *testing.T) { + context := controllerAddEnbTestContext{ + saveNodebParams: &saveNodebParams{ + err: nil, + }, + addNbIdentityParams: &addNbIdentityParams{ + err: common.NewInternalError(errors.New("#writer.addNbIdentity - 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 { @@ -783,7 +1160,7 @@ func TestControllerAddEnbMissingRequiredRequestProps(t *testing.T) { } func TestControllerAddEnbInvalidRequest(t *testing.T) { - controller, _, _, _, _ := setupControllerTest(t) + controller, _, _, _, _, _ := setupControllerTest(t) writer := httptest.NewRecorder() // Invalid json: attribute name without quotes (should be "cause":). @@ -831,6 +1208,29 @@ func TestControllerAddEnbMissingRequiredEnbProps(t *testing.T) { } } +func TestControllerUpdateEnbMissingRequiredServedCellProps(t *testing.T) { + + r := getUpdateEnbRequest("") + + for _, v := range ServedCellRequiredFields { + enb := r["enb"] + + enbMap, _ := enb.(map[string]interface{}) + + enbMap["servedCells"] = []interface{}{ + buildServedCell(v), + } + + context := controllerUpdateEnbTestContext{ + requestBody: r, + expectedStatusCode: http.StatusBadRequest, + expectedJsonResponse: ValidationFailureJson, + } + + controllerUpdateEnbTestExecuter(t, &context) + } +} + func TestControllerAddEnbMissingRequiredServedCellProps(t *testing.T) { r := getAddEnbRequest("") @@ -859,23 +1259,14 @@ func TestControllerAddEnbSuccess(t *testing.T) { saveNodebParams: &saveNodebParams{ err: nil, }, + addNbIdentityParams: &addNbIdentityParams{ + 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(""), - }, - }, - }, + requestBody: getAddEnbRequest(""), 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\"}]}}", } @@ -883,6 +1274,57 @@ func TestControllerAddEnbSuccess(t *testing.T) { controllerAddEnbTestExecuter(t, &context) } +func TestControllerDeleteEnbGetNodebInternalError(t *testing.T) { + context := controllerDeleteEnbTestContext{ + getNodebInfoResult: &getNodebInfoResult{ + nodebInfo: nil, + rnibError: common.NewInternalError(errors.New("#reader.GetNodeb - Internal Error")), + }, + expectedStatusCode: http.StatusInternalServerError, + expectedJsonResponse: RnibErrorJson, + } + + controllerDeleteEnbTestExecuter(t, &context, false) +} + +func TestControllerDeleteEnbNodebNotExistsFailure(t *testing.T) { + context := controllerDeleteEnbTestContext{ + getNodebInfoResult: &getNodebInfoResult{ + nodebInfo: nil, + rnibError: common.NewResourceNotFoundError("#reader.GetNodeb - Not found"), + }, + expectedStatusCode: http.StatusNotFound, + expectedJsonResponse: ResourceNotFoundJson, + } + + controllerDeleteEnbTestExecuter(t, &context, false) +} + +func TestControllerDeleteEnbNodebNotEnb(t *testing.T) { + context := controllerDeleteEnbTestContext{ + getNodebInfoResult: &getNodebInfoResult{ + nodebInfo: &entities.NodebInfo{RanName: "ran1", NodeType: entities.Node_GNB, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED}, + rnibError: nil, + }, + expectedStatusCode: http.StatusBadRequest, + expectedJsonResponse: ValidationFailureJson, + } + + controllerDeleteEnbTestExecuter(t, &context, false) +} + +func TestControllerDeleteEnbSuccess(t *testing.T) { + context := controllerDeleteEnbTestContext{ + getNodebInfoResult: &getNodebInfoResult{ + nodebInfo: &entities.NodebInfo{RanName: RanName, NodeType: entities.Node_ENB, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED}, + rnibError: nil, + }, + expectedStatusCode: http.StatusNoContent, + expectedJsonResponse: "", + } + controllerDeleteEnbTestExecuter(t, &context, true) +} + func getJsonRequestAsBuffer(requestJson map[string]interface{}) *bytes.Buffer { b := new(bytes.Buffer) _ = json.NewEncoder(b).Encode(requestJson) @@ -963,20 +1405,8 @@ func TestControllerGetNodebIdListEmptySuccess(t *testing.T) { controllerGetNodebIdListTestExecuter(t, &context) } -func TestControllerGetNodebIdListInternal(t *testing.T) { - var nodebIdList []*entities.NbIdentity - context := controllerGetNodebIdListTestContext{ - nodebIdList: nodebIdList, - rnibError: common.NewInternalError(errors.New("#reader.GetNodeb - Internal Error")), - expectedStatusCode: http.StatusInternalServerError, - expectedJsonResponse: RnibErrorJson, - } - - controllerGetNodebIdListTestExecuter(t, &context) -} - func TestHeaderValidationFailed(t *testing.T) { - controller, _, _, _, _ := setupControllerTest(t) + controller, _, _, _, _, _ := setupControllerTest(t) writer := httptest.NewRecorder() @@ -993,7 +1423,7 @@ func TestHeaderValidationFailed(t *testing.T) { } func TestShutdownStatusNoContent(t *testing.T) { - controller, readerMock, _, _, e2tInstancesManagerMock := setupControllerTest(t) + controller, readerMock, _, _, e2tInstancesManagerMock, _ := setupControllerTest(t) e2tInstancesManagerMock.On("GetE2TAddresses").Return([]string{}, nil) readerMock.On("GetListNodebIds").Return([]*entities.NbIdentity{}, nil) @@ -1004,7 +1434,7 @@ func TestShutdownStatusNoContent(t *testing.T) { } func TestHandleInternalError(t *testing.T) { - controller, _, _, _, _ := setupControllerTest(t) + controller, _, _, _, _, _ := setupControllerTest(t) writer := httptest.NewRecorder() err := e2managererrors.NewInternalError() @@ -1018,7 +1448,7 @@ func TestHandleInternalError(t *testing.T) { } func TestHandleCommandAlreadyInProgressError(t *testing.T) { - controller, _, _, _, _ := setupControllerTest(t) + controller, _, _, _, _, _ := setupControllerTest(t) writer := httptest.NewRecorder() err := e2managererrors.NewCommandAlreadyInProgressError() @@ -1031,7 +1461,7 @@ func TestHandleCommandAlreadyInProgressError(t *testing.T) { } func TestHandleRoutingManagerError(t *testing.T) { - controller, _, _, _, _ := setupControllerTest(t) + controller, _, _, _, _, _ := setupControllerTest(t) writer := httptest.NewRecorder() err := e2managererrors.NewRoutingManagerError() @@ -1044,7 +1474,7 @@ func TestHandleRoutingManagerError(t *testing.T) { } func TestHandleE2TInstanceAbsenceError(t *testing.T) { - controller, _, _, _, _ := setupControllerTest(t) + controller, _, _, _, _, _ := setupControllerTest(t) writer := httptest.NewRecorder() err := e2managererrors.NewE2TInstanceAbsenceError() @@ -1058,7 +1488,7 @@ func TestHandleE2TInstanceAbsenceError(t *testing.T) { } func TestValidateHeaders(t *testing.T) { - controller, _, _, _, _ := setupControllerTest(t) + controller, _, _, _, _, _ := setupControllerTest(t) header := http.Header{} header.Set("Content-Type", "application/json") @@ -1088,7 +1518,7 @@ func initLog(t *testing.T) *logger.Logger { } func TestX2ResetHandleSuccessfulRequestedCause(t *testing.T) { - controller, readerMock, _, rmrMessengerMock, _ := setupControllerTest(t) + controller, readerMock, _, rmrMessengerMock, _, _ := setupControllerTest(t) ranName := "test1" payload := []byte{0x00, 0x07, 0x00, 0x08, 0x00, 0x00, 0x01, 0x00, 0x05, 0x40, 0x01, 0x40} @@ -1114,7 +1544,7 @@ func TestX2ResetHandleSuccessfulRequestedCause(t *testing.T) { } func TestX2ResetHandleSuccessfulRequestedDefault(t *testing.T) { - controller, readerMock, _, rmrMessengerMock, _ := setupControllerTest(t) + controller, readerMock, _, rmrMessengerMock, _, _ := setupControllerTest(t) ranName := "test1" // o&m intervention @@ -1141,7 +1571,7 @@ func TestX2ResetHandleSuccessfulRequestedDefault(t *testing.T) { } func TestX2ResetHandleFailureInvalidBody(t *testing.T) { - controller, _, _, _, _ := setupControllerTest(t) + controller, _, _, _, _, _ := setupControllerTest(t) ranName := "test1" @@ -1158,7 +1588,7 @@ func TestX2ResetHandleFailureInvalidBody(t *testing.T) { } func TestHandleErrorResponse(t *testing.T) { - controller, _, _, _, _ := setupControllerTest(t) + controller, _, _, _, _, _ := setupControllerTest(t) writer := httptest.NewRecorder() controller.handleErrorResponse(e2managererrors.NewRnibDbError(), writer)