X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=E2Manager%2Fcontrollers%2Fnodeb_controller_test.go;h=97303204fd91954b4a7cf945cbf8f30e7bd7c1f8;hb=1bf79dda6f002618a7e00fa95b54914d5a273fa1;hp=a8727778605efe4575071d33c8f553a4dc315230;hpb=a269db89a144d3f041eb265c9aa2e7633142429f;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/controllers/nodeb_controller_test.go b/E2Manager/controllers/nodeb_controller_test.go index a872777..9730320 100644 --- a/E2Manager/controllers/nodeb_controller_test.go +++ b/E2Manager/controllers/nodeb_controller_test.go @@ -302,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() @@ -324,11 +324,42 @@ func setupControllerTest(t *testing.T) (*NodebController, *mocks.RnibReaderMock, 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() @@ -342,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()) @@ -360,7 +391,7 @@ func TestSetGeneralConfigurationHandlerRnibError(t *testing.T) { } func TestSetGeneralConfigurationInvalidJson(t *testing.T) { - controller, _, _, _, _ := setupControllerTest(t) + controller, _, _, _, _, _ := setupControllerTest(t) writer := httptest.NewRecorder() @@ -375,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) @@ -387,10 +418,16 @@ 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) @@ -491,7 +528,7 @@ func buildAddEnbRequest(context *controllerAddEnbTestContext) *http.Request { } func controllerUpdateEnbTestExecuter(t *testing.T, context *controllerUpdateEnbTestContext) { - controller, readerMock, writerMock, _, _ := setupControllerTest(t) + controller, readerMock, writerMock, _, _, _ := setupControllerTest(t) writer := httptest.NewRecorder() r := buildUpdateEnbRequest(context) @@ -510,7 +547,7 @@ func controllerUpdateEnbTestExecuter(t *testing.T, context *controllerUpdateEnbT } func controllerUpdateGnbTestExecuter(t *testing.T, context *controllerUpdateGnbTestContext) { - controller, readerMock, writerMock, _, _ := setupControllerTest(t) + controller, readerMock, writerMock, _, _, _ := setupControllerTest(t) writer := httptest.NewRecorder() activateControllerUpdateGnbMocks(context, readerMock, writerMock) @@ -545,7 +582,7 @@ func activateControllerAddEnbMocks(context *controllerAddEnbTestContext, readerM } 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)) @@ -560,11 +597,14 @@ func controllerAddEnbTestExecuter(t *testing.T, context *controllerAddEnbTestCon assertControllerAddEnb(t, context, writer, readerMock, writerMock) } -func controllerDeleteEnbTestExecuter(t *testing.T, context *controllerDeleteEnbTestContext) { - controller, readerMock, writerMock, _, _ := setupControllerTest(t) +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) @@ -861,7 +901,7 @@ func TestControllerUpdateGnbSuccess(t *testing.T) { } func TestControllerUpdateEnbInvalidRequest(t *testing.T) { - controller, _, _, _, _ := setupControllerTest(t) + controller, _, _, _, _, _ := setupControllerTest(t) writer := httptest.NewRecorder() invalidJson := strings.NewReader("{enb:\"whatever\"") @@ -1120,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":). @@ -1244,7 +1284,7 @@ func TestControllerDeleteEnbGetNodebInternalError(t *testing.T) { expectedJsonResponse: RnibErrorJson, } - controllerDeleteEnbTestExecuter(t, &context) + controllerDeleteEnbTestExecuter(t, &context, false) } func TestControllerDeleteEnbNodebNotExistsFailure(t *testing.T) { @@ -1257,7 +1297,7 @@ func TestControllerDeleteEnbNodebNotExistsFailure(t *testing.T) { expectedJsonResponse: ResourceNotFoundJson, } - controllerDeleteEnbTestExecuter(t, &context) + controllerDeleteEnbTestExecuter(t, &context, false) } func TestControllerDeleteEnbNodebNotEnb(t *testing.T) { @@ -1270,19 +1310,19 @@ func TestControllerDeleteEnbNodebNotEnb(t *testing.T) { expectedJsonResponse: ValidationFailureJson, } - controllerDeleteEnbTestExecuter(t, &context) + controllerDeleteEnbTestExecuter(t, &context, false) } func TestControllerDeleteEnbSuccess(t *testing.T) { context := controllerDeleteEnbTestContext{ getNodebInfoResult: &getNodebInfoResult{ - nodebInfo: &entities.NodebInfo{RanName: "ran1", NodeType: entities.Node_ENB, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED}, + nodebInfo: &entities.NodebInfo{RanName: RanName, NodeType: entities.Node_ENB, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED}, rnibError: nil, }, expectedStatusCode: http.StatusNoContent, expectedJsonResponse: "", } - controllerDeleteEnbTestExecuter(t, &context) + controllerDeleteEnbTestExecuter(t, &context, true) } func getJsonRequestAsBuffer(requestJson map[string]interface{}) *bytes.Buffer { @@ -1365,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() @@ -1395,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) @@ -1406,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() @@ -1420,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() @@ -1433,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() @@ -1446,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() @@ -1460,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") @@ -1490,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} @@ -1516,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 @@ -1543,7 +1571,7 @@ func TestX2ResetHandleSuccessfulRequestedDefault(t *testing.T) { } func TestX2ResetHandleFailureInvalidBody(t *testing.T) { - controller, _, _, _, _ := setupControllerTest(t) + controller, _, _, _, _, _ := setupControllerTest(t) ranName := "test1" @@ -1560,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)