X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fcontrollers%2Fcontroller_test.go;h=448ac9dde5ec7f3d60e0de9e3aa73e9db89f84f5;hb=1e540b0ec20b95e6d97ffb86244385d87a7d0a73;hp=420badde09cb74cfdec5a7823603426c0a2e5632;hpb=549944ecfb9e75ed4a03dd6d10e4160b89f26ca8;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/controllers/controller_test.go b/E2Manager/controllers/controller_test.go index 420badd..448ac9d 100644 --- a/E2Manager/controllers/controller_test.go +++ b/E2Manager/controllers/controller_test.go @@ -24,7 +24,7 @@ import ( "e2mgr/logger" "e2mgr/mocks" "e2mgr/models" - "e2mgr/providers" + "e2mgr/providers/httpmsghandlerprovider" "e2mgr/rNibWriter" "e2mgr/rmrCgo" "e2mgr/tests" @@ -33,7 +33,7 @@ import ( "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common" "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities" "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader" - "github.com/julienschmidt/httprouter" + "github.com/gorilla/mux" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "io" @@ -64,12 +64,12 @@ func TestShutdownHandlerRnibError(t *testing.T) { writer := httptest.NewRecorder() controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config) - controller.ShutdownHandler(writer, tests.GetHttpRequest(), nil) + controller.ShutdownHandler(writer, tests.GetHttpRequest()) var errorResponse = parseJsonRequest(t, writer.Body) assert.Equal(t, http.StatusInternalServerError, writer.Result().StatusCode) - assert.Equal(t, errorResponse.Code, e2managererrors.NewRnibDbError().Err.Code) + assert.Equal(t, errorResponse.Code, e2managererrors.NewRnibDbError().Code) } func TestHeaderValidationFailed(t *testing.T) { @@ -92,17 +92,17 @@ func TestHeaderValidationFailed(t *testing.T) { header := &http.Header{} - controller.handleRequest(writer, header, providers.ShutdownRequest, nil, true, http.StatusNoContent) + controller.handleRequest(writer, header, httpmsghandlerprovider.ShutdownRequest, nil, true, http.StatusNoContent) var errorResponse = parseJsonRequest(t, writer.Body) err := e2managererrors.NewHeaderValidationError() assert.Equal(t, http.StatusUnsupportedMediaType, writer.Result().StatusCode) - assert.Equal(t, errorResponse.Code, err.Err.Code) - assert.Equal(t, errorResponse.Message, err.Err.Message) + assert.Equal(t, errorResponse.Code, err.Code) + assert.Equal(t, errorResponse.Message, err.Message) } -func TestShutdownStatusNoContent(t *testing.T){ +func TestShutdownStatusNoContent(t *testing.T) { log := initLog(t) rmrMessengerMock := &mocks.RmrMessengerMock{} @@ -122,7 +122,7 @@ func TestShutdownStatusNoContent(t *testing.T){ writer := httptest.NewRecorder() controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config) - controller.ShutdownHandler(writer, tests.GetHttpRequest(), nil) + controller.ShutdownHandler(writer, tests.GetHttpRequest()) assert.Equal(t, http.StatusNoContent, writer.Result().StatusCode) } @@ -149,8 +149,8 @@ func TestHandleInternalError(t *testing.T) { var errorResponse = parseJsonRequest(t, writer.Body) assert.Equal(t, http.StatusInternalServerError, writer.Result().StatusCode) - assert.Equal(t, errorResponse.Code, err.Err.Code) - assert.Equal(t, errorResponse.Message, err.Err.Message) + assert.Equal(t, errorResponse.Code, err.Code) + assert.Equal(t, errorResponse.Message, err.Message) } func TestHandleCommandAlreadyInProgressError(t *testing.T) { @@ -174,11 +174,11 @@ func TestHandleCommandAlreadyInProgressError(t *testing.T) { var errorResponse = parseJsonRequest(t, writer.Body) assert.Equal(t, http.StatusMethodNotAllowed, writer.Result().StatusCode) - assert.Equal(t, errorResponse.Code, err.Err.Code) - assert.Equal(t, errorResponse.Message, err.Err.Message) + assert.Equal(t, errorResponse.Code, err.Code) + assert.Equal(t, errorResponse.Message, err.Message) } -func TestValidateHeaders(t *testing.T){ +func TestValidateHeaders(t *testing.T) { log := initLog(t) rmrMessengerMock := &mocks.RmrMessengerMock{} @@ -221,8 +221,7 @@ func initLog(t *testing.T) *logger.Logger { return log } - -func TestX2ResetHandleSuccessfulRequestedCause(t *testing.T){ +func TestX2ResetHandleSuccessfulRequestedCause(t *testing.T) { log := initLog(t) ranName := "test1" @@ -235,33 +234,33 @@ func TestX2ResetHandleSuccessfulRequestedCause(t *testing.T){ writerProvider := func() rNibWriter.RNibWriter { return writerMock } - payload:= []byte {0x00, 0x07, 0x00, 0x08, 0x00, 0x00, 0x01, 0x00, 0x05, 0x40, 0x01, 0x40} + payload := []byte{0x00, 0x07, 0x00, 0x08, 0x00, 0x00, 0x01, 0x00, 0x05, 0x40, 0x01, 0x40} xaction := []byte(ranName) - msg:= rmrCgo.NewMBuf(rmrCgo.RIC_X2_RESET, len(payload), ranName, &payload, &xaction) + msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_RESET, len(payload), ranName, &payload, &xaction) rmrMessengerMock := &mocks.RmrMessengerMock{} - rmrMessengerMock.On("SendMsg",msg,mock.Anything).Return(msg,nil) + rmrMessengerMock.On("SendMsg", msg, mock.Anything).Return(msg, nil) config := configuration.ParseConfiguration() - rmrService:=getRmrService(rmrMessengerMock, log) + rmrService := getRmrService(rmrMessengerMock, log) writer := httptest.NewRecorder() controller := NewController(log, rmrService, readerProvider, writerProvider, config) - var nodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED } - readerMock.On("GetNodeb",ranName).Return(nodeb, nil) + var nodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED} + readerMock.On("GetNodeb", ranName).Return(nodeb, nil) data4Req := map[string]interface{}{"cause": "protocol:transfer-syntax-error"} b := new(bytes.Buffer) _ = json.NewEncoder(b).Encode(data4Req) req, _ := http.NewRequest("PUT", "https://localhost:3800/nodeb-reset", b) + req = mux.SetURLVars(req, map[string]string{"ranName": ranName}) - param:= httprouter.Param{Key:"ranName", Value: ranName} - controller.X2ResetHandler(writer, req, []httprouter.Param {param}) + controller.X2ResetHandler(writer, req) assert.Equal(t, http.StatusNoContent, writer.Result().StatusCode) } -func TestX2ResetHandleSuccessfulRequestedDefault(t *testing.T){ +func TestX2ResetHandleSuccessfulRequestedDefault(t *testing.T) { log := initLog(t) ranName := "test1" @@ -275,32 +274,32 @@ func TestX2ResetHandleSuccessfulRequestedDefault(t *testing.T){ return writerMock } // o&m intervention - payload:= []byte {0x00, 0x07, 0x00, 0x08, 0x00, 0x00, 0x01, 0x00, 0x05, 0x40, 0x01, 0x64} + payload := []byte{0x00, 0x07, 0x00, 0x08, 0x00, 0x00, 0x01, 0x00, 0x05, 0x40, 0x01, 0x64} xaction := []byte(ranName) - msg:= rmrCgo.NewMBuf(rmrCgo.RIC_X2_RESET, len(payload), ranName, &payload, &xaction) + msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_RESET, len(payload), ranName, &payload, &xaction) rmrMessengerMock := &mocks.RmrMessengerMock{} - rmrMessengerMock.On("SendMsg",msg,mock.Anything).Return(msg,nil) + rmrMessengerMock.On("SendMsg", msg, mock.Anything).Return(msg, nil) config := configuration.ParseConfiguration() - rmrService:=getRmrService(rmrMessengerMock, log) + rmrService := getRmrService(rmrMessengerMock, log) writer := httptest.NewRecorder() controller := NewController(log, rmrService, readerProvider, writerProvider, config) - var nodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED } - readerMock.On("GetNodeb",ranName).Return(nodeb, nil) + var nodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED} + readerMock.On("GetNodeb", ranName).Return(nodeb, nil) // no body b := new(bytes.Buffer) req, _ := http.NewRequest("PUT", "https://localhost:3800/nodeb-reset", b) + req = mux.SetURLVars(req, map[string]string{"ranName": ranName}) - param:= httprouter.Param{Key:"ranName", Value: ranName} - controller.X2ResetHandler(writer, req, []httprouter.Param {param}) + controller.X2ResetHandler(writer, req) assert.Equal(t, http.StatusNoContent, writer.Result().StatusCode) } -func TestX2ResetHandleFailureInvalidBody(t *testing.T){ +func TestX2ResetHandleFailureInvalidBody(t *testing.T) { log := initLog(t) ranName := "test1" @@ -316,7 +315,7 @@ func TestX2ResetHandleFailureInvalidBody(t *testing.T){ rmrMessengerMock := &mocks.RmrMessengerMock{} config := configuration.ParseConfiguration() - rmrService:=getRmrService(rmrMessengerMock, log) + rmrService := getRmrService(rmrMessengerMock, log) writer := httptest.NewRecorder() controller := NewController(log, rmrService, readerProvider, writerProvider, config) @@ -324,9 +323,9 @@ func TestX2ResetHandleFailureInvalidBody(t *testing.T){ // Invalid json: attribute name without quotes (should be "cause":). b := strings.NewReader("{cause:\"protocol:transfer-syntax-error\"") req, _ := http.NewRequest("PUT", "https://localhost:3800/nodeb-reset", b) + req = mux.SetURLVars(req, map[string]string{"ranName": ranName}) - param:= httprouter.Param{Key:"ranName", Value: ranName} - controller.X2ResetHandler(writer, req, []httprouter.Param {param}) + controller.X2ResetHandler(writer, req) assert.Equal(t, http.StatusBadRequest, writer.Result().StatusCode) _, ok := rmrService.E2sessions[ranName] @@ -334,7 +333,7 @@ func TestX2ResetHandleFailureInvalidBody(t *testing.T){ } -func TestHandleErrorResponse(t *testing.T){ +func TestHandleErrorResponse(t *testing.T) { log := initLog(t) readerMock := &mocks.RnibReaderMock{} @@ -348,40 +347,39 @@ func TestHandleErrorResponse(t *testing.T){ rmrMessengerMock := &mocks.RmrMessengerMock{} config := configuration.ParseConfiguration() - rmrService:=getRmrService(rmrMessengerMock, log) - + rmrService := getRmrService(rmrMessengerMock, log) controller := NewController(log, rmrService, readerProvider, writerProvider, config) writer := httptest.NewRecorder() - controller.handleErrorResponse(e2managererrors.NewRnibDbError(),writer) + controller.handleErrorResponse(e2managererrors.NewRnibDbError(), writer) assert.Equal(t, http.StatusInternalServerError, writer.Result().StatusCode) writer = httptest.NewRecorder() - controller.handleErrorResponse(e2managererrors.NewCommandAlreadyInProgressError(),writer) + controller.handleErrorResponse(e2managererrors.NewCommandAlreadyInProgressError(), writer) assert.Equal(t, http.StatusMethodNotAllowed, writer.Result().StatusCode) writer = httptest.NewRecorder() - controller.handleErrorResponse(e2managererrors.NewHeaderValidationError(),writer) + controller.handleErrorResponse(e2managererrors.NewHeaderValidationError(), writer) assert.Equal(t, http.StatusUnsupportedMediaType, writer.Result().StatusCode) writer = httptest.NewRecorder() - controller.handleErrorResponse(e2managererrors.NewWrongStateError("",""),writer) + controller.handleErrorResponse(e2managererrors.NewWrongStateError("", ""), writer) assert.Equal(t, http.StatusBadRequest, writer.Result().StatusCode) writer = httptest.NewRecorder() - controller.handleErrorResponse(e2managererrors.NewRequestValidationError(),writer) + controller.handleErrorResponse(e2managererrors.NewRequestValidationError(), writer) assert.Equal(t, http.StatusBadRequest, writer.Result().StatusCode) writer = httptest.NewRecorder() - controller.handleErrorResponse(e2managererrors.NewRmrError(),writer) + controller.handleErrorResponse(e2managererrors.NewRmrError(), writer) assert.Equal(t, http.StatusInternalServerError, writer.Result().StatusCode) writer = httptest.NewRecorder() - controller.handleErrorResponse(e2managererrors.NewResourceNotFoundError(),writer) + controller.handleErrorResponse(e2managererrors.NewResourceNotFoundError(), writer) assert.Equal(t, http.StatusNotFound, writer.Result().StatusCode) writer = httptest.NewRecorder() - controller.handleErrorResponse(fmt.Errorf("ErrorError"),writer) + controller.handleErrorResponse(fmt.Errorf("ErrorError"), writer) assert.Equal(t, http.StatusInternalServerError, writer.Result().StatusCode) }