}
type saveNodebParams struct {
- nodebInfo *entities.NodebInfo
- nbIdentity *entities.NbIdentity
- err error
+ err error
+}
+
+type addNbIdentityParams struct {
+ err error
}
type removeServedCellsParams struct {
type controllerAddEnbTestContext struct {
getNodebInfoResult *getNodebInfoResult
saveNodebParams *saveNodebParams
+ addNbIdentityParams *addNbIdentityParams
requestBody map[string]interface{}
expectedStatusCode int
expectedJsonResponse string
func getUpdateEnbRequest(propToOmit string) map[string]interface{} {
ret := map[string]interface{}{
- "enb": buildEnb(propToOmit),
+ "enb": buildEnb(propToOmit),
}
if len(propToOmit) != 0 {
return ret
}
-
func getAddEnbRequest(propToOmit string) map[string]interface{} {
ret := map[string]interface{}{
"ranName": RanName,
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()
+
+ 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)
+ 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, rmrMessengerMock, e2tInstancesManager, ranListManager
+}
+
+func setupDeleteEnbControllerTest(t *testing.T, preAddNbIdentity bool) (*NodebController, *mocks.RnibReaderMock, *mocks.RnibWriterMock, *entities.NbIdentity) {
log := initLog(t)
config := configuration.ParseConfiguration()
e2tInstancesManager := &mocks.E2TInstancesManagerMock{}
httpClientMock := &mocks.HttpClientMock{}
rmClient := clients.NewRoutingManagerClient(log, config, httpClientMock)
- ranListManager := &mocks.RanListManagerMock{}
+ 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)
+ 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, nbIdentity
}
func TestShutdownHandlerRnibError(t *testing.T) {
- controller, _, _, _, e2tInstancesManagerMock := setupControllerTest(t)
+ controller, _, _, _, e2tInstancesManagerMock, _ := setupControllerTest(t)
e2tInstancesManagerMock.On("GetE2TAddresses").Return([]string{}, e2managererrors.NewRnibDbError())
writer := httptest.NewRecorder()
}
func TestSetGeneralConfigurationHandlerRnibError(t *testing.T) {
- controller, readerMock, _, _, _ := setupControllerTest(t)
+ controller, readerMock, _, _, _ , _:= setupControllerTest(t)
configuration := &entities.GeneralConfiguration{}
readerMock.On("GetGeneralConfiguration").Return(configuration, e2managererrors.NewRnibDbError())
}
func TestSetGeneralConfigurationInvalidJson(t *testing.T) {
- controller, _, _, _, _ := setupControllerTest(t)
+ controller, _, _, _, _, _ := setupControllerTest(t)
writer := httptest.NewRecorder()
}
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)
}
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) {
+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)
}
}
func controllerUpdateEnbTestExecuter(t *testing.T, context *controllerUpdateEnbTestContext) {
- controller, readerMock, writerMock, _, _ := setupControllerTest(t)
+ controller, readerMock, writerMock, _, _, _ := setupControllerTest(t)
writer := httptest.NewRecorder()
r := buildUpdateEnbRequest(context)
}
func controllerUpdateGnbTestExecuter(t *testing.T, context *controllerUpdateGnbTestContext) {
- controller, readerMock, writerMock, _, _ := setupControllerTest(t)
+ controller, readerMock, writerMock, _, _, _ := setupControllerTest(t)
writer := httptest.NewRecorder()
activateControllerUpdateGnbMocks(context, readerMock, writerMock)
ConnectionStatus: entities.ConnectionStatus_DISCONNECTED,
}
- //nbIdentity := entities.NbIdentity{InventoryName: addEnbRequest.RanName, GlobalNbId: addEnbRequest.GlobalNbId}
writerMock.On("SaveNodeb", &nodebInfo).Return(context.saveNodebParams.err)
- // TODO: add writerMock.On("AddNbIdentity")
+ }
+
+ 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))
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)
}
func TestControllerUpdateEnbInvalidRequest(t *testing.T) {
- controller, _, _, _, _ := setupControllerTest(t)
+ controller, _, _, _, _, _ := setupControllerTest(t)
writer := httptest.NewRecorder()
invalidJson := strings.NewReader("{enb:\"whatever\"")
func TestControllerUpdateEnbEmptyEnbType(t *testing.T) {
context := controllerUpdateEnbTestContext{
- getNodebInfoResult: nil,
- requestBody: getUpdateEnbRequest(EnbRequiredFields[0]),
+ getNodebInfoResult: nil,
+ requestBody: getUpdateEnbRequest(EnbRequiredFields[0]),
expectedStatusCode: http.StatusBadRequest,
expectedJsonResponse: ValidationFailureJson,
}
func TestControllerUpdateEnbEmptyServedCells(t *testing.T) {
context := controllerUpdateEnbTestContext{
- getNodebInfoResult: nil,
- requestBody: getUpdateEnbRequest(EnbRequiredFields[1]),
+ getNodebInfoResult: nil,
+ requestBody: getUpdateEnbRequest(EnbRequiredFields[1]),
expectedStatusCode: http.StatusBadRequest,
expectedJsonResponse: ValidationFailureJson,
}
func TestControllerUpdateEnbMissingEnb(t *testing.T) {
context := controllerUpdateEnbTestContext{
- getNodebInfoResult: nil,
- requestBody: getUpdateEnbRequest(UpdateEnbRequestRequiredFields[0]),
+ getNodebInfoResult: nil,
+ requestBody: getUpdateEnbRequest(UpdateEnbRequestRequiredFields[0]),
expectedStatusCode: http.StatusBadRequest,
expectedJsonResponse: ValidationFailureJson,
}
nodebInfo: nil,
rnibError: common.NewResourceNotFoundError("#reader.GetNodeb - Not found Error"),
},
- requestBody: getUpdateEnbRequest(""),
+ requestBody: getUpdateEnbRequest(""),
expectedStatusCode: http.StatusNotFound,
expectedJsonResponse: ResourceNotFoundJson,
}
nodebInfo: nil,
rnibError: common.NewInternalError(errors.New("#reader.GetNodeb - Internal Error")),
},
- requestBody: getUpdateEnbRequest(""),
+ requestBody: getUpdateEnbRequest(""),
expectedStatusCode: http.StatusInternalServerError,
expectedJsonResponse: RnibErrorJson,
}
},
rnibError: nil,
},
- requestBody: getUpdateEnbRequest(""),
+ requestBody: getUpdateEnbRequest(""),
expectedStatusCode: http.StatusBadRequest,
expectedJsonResponse: ValidationFailureJson,
}
},
rnibError: nil,
},
- requestBody: getUpdateEnbRequest(""),
+ requestBody: getUpdateEnbRequest(""),
expectedStatusCode: http.StatusInternalServerError,
expectedJsonResponse: RnibErrorJson,
}
oldServedCells := generateServedCells("whatever1", "whatever2")
context := controllerUpdateEnbTestContext{
removeServedCellsParams: &removeServedCellsParams{
- err: nil,
+ err: nil,
servedCellInfo: oldServedCells,
},
updateEnbCellsParams: &updateEnbCellsParams{
},
rnibError: nil,
},
- requestBody: getUpdateEnbRequest(""),
+ requestBody: getUpdateEnbRequest(""),
expectedStatusCode: http.StatusInternalServerError,
expectedJsonResponse: RnibErrorJson,
}
oldServedCells := generateServedCells("whatever1", "whatever2")
context := controllerUpdateEnbTestContext{
removeServedCellsParams: &removeServedCellsParams{
- err: nil,
+ err: nil,
servedCellInfo: oldServedCells,
},
updateEnbCellsParams: &updateEnbCellsParams{
},
rnibError: nil,
},
- requestBody: getUpdateEnbRequest(""),
+ 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\"}",
}
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 {
}
func TestControllerAddEnbInvalidRequest(t *testing.T) {
- controller, _, _, _, _ := setupControllerTest(t)
+ controller, _, _, _, _, _ := setupControllerTest(t)
writer := httptest.NewRecorder()
// Invalid json: attribute name without quotes (should be "cause":).
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\"}]}}",
}
expectedJsonResponse: RnibErrorJson,
}
- controllerDeleteEnbTestExecuter(t, &context)
+ controllerDeleteEnbTestExecuter(t, &context, false)
}
func TestControllerDeleteEnbNodebNotExistsFailure(t *testing.T) {
expectedJsonResponse: ResourceNotFoundJson,
}
- controllerDeleteEnbTestExecuter(t, &context)
+ controllerDeleteEnbTestExecuter(t, &context, false)
}
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 {
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()
}
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)
}
func TestHandleInternalError(t *testing.T) {
- controller, _, _, _, _ := setupControllerTest(t)
+ controller, _, _, _, _, _ := setupControllerTest(t)
writer := httptest.NewRecorder()
err := e2managererrors.NewInternalError()
}
func TestHandleCommandAlreadyInProgressError(t *testing.T) {
- controller, _, _, _, _ := setupControllerTest(t)
+ controller, _, _, _, _, _ := setupControllerTest(t)
writer := httptest.NewRecorder()
err := e2managererrors.NewCommandAlreadyInProgressError()
}
func TestHandleRoutingManagerError(t *testing.T) {
- controller, _, _, _, _ := setupControllerTest(t)
+ controller, _, _, _, _, _ := setupControllerTest(t)
writer := httptest.NewRecorder()
err := e2managererrors.NewRoutingManagerError()
}
func TestHandleE2TInstanceAbsenceError(t *testing.T) {
- controller, _, _, _, _ := setupControllerTest(t)
+ controller, _, _, _, _, _ := setupControllerTest(t)
writer := httptest.NewRecorder()
err := e2managererrors.NewE2TInstanceAbsenceError()
}
func TestValidateHeaders(t *testing.T) {
- controller, _, _, _, _ := setupControllerTest(t)
+ controller, _, _, _, _, _ := setupControllerTest(t)
header := http.Header{}
header.Set("Content-Type", "application/json")
}
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}
}
func TestX2ResetHandleSuccessfulRequestedDefault(t *testing.T) {
- controller, readerMock, _, rmrMessengerMock, _ := setupControllerTest(t)
+ controller, readerMock, _, rmrMessengerMock, _, _ := setupControllerTest(t)
ranName := "test1"
// o&m intervention
}
func TestX2ResetHandleFailureInvalidBody(t *testing.T) {
- controller, _, _, _, _ := setupControllerTest(t)
+ controller, _, _, _, _, _ := setupControllerTest(t)
ranName := "test1"
}
func TestHandleErrorResponse(t *testing.T) {
- controller, _, _, _, _ := setupControllerTest(t)
+ controller, _, _, _, _, _ := setupControllerTest(t)
writer := httptest.NewRecorder()
controller.handleErrorResponse(e2managererrors.NewRnibDbError(), writer)
Code Review / ric-plt / e2mgr.git / blobdiff