X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fhandlers%2Fhttpmsghandlers%2Fsetup_request_handler_test.go;h=154ac4cdf0f80472ea236a8883088e41b4e46817;hb=6a84a5108ce5df9c2a325bb1d9a0a40dab9fdd36;hp=878338999668390f71da9623491896204721e39c;hpb=33f84e1a0998af025880be3e8eb087fac34af731;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/handlers/httpmsghandlers/setup_request_handler_test.go b/E2Manager/handlers/httpmsghandlers/setup_request_handler_test.go index 8783389..154ac4c 100644 --- a/E2Manager/handlers/httpmsghandlers/setup_request_handler_test.go +++ b/E2Manager/handlers/httpmsghandlers/setup_request_handler_test.go @@ -17,17 +17,17 @@ package httpmsghandlers import ( + "e2mgr/configuration" "e2mgr/e2managererrors" "e2mgr/e2pdus" "e2mgr/managers" "e2mgr/mocks" "e2mgr/models" - "e2mgr/rNibWriter" "e2mgr/rmrCgo" "e2mgr/rnibBuilders" + "e2mgr/services" "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/stretchr/testify/assert" "github.com/stretchr/testify/mock" "reflect" @@ -55,9 +55,9 @@ func TestSetupHandleNewRanSave_Error(t *testing.T) { 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) + rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg, nil) - actual := handler.Handle(sr) + _, actual := handler.Handle(sr) expected := &e2managererrors.RnibDbError{} if reflect.TypeOf(actual) != reflect.TypeOf(expected) { @@ -89,9 +89,9 @@ func TestSetupHandleNewRan_Success(t *testing.T) { 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) + rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg, nil) - actual := handler.Handle(sr) + _, actual := handler.Handle(sr) assert.Nil(t, actual) @@ -118,10 +118,10 @@ func TestEndcSetupHandleRmr_Error(t *testing.T) { msg := rmrCgo.NewMBuf(rmrCgo.RIC_ENDC_X2_SETUP_REQ, len(payload), ranName, &payload, &xaction) rmrErr := &e2managererrors.RmrError{} - rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(msg, rmrErr) + rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg, rmrErr) sr := models.SetupRequest{"127.0.0.1", 8080, ranName,} - actual := handler.Handle(sr) + _, actual := handler.Handle(sr) if reflect.TypeOf(actual) != reflect.TypeOf(rmrErr) { t.Errorf("Error actual = %v, and Expected = %v.", actual, rmrErr) @@ -145,10 +145,10 @@ func TestEndcSetupHandleExistingDisconnectedRan_Success(t *testing.T) { 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) + rmrMessengerMock.On("SendMsg", mock.Anything).Return(msg, nil) sr := models.SetupRequest{"127.0.0.1", 8080, ranName,} - actual := handler.Handle(sr) + _, actual := handler.Handle(sr) assert.Nil(t, actual) @@ -173,7 +173,7 @@ func TestX2SetupHandleExistingConnectedRan_Success(t *testing.T) { rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(msg, nil) sr := models.SetupRequest{"127.0.0.1", 8080, ranName,} - actual := handler.Handle(sr) + _, actual := handler.Handle(sr) assert.Nil(t, actual) @@ -182,14 +182,14 @@ func TestX2SetupHandleExistingConnectedRan_Success(t *testing.T) { } func TestX2SetupHandleRnibGet_Error(t *testing.T) { - readerMock, _, handler,rmrMessengerMock := initSetupRequestTest(t, entities.E2ApplicationProtocol_X2_SETUP_REQUEST) + readerMock, _, handler, rmrMessengerMock := initSetupRequestTest(t, entities.E2ApplicationProtocol_X2_SETUP_REQUEST) rnibErr := &common.ValidationError{} nb := &entities.NodebInfo{RanName: "RanName", ConnectionStatus: entities.ConnectionStatus_SHUTTING_DOWN,} readerMock.On("GetNodeb", "RanName").Return(nb, rnibErr) sr := models.SetupRequest{"127.0.0.1", 8080, "RanName",} - actual := handler.Handle(sr) + _, actual := handler.Handle(sr) expected := &e2managererrors.RnibDbError{} if reflect.TypeOf(actual) != reflect.TypeOf(expected) { @@ -198,6 +198,23 @@ func TestX2SetupHandleRnibGet_Error(t *testing.T) { rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 0) } +func TestEndcSetupHandleShuttingDownRan_Error(t *testing.T) { + readerMock, writerMock, handler, rmrMessengerMock := initSetupRequestTest(t, entities.E2ApplicationProtocol_ENDC_X2_SETUP_REQUEST) + + nb := &entities.NodebInfo{RanName: "RanName", ConnectionStatus: entities.ConnectionStatus_SHUTTING_DOWN,} + readerMock.On("GetNodeb", "RanName").Return(nb, nil) + + sr := models.SetupRequest{"127.0.0.1", 8080, "RanName",} + _, actual := handler.Handle(sr) + + expected := &e2managererrors.WrongStateError{} + if reflect.TypeOf(actual) != reflect.TypeOf(expected) { + t.Errorf("Error actual = %v, and Expected = %v.", actual, expected) + } + writerMock.AssertNumberOfCalls(t, "UpdateNodebInfo", 0) + rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 0) +} + func TestX2SetupHandleShuttingDownRan_Error(t *testing.T) { readerMock, writerMock, handler, rmrMessengerMock := initSetupRequestTest(t, entities.E2ApplicationProtocol_X2_SETUP_REQUEST) @@ -205,7 +222,7 @@ func TestX2SetupHandleShuttingDownRan_Error(t *testing.T) { readerMock.On("GetNodeb", "RanName").Return(nb, nil) sr := models.SetupRequest{"127.0.0.1", 8080, "RanName",} - actual := handler.Handle(sr) + _, actual := handler.Handle(sr) expected := &e2managererrors.WrongStateError{} if reflect.TypeOf(actual) != reflect.TypeOf(expected) { @@ -219,7 +236,7 @@ func TestX2SetupHandleNoPort_Error(t *testing.T) { _, writerMock, handler, rmrMessengerMock := initSetupRequestTest(t, entities.E2ApplicationProtocol_X2_SETUP_REQUEST) sr := models.SetupRequest{"127.0.0.1", 0, "RanName",} - actual := handler.Handle(sr) + _, actual := handler.Handle(sr) expected := &e2managererrors.RequestValidationError{} if reflect.TypeOf(actual) != reflect.TypeOf(expected) { @@ -236,7 +253,7 @@ func TestX2SetupHandleNoRanName_Error(t *testing.T) { sr.RanPort = 8080 sr.RanIp = "127.0.0.1" - actual := handler.Handle(sr) + _, actual := handler.Handle(sr) expected := &e2managererrors.RequestValidationError{} if reflect.TypeOf(actual) != reflect.TypeOf(expected) { @@ -253,7 +270,7 @@ func TestX2SetupHandleNoIP_Error(t *testing.T) { sr.RanPort = 8080 sr.RanName = "RanName" - actual := handler.Handle(sr) + _, actual := handler.Handle(sr) expected := &e2managererrors.RequestValidationError{} if reflect.TypeOf(actual) != reflect.TypeOf(expected) { @@ -271,7 +288,7 @@ func TestX2SetupHandleInvalidIp_Error(t *testing.T) { sr.RanName = "RanName" sr.RanIp = "invalid ip" - actual := handler.Handle(sr) + _, actual := handler.Handle(sr) expected := &e2managererrors.RequestValidationError{} if reflect.TypeOf(actual) != reflect.TypeOf(expected) { @@ -281,23 +298,20 @@ func TestX2SetupHandleInvalidIp_Error(t *testing.T) { rmrMessengerMock.AssertNumberOfCalls(t, "SendMsg", 0) } -func initSetupRequestTest(t *testing.T, protocol entities.E2ApplicationProtocol)(*mocks.RnibReaderMock, *mocks.RnibWriterMock, *SetupRequestHandler, *mocks.RmrMessengerMock) { +func initSetupRequestTest(t *testing.T, protocol entities.E2ApplicationProtocol) (*mocks.RnibReaderMock, *mocks.RnibWriterMock, *SetupRequestHandler, *mocks.RmrMessengerMock) { log := initLog(t) + config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3} readerMock := &mocks.RnibReaderMock{} - readerProvider := func() reader.RNibReader { - return readerMock - } writerMock := &mocks.RnibWriterMock{} - writerProvider := func() rNibWriter.RNibWriter { - return writerMock - } rmrMessengerMock := &mocks.RmrMessengerMock{} - rmrService := getRmrService(rmrMessengerMock, log) + rmrSender := getRmrSender(rmrMessengerMock, log) - ranSetupManager := managers.NewRanSetupManager(log, rmrService, writerProvider) - handler := NewSetupRequestHandler(log, writerProvider, readerProvider, ranSetupManager, protocol) + rnibDataService := services.NewRnibDataService(log, config, readerMock, writerMock) + + ranSetupManager := managers.NewRanSetupManager(log, rmrSender, rnibDataService) + handler := NewSetupRequestHandler(log, rnibDataService, ranSetupManager, protocol) return readerMock, writerMock, handler, rmrMessengerMock -} \ No newline at end of file +}