err error
}
-type saveNodebParams struct {
+type addEnbParams struct {
err error
}
type controllerAddEnbTestContext struct {
getNodebInfoResult *getNodebInfoResult
- saveNodebParams *saveNodebParams
+ addEnbParams *addEnbParams
addNbIdentityParams *addNbIdentityParams
requestBody map[string]interface{}
expectedStatusCode int
servedNrCells = append(servedNrCells, &entities.ServedNRCell{ServedNrCellInformation: &entities.ServedNRCellInformation{
CellId: v,
ChoiceNrMode: &entities.ServedNRCellInformation_ChoiceNRMode{
- Fdd: &entities.ServedNRCellInformation_ChoiceNRMode_FddInfo{
-
- },
+ Fdd: &entities.ServedNRCellInformation_ChoiceNRMode_FddInfo{},
},
NrMode: entities.Nr_FDD,
NrPci: 5,
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)
+ updateGnbManager := managers.NewUpdateGnbManager(log, rnibDataService, nodebValidator)
+ handlerProvider := httpmsghandlerprovider.NewIncomingRequestHandlerProvider(log, rmrSender, config, rnibDataService, e2tInstancesManager, rmClient, ranConnectStatusChangeManager, nodebValidator, updateEnbManager, updateGnbManager, 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()
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)
+ updateGnbManager := managers.NewUpdateGnbManager(log, rnibDataService, nodebValidator)
- handlerProvider := httpmsghandlerprovider.NewIncomingRequestHandlerProvider(log, rmrSender, config, rnibDataService, e2tInstancesManager, rmClient, ranConnectStatusChangeManager, nodebValidator, updateEnbManager, ranListManager)
+ handlerProvider := httpmsghandlerprovider.NewIncomingRequestHandlerProvider(log, rmrSender, config, rnibDataService, e2tInstancesManager, rmClient, ranConnectStatusChangeManager, nodebValidator, updateEnbManager, updateGnbManager, 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))
+ assert.Contains(t, context.expectedJsonResponse, string(bodyBytes))
}
func activateControllerUpdateEnbMocks(context *controllerUpdateEnbTestContext, readerMock *mocks.RnibReaderMock, writerMock *mocks.RnibWriterMock, updateEnbRequest *models.UpdateEnbRequest) {
if context.updateEnbCellsParams != nil {
updatedNodebInfo := *context.getNodebInfoResult.nodebInfo
+
+ if context.getNodebInfoResult.nodebInfo.SetupFromNetwork {
+ updateEnbRequest.Enb.EnbType = context.getNodebInfoResult.nodebInfo.GetEnb().EnbType
+ }
+
updatedNodebInfo.Configuration = &entities.NodebInfo_Enb{Enb: updateEnbRequest.Enb}
writerMock.On("UpdateEnb", &updatedNodebInfo, updateEnbRequest.Enb.ServedCells).Return(context.updateEnbCellsParams.err)
}
func buildUpdateGnbRequest(context *controllerUpdateGnbTestContext) *http.Request {
- updateGnbUrl := fmt.Sprintf("/nodeb/%s/update", RanName)
+ updateGnbUrl := fmt.Sprintf("/nodeb/gnb/%s", RanName)
requestBody := getJsonRequestAsBuffer(context.requestBody)
req, _ := http.NewRequest(http.MethodPut, updateGnbUrl, requestBody)
req.Header.Set("Content-Type", "application/json")
}
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)
readerMock.On("GetNodeb", RanName).Return(context.getNodebInfoResult.nodebInfo, context.getNodebInfoResult.rnibError)
}
- if context.saveNodebParams != nil {
+ if context.addEnbParams != nil {
nodebInfo := entities.NodebInfo{
RanName: addEnbRequest.RanName,
Ip: addEnbRequest.Ip,
ConnectionStatus: entities.ConnectionStatus_DISCONNECTED,
}
- writerMock.On("SaveNodeb", &nodebInfo).Return(context.saveNodebParams.err)
+ writerMock.On("AddEnb", &nodebInfo).Return(context.addEnbParams.err)
}
if context.addNbIdentityParams != nil {
}
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 {
+ if context.getNodebInfoResult.rnibError == nil && context.getNodebInfoResult.nodebInfo.GetNodeType() == entities.Node_ENB &&
+ !context.getNodebInfoResult.nodebInfo.SetupFromNetwork {
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)
assertControllerDeleteEnb(t, context, writer, readerMock, writerMock)
}
+/*
+UpdateGnb UTs
+*/
+
+// BEGIN - UpdateGnb Validation Failure UTs
+
func TestControllerUpdateGnbEmptyServedNrCells(t *testing.T) {
context := controllerUpdateGnbTestContext{
getNodebInfoResult: nil,
requestBody: map[string]interface{}{
- "servedNrCells": []interface{}{
- },
+ "servedNrCells": []interface{}{},
},
expectedStatusCode: http.StatusBadRequest,
expectedJsonResponse: ValidationFailureJson,
}
}
+// END - UpdateGnb Validation Failure UTs
+
func TestControllerUpdateGnbValidServedNrCellInformationGetNodebNotFound(t *testing.T) {
context := controllerUpdateGnbTestContext{
getNodebInfoResult: &getNodebInfoResult{
RanName: RanName,
ConnectionStatus: entities.ConnectionStatus_CONNECTED,
AssociatedE2TInstanceAddress: AssociatedE2TInstanceAddress,
+ NodeType: entities.Node_ENB,
},
rnibError: nil,
},
},
},
},
- expectedStatusCode: http.StatusInternalServerError,
- expectedJsonResponse: InternalErrorJson,
+ expectedStatusCode: http.StatusBadRequest,
+ expectedJsonResponse: ValidationFailureJson,
}
controllerUpdateGnbTestExecuter(t, &context)
ConnectionStatus: entities.ConnectionStatus_CONNECTED,
AssociatedE2TInstanceAddress: AssociatedE2TInstanceAddress,
Configuration: &entities.NodebInfo_Gnb{Gnb: &entities.Gnb{ServedNrCells: oldServedNrCells}},
+ NodeType: entities.Node_GNB,
},
rnibError: nil,
},
ConnectionStatus: entities.ConnectionStatus_CONNECTED,
AssociatedE2TInstanceAddress: AssociatedE2TInstanceAddress,
Configuration: &entities.NodebInfo_Gnb{Gnb: &entities.Gnb{ServedNrCells: oldServedNrCells}},
+ NodeType: entities.Node_GNB,
},
rnibError: nil,
},
controllerUpdateGnbTestExecuter(t, &context)
}
+func TestControllerUpdateGnbExistingEmptyCellsSuccess(t *testing.T) {
+ oldServedNrCells := []*entities.ServedNRCell{}
+
+ 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{ServedNrCells: oldServedNrCells}},
+ NodeType: entities.Node_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\",\"nodeType\":\"GNB\",\"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 TestControllerUpdateGnbSuccess(t *testing.T) {
+ oldServedNrCells := generateServedNrCells("whatever1", "whatever2")
+
context := controllerUpdateGnbTestContext{
+ removeServedNrCellsParams: &removeServedNrCellsParams{
+ err: nil,
+ servedNrCells: oldServedNrCells,
+ },
updateGnbCellsParams: &updateGnbCellsParams{
err: nil,
},
RanName: RanName,
ConnectionStatus: entities.ConnectionStatus_CONNECTED,
AssociatedE2TInstanceAddress: AssociatedE2TInstanceAddress,
- Configuration: &entities.NodebInfo_Gnb{Gnb: &entities.Gnb{}},
+ Configuration: &entities.NodebInfo_Gnb{Gnb: &entities.Gnb{ServedNrCells: oldServedNrCells}},
+ NodeType: entities.Node_GNB,
},
rnibError: nil,
},
},
},
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\"}",
+ expectedJsonResponse: "{\"ranName\":\"test\",\"connectionStatus\":\"CONNECTED\",\"nodeType\":\"GNB\",\"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)
}
+/*
+UpdateEnb UTs
+*/
+
func TestControllerUpdateEnbInvalidRequest(t *testing.T) {
- controller, _, _, _, _ := setupControllerTest(t)
+ controller, _, _, _, _, _ := setupControllerTest(t)
writer := httptest.NewRecorder()
invalidJson := strings.NewReader("{enb:\"whatever\"")
controllerUpdateEnbTestExecuter(t, &context)
}
+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 TestControllerUpdateEnbValidServedCellsGetNodebNotFound(t *testing.T) {
context := controllerUpdateEnbTestContext{
getNodebInfoResult: &getNodebInfoResult{
controllerUpdateEnbTestExecuter(t, &context)
}
-func TestControllerUpdateEnbSuccess(t *testing.T) {
+func TestControllerUpdateEnbExistingEmptyCellsSuccess(t *testing.T) {
+ oldServedCells := []*entities.ServedCellInfo{}
+ context := controllerUpdateEnbTestContext{
+ 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 TestControllerUpdateEnbNgEnbFailure(t *testing.T) {
+
+ requestBody := map[string]interface{}{
+ "enb": map[string]interface{}{
+ "enbType": 3,
+ "servedCells": []interface{}{
+ buildServedCell(""),
+ }},
+ }
+
+ oldServedCells := generateServedCells("whatever1", "whatever2")
+
+ context := controllerUpdateEnbTestContext{
+ 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_NG_ENB}},
+ },
+ rnibError: nil,
+ },
+ requestBody: requestBody,
+ expectedStatusCode: http.StatusBadRequest,
+ expectedJsonResponse: ValidationFailureJson,
+ }
+
+ controllerUpdateEnbTestExecuter(t, &context)
+}
+
+func TestControllerUpdateEnbSuccessSetupFromNwFalse(t *testing.T) {
oldServedCells := generateServedCells("whatever1", "whatever2")
context := controllerUpdateEnbTestContext{
removeServedCellsParams: &removeServedCellsParams{
ConnectionStatus: entities.ConnectionStatus_CONNECTED,
AssociatedE2TInstanceAddress: AssociatedE2TInstanceAddress,
NodeType: entities.Node_ENB,
- Configuration: &entities.NodebInfo_Enb{Enb: &entities.Enb{ServedCells: oldServedCells, EnbType: entities.EnbType_MACRO_ENB}},
+ Configuration: &entities.NodebInfo_Enb{Enb: &entities.Enb{ServedCells: oldServedCells, EnbType: entities.EnbType_LONG_MACRO_ENB}},
},
rnibError: nil,
},
controllerUpdateEnbTestExecuter(t, &context)
}
+func TestControllerUpdateEnbSuccessSetupFromNwTrue(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_LONG_MACRO_ENB}},
+ SetupFromNetwork: true,
+ },
+ rnibError: nil,
+ },
+ requestBody: getUpdateEnbRequest(""),
+ expectedStatusCode: http.StatusOK,
+ expectedJsonResponse: "{\"ranName\":\"test\",\"connectionStatus\":\"CONNECTED\",\"nodeType\":\"ENB\",\"enb\":{\"enbType\":\"LONG_MACRO_ENB\",\"servedCells\":[{\"pci\":1,\"cellId\":\"whatever\",\"tac\":\"whatever3\",\"broadcastPlmns\":[\"whatever\"],\"choiceEutraMode\":{\"fdd\":{}},\"eutraMode\":\"FDD\"}]},\"associatedE2tInstanceAddress\":\"10.0.2.15:38000\",\"setupFromNetwork\":true}",
+ }
+
+ controllerUpdateEnbTestExecuter(t, &context)
+}
+
+/*
+AddEnb UTs
+*/
+
func TestControllerAddEnbGetNodebInternalError(t *testing.T) {
context := controllerAddEnbTestContext{
getNodebInfoResult: &getNodebInfoResult{
func TestControllerAddEnbSaveNodebFailure(t *testing.T) {
context := controllerAddEnbTestContext{
- saveNodebParams: &saveNodebParams{
- err: common.NewInternalError(errors.New("#reader.SaveeNodeb - Internal Error")),
+ addEnbParams: &addEnbParams{
+ err: common.NewInternalError(errors.New("#reader.AddEnb - Internal Error")),
},
getNodebInfoResult: &getNodebInfoResult{
nodebInfo: nil,
func TestControllerAddEnbAddNbIdentityFailure(t *testing.T) {
context := controllerAddEnbTestContext{
- saveNodebParams: &saveNodebParams{
+ addEnbParams: &addEnbParams{
err: nil,
},
addNbIdentityParams: &addNbIdentityParams{
}
func TestControllerAddEnbInvalidRequest(t *testing.T) {
- controller, _, _, _, _ := setupControllerTest(t)
+ controller, _, _, _, _, _ := setupControllerTest(t)
writer := httptest.NewRecorder()
// Invalid json: attribute name without quotes (should be "cause":).
}
}
-func TestControllerUpdateEnbMissingRequiredServedCellProps(t *testing.T) {
+func TestControllerAddEnbMissingRequiredServedCellProps(t *testing.T) {
- r := getUpdateEnbRequest("")
+ r := getAddEnbRequest("")
for _, v := range ServedCellRequiredFields {
enb := r["enb"]
buildServedCell(v),
}
- context := controllerUpdateEnbTestContext{
+ context := controllerAddEnbTestContext{
requestBody: r,
expectedStatusCode: http.StatusBadRequest,
expectedJsonResponse: ValidationFailureJson,
}
- controllerUpdateEnbTestExecuter(t, &context)
+ 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),
- }
+func TestControllerAddEnbNgEnbFailure(t *testing.T) {
- context := controllerAddEnbTestContext{
- requestBody: r,
- expectedStatusCode: http.StatusBadRequest,
- expectedJsonResponse: ValidationFailureJson,
- }
+ requestBody := map[string]interface{}{
+ "ranName": RanName,
+ "globalNbId": buildGlobalNbId(""),
+ "enb": map[string]interface{}{
+ "enbType": 5,
+ "servedCells": []interface{}{
+ buildServedCell(""),
+ },
+ },
+ }
- controllerAddEnbTestExecuter(t, &context)
+ context := controllerAddEnbTestContext{
+ requestBody: requestBody,
+ expectedStatusCode: http.StatusBadRequest,
+ expectedJsonResponse: ValidationFailureJson,
}
+
+ controllerAddEnbTestExecuter(t, &context)
}
func TestControllerAddEnbSuccess(t *testing.T) {
context := controllerAddEnbTestContext{
- saveNodebParams: &saveNodebParams{
+ addEnbParams: &addEnbParams{
err: nil,
},
addNbIdentityParams: &addNbIdentityParams{
expectedJsonResponse: RnibErrorJson,
}
- controllerDeleteEnbTestExecuter(t, &context)
+ controllerDeleteEnbTestExecuter(t, &context, false)
}
+/*
+DeleteEnb UTs
+*/
+
func TestControllerDeleteEnbNodebNotExistsFailure(t *testing.T) {
context := controllerDeleteEnbTestContext{
getNodebInfoResult: &getNodebInfoResult{
expectedJsonResponse: ResourceNotFoundJson,
}
- controllerDeleteEnbTestExecuter(t, &context)
+ controllerDeleteEnbTestExecuter(t, &context, false)
}
func TestControllerDeleteEnbNodebNotEnb(t *testing.T) {
expectedJsonResponse: ValidationFailureJson,
}
- controllerDeleteEnbTestExecuter(t, &context)
+ controllerDeleteEnbTestExecuter(t, &context, false)
+}
+
+func TestControllerDeleteEnbSetupFromNetworkTrueFailure(t *testing.T) {
+ context := controllerDeleteEnbTestContext{
+ getNodebInfoResult: &getNodebInfoResult{
+ nodebInfo: &entities.NodebInfo{RanName: RanName, NodeType: entities.Node_ENB, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, SetupFromNetwork: true},
+ rnibError: nil,
+ },
+ expectedStatusCode: http.StatusBadRequest,
+ expectedJsonResponse: ValidationFailureJson,
+ }
+ controllerDeleteEnbTestExecuter(t, &context, true)
}
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 {
return b
}
+/*
+GetNodeb UTs
+*/
+
func TestControllerGetNodebSuccess(t *testing.T) {
ranName := "test"
var rnibError error
nodebIdList: nodebIdList,
rnibError: rnibError,
expectedStatusCode: http.StatusOK,
- expectedJsonResponse: "[{\"inventoryName\":\"test1\",\"globalNbId\":{\"plmnId\":\"plmnId1\",\"nbId\":\"nbId1\"}},{\"inventoryName\":\"test2\",\"globalNbId\":{\"plmnId\":\"plmnId2\",\"nbId\":\"nbId2\"}}]",
+ expectedJsonResponse: "[{\"inventoryName\":\"test1\",\"globalNbId\":{\"plmnId\":\"plmnId1\",\"nbId\":\"nbId1\"}},{\"inventoryName\":\"test2\",\"globalNbId\":{\"plmnId\":\"plmnId2\",\"nbId\":\"nbId2\"}}][{\"inventoryName\":\"test2\",\"globalNbId\":{\"plmnId\":\"plmnId2\",\"nbId\":\"nbId2\"}},{\"inventoryName\":\"test1\",\"globalNbId\":{\"plmnId\":\"plmnId1\",\"nbId\":\"nbId1\"}}]",
}
controllerGetNodebIdListTestExecuter(t, &context)
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)
controller.handleErrorResponse(e2managererrors.NewRmrError(), writer)
assert.Equal(t, http.StatusInternalServerError, writer.Result().StatusCode)
+ writer = httptest.NewRecorder()
+ controller.handleErrorResponse(e2managererrors.NewNoConnectedRanError(), writer)
+ assert.Equal(t, http.StatusNotFound, writer.Result().StatusCode)
+
writer = httptest.NewRecorder()
controller.handleErrorResponse(e2managererrors.NewResourceNotFoundError(), writer)
assert.Equal(t, http.StatusNotFound, writer.Result().StatusCode)
Code Review / ric-plt / e2mgr.git / blobdiff