[RIC-431] REDESIGN - Add RanListManager methods | Add/Update RnibWriter methods

[ric-plt/e2mgr.git] / E2Manager / handlers / rmrmsghandlers / setup_response_notification_handler_test.go

diff --git a/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler_test.go b/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler_test.go
index f4bfd63..b401cbb 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler_test.go
+++ b/E2Manager/handlers/rmrmsghandlers/setup_response_notification_handler_test.go
@@ -40,6 +40,7 @@ import (
        "github.com/stretchr/testify/assert"
        "github.com/stretchr/testify/mock"
        "testing"
+       "unsafe"
 )
 
 const (
@@ -142,14 +143,13 @@ func executeHandleSetupSuccessResponse(t *testing.T, tc setupSuccessResponseTest
 
        nodebInfo := &entities.NodebInfo{
                ConnectionStatus:   entities.ConnectionStatus_CONNECTING,
-               ConnectionAttempts: 1,
                RanName:            RanName,
                Ip:                 "10.0.2.2",
                Port:               1231,
        }
 
        testContext.readerMock.On("GetNodeb", RanName).Return(nodebInfo, rnibErr)
-       testContext.writerMock.On("SaveNodeb", mock.Anything, mock.Anything).Return(tc.saveNodebMockError)
+       testContext.writerMock.On("SaveNodeb", mock.Anything).Return(tc.saveNodebMockError)
        testContext.rmrMessengerMock.On("SendMsg", tc.statusChangeMbuf, true).Return(&rmrCgo.MBuf{}, tc.sendMsgError)
        handler.Handle(&notificationRequest)
 
@@ -160,7 +160,8 @@ func getRanConnectedMbuf(nodeType entities.Node_Type) *rmrCgo.MBuf {
        var xAction []byte
        resourceStatusPayload := models.NewResourceStatusPayload(nodeType, enums.RIC_TO_RAN)
        resourceStatusJson, _ := json.Marshal(resourceStatusPayload)
-       return rmrCgo.NewMBuf(rmrCgo.RAN_CONNECTED, len(resourceStatusJson), RanName, &resourceStatusJson, &xAction)
+       var msgSrc unsafe.Pointer
+       return rmrCgo.NewMBuf(rmrCgo.RAN_CONNECTED, len(resourceStatusJson), RanName, &resourceStatusJson, &xAction, msgSrc)
 }
 
 func executeHandleSetupFailureResponse(t *testing.T, tc setupFailureResponseTestCase) (*setupResponseTestContext, *entities.NodebInfo) {
@@ -179,14 +180,13 @@ func executeHandleSetupFailureResponse(t *testing.T, tc setupFailureResponseTest
 
        nodebInfo := &entities.NodebInfo{
                ConnectionStatus:   entities.ConnectionStatus_CONNECTING,
-               ConnectionAttempts: 1,
                RanName:            RanName,
                Ip:                 "10.0.2.2",
                Port:               1231,
        }
 
        testContext.readerMock.On("GetNodeb", RanName).Return(nodebInfo, rnibErr)
-       testContext.writerMock.On("SaveNodeb", mock.Anything, mock.Anything).Return(tc.saveNodebMockError)
+       testContext.writerMock.On("SaveNodeb", mock.Anything).Return(tc.saveNodebMockError)
        handler.Handle(&notificationRequest)
 
        return testContext, nodebInfo
@@ -207,9 +207,8 @@ func TestX2SetupResponse(t *testing.T) {
 
        testContext, nodebInfo := executeHandleSetupSuccessResponse(t, tc)
        testContext.readerMock.AssertCalled(t, "GetNodeb", RanName)
-       testContext.writerMock.AssertCalled(t, "SaveNodeb", mock.Anything, nodebInfo)
+       testContext.writerMock.AssertCalled(t, "SaveNodeb", nodebInfo)
        assert.EqualValues(t, entities.ConnectionStatus_CONNECTED, nodebInfo.ConnectionStatus)
-       assert.EqualValues(t, 0, nodebInfo.ConnectionAttempts)
        assert.EqualValues(t, entities.Node_ENB, nodebInfo.NodeType)
 
        assert.IsType(t, &entities.NodebInfo_Enb{}, nodebInfo.Configuration)
@@ -230,9 +229,8 @@ func TestX2SetupFailureResponse(t *testing.T) {
 
        testContext, nodebInfo := executeHandleSetupFailureResponse(t, tc)
        testContext.readerMock.AssertCalled(t, "GetNodeb", RanName)
-       testContext.writerMock.AssertCalled(t, "SaveNodeb", mock.Anything, nodebInfo)
+       testContext.writerMock.AssertCalled(t, "SaveNodeb", nodebInfo)
        assert.EqualValues(t, entities.ConnectionStatus_CONNECTED_SETUP_FAILED, nodebInfo.ConnectionStatus)
-       assert.EqualValues(t, 0, nodebInfo.ConnectionAttempts)
        assert.EqualValues(t, entities.Failure_X2_SETUP_FAILURE, nodebInfo.FailureType)
        assert.NotNil(t, nodebInfo.SetupFailure)
        testContext.rmrMessengerMock.AssertNotCalled(t, "SendMsg")
@@ -253,9 +251,8 @@ func TestEndcSetupResponse(t *testing.T) {
 
        testContext, nodebInfo := executeHandleSetupSuccessResponse(t, tc)
        testContext.readerMock.AssertCalled(t, "GetNodeb", RanName)
-       testContext.writerMock.AssertCalled(t, "SaveNodeb", mock.Anything, nodebInfo)
+       testContext.writerMock.AssertCalled(t, "SaveNodeb", nodebInfo)
        assert.EqualValues(t, entities.ConnectionStatus_CONNECTED, nodebInfo.ConnectionStatus)
-       assert.EqualValues(t, 0, nodebInfo.ConnectionAttempts)
        assert.EqualValues(t, entities.Node_GNB, nodebInfo.NodeType)
        assert.IsType(t, &entities.NodebInfo_Gnb{}, nodebInfo.Configuration)
 
@@ -276,9 +273,8 @@ func TestEndcSetupFailureResponse(t *testing.T) {
 
        testContext, nodebInfo := executeHandleSetupFailureResponse(t, tc)
        testContext.readerMock.AssertCalled(t, "GetNodeb", RanName)
-       testContext.writerMock.AssertCalled(t, "SaveNodeb", mock.Anything, nodebInfo)
+       testContext.writerMock.AssertCalled(t, "SaveNodeb", nodebInfo)
        assert.EqualValues(t, entities.ConnectionStatus_CONNECTED_SETUP_FAILED, nodebInfo.ConnectionStatus)
-       assert.EqualValues(t, 0, nodebInfo.ConnectionAttempts)
        assert.EqualValues(t, entities.Failure_ENDC_X2_SETUP_FAILURE, nodebInfo.FailureType)
        assert.NotNil(t, nodebInfo.SetupFailure)
        testContext.rmrMessengerMock.AssertNotCalled(t, "SendMsg")
@@ -291,7 +287,7 @@ func TestSetupResponseInvalidPayload(t *testing.T) {
        testContext := NewSetupResponseTestContext(nil)
        handler := NewSetupResponseNotificationHandler(testContext.logger, testContext.rnibDataService, managers.NewX2SetupResponseManager(converters.NewX2SetupResponseConverter(logger)), testContext.ranStatusChangeManager, rmrCgo.RIC_X2_SETUP_RESP)
        var rnibErr error
-       testContext.readerMock.On("GetNodeb", ranName).Return(&entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING, ConnectionAttempts: 1}, rnibErr)
+       testContext.readerMock.On("GetNodeb", ranName).Return(&entities.NodebInfo{ConnectionStatus: entities.ConnectionStatus_CONNECTING}, rnibErr)
        handler.Handle(&notificationRequest)
        testContext.readerMock.AssertCalled(t, "GetNodeb", ranName)
        testContext.writerMock.AssertNotCalled(t, "SaveNodeb")
@@ -313,7 +309,7 @@ func TestSetupResponseSaveNodebFailure(t *testing.T) {
 
        testContext, nodebInfo := executeHandleSetupSuccessResponse(t, tc)
        testContext.readerMock.AssertCalled(t, "GetNodeb", RanName)
-       testContext.writerMock.AssertCalled(t, "SaveNodeb", mock.Anything, nodebInfo)
+       testContext.writerMock.AssertCalled(t, "SaveNodeb", nodebInfo)
        testContext.rmrMessengerMock.AssertNotCalled(t, "SendMsg")
 }
 
@@ -332,9 +328,8 @@ func TestSetupResponseStatusChangeSendFailure(t *testing.T) {
 
        testContext, nodebInfo := executeHandleSetupSuccessResponse(t, tc)
        testContext.readerMock.AssertCalled(t, "GetNodeb", RanName)
-       testContext.writerMock.AssertCalled(t, "SaveNodeb", mock.Anything, nodebInfo)
+       testContext.writerMock.AssertCalled(t, "SaveNodeb", nodebInfo)
        assert.EqualValues(t, entities.ConnectionStatus_CONNECTED, nodebInfo.ConnectionStatus)
-       assert.EqualValues(t, 0, nodebInfo.ConnectionAttempts)
        assert.EqualValues(t, entities.Node_ENB, nodebInfo.NodeType)
 
        assert.IsType(t, &entities.NodebInfo_Enb{}, nodebInfo.Configuration)