X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=E2Manager%2Fhandlers%2Fhttpmsghandlers%2Fx2_reset_request_handler_test.go;h=e8cdc4e2c6de9844c1aab45ad7dfb2191f311b22;hb=848891ebc97494107f7b9fadd25769f200bd550b;hp=64e0c101763c7b924cce6ffbe2877e2e2bf5bf36;hpb=e3623cf1310f8c8d2fd9b5842102516b9be3b441;p=ric-plt%2Fe2mgr.git diff --git a/E2Manager/handlers/httpmsghandlers/x2_reset_request_handler_test.go b/E2Manager/handlers/httpmsghandlers/x2_reset_request_handler_test.go index 64e0c10..e8cdc4e 100644 --- a/E2Manager/handlers/httpmsghandlers/x2_reset_request_handler_test.go +++ b/E2Manager/handlers/httpmsghandlers/x2_reset_request_handler_test.go @@ -1,3 +1,23 @@ +// +// Copyright 2019 AT&T Intellectual Property +// Copyright 2019 Nokia +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// This source code is part of the near-RT RIC (RAN Intelligent Controller) +// platform project (RICP). + + package httpmsghandlers import ( @@ -5,33 +25,25 @@ import ( "e2mgr/e2managererrors" "e2mgr/mocks" "e2mgr/models" - "e2mgr/rNibWriter" "e2mgr/rmrCgo" "e2mgr/services" "fmt" "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" "testing" + "unsafe" ) -func setupX2ResetRequestHandlerTest(t *testing.T) (*X2ResetRequestHandler, *mocks.RmrMessengerMock, *mocks.RnibReaderMock){ +func setupX2ResetRequestHandlerTest(t *testing.T) (*X2ResetRequestHandler, *mocks.RmrMessengerMock, *mocks.RnibReaderMock) { 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 - } - rnibDataService := services.NewRnibDataService(log, config, readerProvider, writerProvider) + rnibDataService := services.NewRnibDataService(log, config, readerMock, writerMock) rmrMessengerMock := &mocks.RmrMessengerMock{} - rmrService := getRmrService(rmrMessengerMock, log) - handler := NewX2ResetRequestHandler(log, rmrService, rnibDataService) + rmrSender := getRmrSender(rmrMessengerMock, log) + handler := NewX2ResetRequestHandler(log, rmrSender, rnibDataService) return handler, rmrMessengerMock, readerMock } @@ -41,15 +53,16 @@ func TestHandleSuccessfulDefaultCause(t *testing.T) { ranName := "test1" // o&m intervention 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) + var xAction[]byte + var msgSrc unsafe.Pointer + msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_RESET, len(payload), ranName, &payload, &xAction, msgSrc) - rmrMessengerMock.On("SendMsg", msg, mock.Anything).Return(msg, nil) + rmrMessengerMock.On("SendMsg", msg, true).Return(msg, nil) var nodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED} readerMock.On("GetNodeb", ranName).Return(nodeb, nil) - actual := handler.Handle(models.ResetRequest{RanName: ranName}) + _, actual := handler.Handle(models.ResetRequest{RanName: ranName}) assert.Nil(t, actual) } @@ -59,14 +72,15 @@ func TestHandleSuccessfulRequestedCause(t *testing.T) { ranName := "test1" 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) - rmrMessengerMock.On("SendMsg", msg, mock.Anything).Return(msg, nil) + var xAction[]byte + var msgSrc unsafe.Pointer + msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_RESET, len(payload), ranName, &payload, &xAction, msgSrc) + rmrMessengerMock.On("SendMsg", msg, true).Return(msg, nil) var nodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED} readerMock.On("GetNodeb", ranName).Return(nodeb, nil) - actual := handler.Handle(models.ResetRequest{RanName: ranName, Cause: "protocol:transfer-syntax-error"}) + _, actual := handler.Handle(models.ResetRequest{RanName: ranName, Cause: "protocol:transfer-syntax-error"}) assert.Nil(t, actual) } @@ -78,7 +92,7 @@ func TestHandleFailureUnknownCause(t *testing.T) { var nodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED} readerMock.On("GetNodeb", ranName).Return(nodeb, nil) - actual := handler.Handle(models.ResetRequest{RanName: ranName, Cause: "XXX"}) + _, actual := handler.Handle(models.ResetRequest{RanName: ranName, Cause: "XXX"}) assert.IsType(t, e2managererrors.NewRequestValidationError(), actual) @@ -91,7 +105,7 @@ func TestHandleFailureWrongState(t *testing.T) { var nodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_DISCONNECTED} readerMock.On("GetNodeb", ranName).Return(nodeb, nil) - actual := handler.Handle(models.ResetRequest{RanName: ranName}) + _, actual := handler.Handle(models.ResetRequest{RanName: ranName}) assert.IsType(t, e2managererrors.NewWrongStateError(X2_RESET_ACTIVITY_NAME, entities.ConnectionStatus_name[int32(nodeb.ConnectionStatus)]), actual) } @@ -103,7 +117,7 @@ func TestHandleFailureRanNotFound(t *testing.T) { readerMock.On("GetNodeb", ranName).Return(&entities.NodebInfo{}, common.NewResourceNotFoundError("nodeb not found")) - actual := handler.Handle(models.ResetRequest{RanName: ranName}) + _, actual := handler.Handle(models.ResetRequest{RanName: ranName}) assert.IsType(t, e2managererrors.NewResourceNotFoundError(), actual) } @@ -115,7 +129,7 @@ func TestHandleFailureRnibError(t *testing.T) { readerMock.On("GetNodeb", ranName).Return(&entities.NodebInfo{}, common.NewInternalError(fmt.Errorf("internal error"))) - actual := handler.Handle(models.ResetRequest{RanName: ranName}) + _, actual := handler.Handle(models.ResetRequest{RanName: ranName}) assert.IsType(t, e2managererrors.NewRnibDbError(), actual) } @@ -126,14 +140,15 @@ func TestHandleFailureRmrError(t *testing.T) { ranName := "test1" // o&m intervention 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) - rmrMessengerMock.On("SendMsg", msg, mock.Anything).Return(&rmrCgo.MBuf{}, fmt.Errorf("rmr error")) + var xAction[]byte + var msgSrc unsafe.Pointer + msg := rmrCgo.NewMBuf(rmrCgo.RIC_X2_RESET, len(payload), ranName, &payload, &xAction, msgSrc) + rmrMessengerMock.On("SendMsg", msg, true).Return(&rmrCgo.MBuf{}, fmt.Errorf("rmr error")) var nodeb = &entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTED} readerMock.On("GetNodeb", ranName).Return(nodeb, nil) - actual := handler.Handle(models.ResetRequest{RanName: ranName}) + _, actual := handler.Handle(models.ResetRequest{RanName: ranName}) assert.IsType(t, e2managererrors.NewRmrError(), actual) }