X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fcontrollers%2Fcontroller_test.go;h=f14d8309912a9f81900e04e0579f2dbff92dde31;hb=refs%2Fchanges%2F37%2F937%2F1;hp=4d0774e63f0ff7253fa0c65caf4afda99374b677;hpb=574c21e37f9e740579227c81c22253b8c7aa5404;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/controllers/controller_test.go b/E2Manager/controllers/controller_test.go index 4d0774e..f14d830 100644 --- a/E2Manager/controllers/controller_test.go +++ b/E2Manager/controllers/controller_test.go @@ -21,10 +21,12 @@ import ( "bytes" "e2mgr/configuration" "e2mgr/e2managererrors" + "e2mgr/e2pdus" "e2mgr/logger" + "e2mgr/managers" "e2mgr/mocks" "e2mgr/models" - "e2mgr/providers" + "e2mgr/providers/httpmsghandlerprovider" "e2mgr/rNibWriter" "e2mgr/rmrCgo" "e2mgr/tests" @@ -33,7 +35,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" @@ -44,6 +46,110 @@ import ( "testing" ) +func TestX2SetupInvalidBody(t *testing.T) { + + readerMock, writerMock, rmrMessengerMock, ranSetupManager := initTest(t) + log := initLog(t) + + readerProvider := func() reader.RNibReader { + return readerMock + } + writerProvider := func() rNibWriter.RNibWriter { + return writerMock + } + + header := http.Header{} + header.Set("Content-Type", "application/json") + httpRequest, _ := http.NewRequest("POST", "http://localhost:3800/v1/nodeb/x2-setup", strings.NewReader("{}{}")) + httpRequest.Header = header + + writer := httptest.NewRecorder() + config := configuration.ParseConfiguration() + controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config, ranSetupManager) + controller.X2SetupHandler(writer, httpRequest) + + var errorResponse = parseJsonRequest(t, writer.Body) + + assert.Equal(t, http.StatusBadRequest, writer.Result().StatusCode) + assert.Equal(t, e2managererrors.NewInvalidJsonError().Code, errorResponse.Code) +} + +func TestX2SetupSuccess(t *testing.T) { + + readerMock, writerMock, rmrMessengerMock, ranSetupManager := initTest(t) + log := initLog(t) + + readerProvider := func() reader.RNibReader { + return readerMock + } + writerProvider := func() rNibWriter.RNibWriter { + return writerMock + } + + ranName := "test" + nb := &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST} + readerMock.On("GetNodeb", ranName).Return(nb, nil) + + var nbUpdated = &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_X2_SETUP_REQUEST, ConnectionAttempts: 1} + writerMock.On("UpdateNodebInfo", nbUpdated).Return(nil) + + payload := e2pdus.PackedX2setupRequest + xaction := []byte(ranName) + msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_SETUP_REQ, len(payload), ranName, &payload, &xaction) + + rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(msg, nil) + + header := http.Header{} + header.Set("Content-Type", "application/json") + httpRequest := tests.GetHttpRequest() + httpRequest.Header = header + + writer := httptest.NewRecorder() + config := configuration.ParseConfiguration() + controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config, ranSetupManager) + controller.X2SetupHandler(writer, httpRequest) + + assert.Equal(t, http.StatusNoContent, writer.Result().StatusCode) +} + +func TestEndcSetupSuccess(t *testing.T) { + + readerMock, writerMock, rmrMessengerMock, ranSetupManager := initTest(t) + log := initLog(t) + + readerProvider := func() reader.RNibReader { + return readerMock + } + writerProvider := func() rNibWriter.RNibWriter { + return writerMock + } + + ranName := "test" + nb := &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_DISCONNECTED, E2ApplicationProtocol: entities.E2ApplicationProtocol_ENDC_X2_SETUP_REQUEST} + readerMock.On("GetNodeb", ranName).Return(nb, nil) + + var nbUpdated = &entities.NodebInfo{RanName: ranName, ConnectionStatus: entities.ConnectionStatus_CONNECTING, E2ApplicationProtocol: entities.E2ApplicationProtocol_ENDC_X2_SETUP_REQUEST, ConnectionAttempts: 1} + writerMock.On("UpdateNodebInfo", nbUpdated).Return(nil) + + payload := e2pdus.PackedEndcX2setupRequest + xaction := []byte(ranName) + msg := rmrCgo.NewMBuf(rmrCgo.RIC_ENDC_X2_SETUP_REQ, len(payload), ranName, &payload, &xaction) + + rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(msg, nil) + + header := http.Header{} + header.Set("Content-Type", "application/json") + httpRequest := tests.GetHttpRequest() + httpRequest.Header = header + + writer := httptest.NewRecorder() + config := configuration.ParseConfiguration() + controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config, ranSetupManager) + controller.EndcSetupHandler(writer, httpRequest) + + assert.Equal(t, http.StatusNoContent, writer.Result().StatusCode) +} + func TestShutdownHandlerRnibError(t *testing.T) { log := initLog(t) config := configuration.ParseConfiguration() @@ -58,18 +164,19 @@ func TestShutdownHandlerRnibError(t *testing.T) { return writerMock } - rnibErr := &common.RNibError{} + rnibErr := &common.ResourceNotFoundError{} var nbIdentityList []*entities.NbIdentity readerMock.On("GetListNodebIds").Return(nbIdentityList, rnibErr) writer := httptest.NewRecorder() - controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config) - controller.ShutdownHandler(writer, tests.GetHttpRequest(), nil) + ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter) + controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config, ranSetupManager) + 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) { @@ -87,22 +194,22 @@ func TestHeaderValidationFailed(t *testing.T) { } writer := httptest.NewRecorder() - - controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config) + ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter) + controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config, ranSetupManager) header := &http.Header{} - controller.handleRequest(writer, header, providers.ShutdownRequest, nil, true, http.StatusNoContent) + controller.handleRequest(writer, header, httpmsghandlerprovider.ShutdownRequest, nil, true) 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{} @@ -116,13 +223,14 @@ func TestShutdownStatusNoContent(t *testing.T){ } config := configuration.ParseConfiguration() - var rnibError common.IRNibError + var rnibError error nbIdentityList := []*entities.NbIdentity{} readerMock.On("GetListNodebIds").Return(nbIdentityList, rnibError) writer := httptest.NewRecorder() - controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config) - controller.ShutdownHandler(writer, tests.GetHttpRequest(), nil) + ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter) + controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config, ranSetupManager) + controller.ShutdownHandler(writer, tests.GetHttpRequest()) assert.Equal(t, http.StatusNoContent, writer.Result().StatusCode) } @@ -142,15 +250,16 @@ func TestHandleInternalError(t *testing.T) { } writer := httptest.NewRecorder() - controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config) + ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter) + controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config, ranSetupManager) err := e2managererrors.NewInternalError() controller.handleErrorResponse(err, writer) 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) { @@ -167,18 +276,19 @@ func TestHandleCommandAlreadyInProgressError(t *testing.T) { return writerMock } writer := httptest.NewRecorder() - controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config) + ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter) + controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config, ranSetupManager) err := e2managererrors.NewCommandAlreadyInProgressError() controller.handleErrorResponse(err, writer) 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{} @@ -191,8 +301,8 @@ func TestValidateHeaders(t *testing.T){ return writerMock } config := configuration.ParseConfiguration() - - controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config) + ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter) + controller := NewController(log, getRmrService(rmrMessengerMock, log), readerProvider, writerProvider, config, ranSetupManager) header := http.Header{} header.Set("Content-Type", "application/json") @@ -221,8 +331,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,37 +344,34 @@ 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) + ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter) + controller := NewController(log, rmrService, readerProvider, writerProvider, config, ranSetupManager) - 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) - v, ok := rmrService.E2sessions[ranName] - assert.True(t, ok) - - assert.Equal(t, v.Request.RanName, ranName) } -func TestX2ResetHandleSuccessfulRequestedDefault(t *testing.T){ +func TestX2ResetHandleSuccessfulRequestedDefault(t *testing.T) { log := initLog(t) ranName := "test1" @@ -279,36 +385,33 @@ 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) + ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter) + controller := NewController(log, rmrService, readerProvider, writerProvider, config, ranSetupManager) - 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) - v, ok := rmrService.E2sessions[ranName] - assert.True(t, ok) - - assert.Equal(t, v.Request.RanName, ranName) } -func TestX2ResetHandleFailureInvalidBody(t *testing.T){ +func TestX2ResetHandleFailureInvalidBody(t *testing.T) { log := initLog(t) ranName := "test1" @@ -324,25 +427,23 @@ 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) + ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter) + controller := NewController(log, rmrService, readerProvider, writerProvider, config, ranSetupManager) // 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] - assert.False(t, ok) - } -func TestHandleErrorResponse(t *testing.T){ +func TestHandleErrorResponse(t *testing.T) { log := initLog(t) readerMock := &mocks.RnibReaderMock{} @@ -356,40 +457,56 @@ func TestHandleErrorResponse(t *testing.T){ rmrMessengerMock := &mocks.RmrMessengerMock{} config := configuration.ParseConfiguration() - rmrService:=getRmrService(rmrMessengerMock, log) - - - controller := NewController(log, rmrService, readerProvider, writerProvider, config) + rmrService := getRmrService(rmrMessengerMock, log) + ranSetupManager := managers.NewRanSetupManager(log, getRmrService(rmrMessengerMock, log), rNibWriter.GetRNibWriter) + controller := NewController(log, rmrService, readerProvider, writerProvider, config, ranSetupManager) 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) } + +func initTest(t *testing.T)(*mocks.RnibReaderMock, *mocks.RnibWriterMock, *mocks.RmrMessengerMock, *managers.RanSetupManager) { + log := initLog(t) + + readerMock := &mocks.RnibReaderMock{} + writerMock := &mocks.RnibWriterMock{} + writerProvider := func() rNibWriter.RNibWriter { + return writerMock + } + + rmrMessengerMock := &mocks.RmrMessengerMock{} + rmrService := getRmrService(rmrMessengerMock, log) + + ranSetupManager := managers.NewRanSetupManager(log, rmrService, writerProvider) + + return readerMock, writerMock, rmrMessengerMock, ranSetupManager +} \ No newline at end of file