[RIC-436] Fix E2 Setup Response population

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

diff --git a/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler_test.go b/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler_test.go
index 6421bf9..8712194 100644 (file)
--- a/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler_test.go
+++ b/E2Manager/handlers/rmrmsghandlers/e2_setup_request_notification_handler_test.go
@@ -20,6 +20,7 @@
 package rmrmsghandlers
 
 import (
+       "bytes"
        "e2mgr/configuration"
        "e2mgr/managers"
        "e2mgr/mocks"
@@ -27,9 +28,11 @@ import (
        "e2mgr/rmrCgo"
        "e2mgr/services"
        "e2mgr/tests"
+       "encoding/xml"
        "errors"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/common"
        "gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/entities"
+       "github.com/golang/protobuf/ptypes/wrappers"
        "github.com/stretchr/testify/assert"
        "github.com/stretchr/testify/mock"
        "io/ioutil"
@@ -38,36 +41,71 @@ import (
 )
 
 const (
-       prefix = "10.0.2.15:9999|"
-       e2tInstanceFullAddress = "10.0.2.15:9999"
-       nodebRanName = "gnb:310-410-b5c67788"
+       prefix                   = "10.0.2.15:9999|"
+       e2tInstanceFullAddress   = "10.0.2.15:9999"
+       nodebRanName             = "gnb:310-410-b5c67788"
+       GnbSetupRequestXmlPath   = "../../tests/resources/setupRequest_gnb.xml"
+       EnGnbSetupRequestXmlPath = "../../tests/resources/setupRequest_en-gNB.xml"
+       NgEnbSetupRequestXmlPath = "../../tests/resources/setupRequest_ng-eNB.xml"
+       EnbSetupRequestXmlPath   = "../../tests/resources/setupRequest_enb.xml"
+       GnbWithoutFunctionsSetupRequestXmlPath   = "../../tests/resources/setupRequest_gnb_without_functions.xml"
 )
 
-func TestParseSetupRequest_Success(t *testing.T){
-       path, err :=filepath.Abs("../../tests/resources/setupRequest_gnb.xml")
+func readXmlFile(t *testing.T, xmlPath string) []byte {
+       path, err := filepath.Abs(xmlPath)
        if err != nil {
                t.Fatal(err)
        }
-       xmlGnb, err := ioutil.ReadFile(path)
+       xmlAsBytes, err := ioutil.ReadFile(path)
        if err != nil {
                t.Fatal(err)
        }
+
+       return xmlAsBytes
+}
+
+func TestParseGnbSetupRequest_Success(t *testing.T) {
+       xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath)
        handler, _, _, _, _, _ := initMocks(t)
        prefBytes := []byte(prefix)
        request, _, err := handler.parseSetupRequest(append(prefBytes, xmlGnb...))
-       assert.Equal(t, request.GetPlmnId(), "131014")
-       assert.Equal(t, request.GetNbId(), "10011001101010101011")
+       assert.Equal(t, "02F829", request.GetPlmnId())
+       assert.Equal(t, "001100000011000000110000", request.GetNbId())
+       assert.Nil(t, err)
 }
 
-func TestParseSetupRequest_PipFailure(t *testing.T){
-       path, err :=filepath.Abs("../../tests/resources/setupRequest_gnb.xml")
-       if err != nil {
-               t.Fatal(err)
-       }
-       xmlGnb, err := ioutil.ReadFile(path)
-       if err != nil {
-               t.Fatal(err)
-       }
+func TestParseEnGnbSetupRequest_Success(t *testing.T) {
+       enGnbXml := readXmlFile(t, EnGnbSetupRequestXmlPath)
+       handler, _, _, _, _, _ := initMocks(t)
+       prefBytes := []byte(prefix)
+       request, _, err := handler.parseSetupRequest(append(prefBytes, enGnbXml...))
+       assert.Equal(t, "131014", request.GetPlmnId())
+       assert.Equal(t, "11000101110001101100011111111000", request.GetNbId())
+       assert.Nil(t, err)
+}
+
+func TestParseNgEnbSetupRequest_Success(t *testing.T) {
+       ngEnbXml := readXmlFile(t, NgEnbSetupRequestXmlPath)
+       handler, _, _, _, _, _ := initMocks(t)
+       prefBytes := []byte(prefix)
+       request, _, err := handler.parseSetupRequest(append(prefBytes, ngEnbXml...))
+       assert.Equal(t, "131014", request.GetPlmnId())
+       assert.Equal(t, "101010101010101010", request.GetNbId())
+       assert.Nil(t, err)
+}
+
+func TestParseEnbSetupRequest_Success(t *testing.T) {
+       enbXml := readXmlFile(t, EnbSetupRequestXmlPath)
+       handler, _, _, _, _, _ := initMocks(t)
+       prefBytes := []byte(prefix)
+       request, _, err := handler.parseSetupRequest(append(prefBytes, enbXml...))
+       assert.Equal(t, "6359AB", request.GetPlmnId())
+       assert.Equal(t, "101010101010101010", request.GetNbId())
+       assert.Nil(t, err)
+}
+
+func TestParseSetupRequest_PipFailure(t *testing.T) {
+       xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath)
        handler, _, _, _, _, _ := initMocks(t)
        prefBytes := []byte("10.0.2.15:9999")
        request, _, err := handler.parseSetupRequest(append(prefBytes, xmlGnb...))
@@ -76,53 +114,59 @@ func TestParseSetupRequest_PipFailure(t *testing.T){
        assert.EqualError(t, err, "#E2SetupRequestNotificationHandler.parseSetupRequest - Error parsing E2 Setup Request failed extract Payload: no | separator found")
 }
 
-func TestParseSetupRequest_UnmarshalFailure(t *testing.T){
+func TestParseSetupRequest_UnmarshalFailure(t *testing.T) {
        handler, _, _, _, _, _ := initMocks(t)
        prefBytes := []byte(prefix)
-       request, _, err := handler.parseSetupRequest(append(prefBytes, 1,2,3))
+       request, _, err := handler.parseSetupRequest(append(prefBytes, 1, 2, 3))
        assert.Nil(t, request)
        assert.NotNil(t, err)
        assert.EqualError(t, err, "#E2SetupRequestNotificationHandler.parseSetupRequest - Error unmarshalling E2 Setup Request payload: 31302e302e322e31353a393939397c010203")
 }
 
 func TestE2SetupRequestNotificationHandler_HandleNewGnbSuccess(t *testing.T) {
-       path, err :=filepath.Abs("../../tests/resources/setupRequest_gnb.xml")
-       if err != nil {
-               t.Fatal(err)
-       }
-       xmlGnb, err := ioutil.ReadFile(path)
-       if err != nil {
-               t.Fatal(err)
-       }
+       xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath)
+       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t)
+       var e2tInstance = &entities.E2TInstance{}
+       e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(e2tInstance, nil)
+       var gnb *entities.NodebInfo
+       readerMock.On("GetNodeb", mock.Anything).Return(gnb, common.NewResourceNotFoundError("Not found"))
+       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append([]byte(prefix), xmlGnb...)}
+       nodebInfo := getExpectedNodebWithFunctionsForNewRan(notificationRequest.Payload)
+       writerMock.On("SaveNodeb", mock.Anything, nodebInfo).Return(nil)
+       routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(nil)
+       writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil)
+       e2tInstancesManagerMock.On("AddRansToInstance", mock.Anything, mock.Anything).Return(nil)
+       var errEmpty error
+       rmrMessage := &rmrCgo.MBuf{}
+       rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(rmrMessage, errEmpty)
+       handler.Handle(notificationRequest)
+       writerMock.AssertCalled(t, "SaveNodeb", mock.Anything, nodebInfo)
+       assertNewNodebSuccessCalls(readerMock, t, e2tInstancesManagerMock, writerMock, routingManagerClientMock, rmrMessengerMock)
+}
 
+func TestE2SetupRequestNotificationHandler_HandleNewGnbWithoutFunctionsSuccess(t *testing.T) {
+       xmlGnb := readXmlFile(t, GnbWithoutFunctionsSetupRequestXmlPath)
        handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t)
        var e2tInstance = &entities.E2TInstance{}
        e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(e2tInstance, nil)
        var gnb *entities.NodebInfo
        readerMock.On("GetNodeb", mock.Anything).Return(gnb, common.NewResourceNotFoundError("Not found"))
-       writerMock.On("SaveNodeb", mock.Anything, mock.Anything).Return(nil)
+       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append([]byte(prefix), xmlGnb...)}
+       nodebInfo := getExpectedNodebWithFunctionsForNewRan(notificationRequest.Payload)
+       writerMock.On("SaveNodeb", mock.Anything, nodebInfo).Return(nil)
        routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(nil)
        writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil)
        e2tInstancesManagerMock.On("AddRansToInstance", mock.Anything, mock.Anything).Return(nil)
        var errEmpty error
        rmrMessage := &rmrCgo.MBuf{}
        rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(rmrMessage, errEmpty)
-       prefBytes := []byte(prefix)
-       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append(prefBytes, xmlGnb...)}
        handler.Handle(notificationRequest)
+       writerMock.AssertCalled(t, "SaveNodeb", mock.Anything, nodebInfo)
        assertNewNodebSuccessCalls(readerMock, t, e2tInstancesManagerMock, writerMock, routingManagerClientMock, rmrMessengerMock)
 }
 
 func TestE2SetupRequestNotificationHandler_HandleNewEnGnbSuccess(t *testing.T) {
-       path, err :=filepath.Abs("../../tests/resources/setupRequest_en-gNB.xml")
-       if err != nil {
-               t.Fatal(err)
-       }
-       xmlEnGnb, err := ioutil.ReadFile(path)
-       if err != nil {
-               t.Fatal(err)
-       }
-
+       xmlEnGnb := readXmlFile(t, EnGnbSetupRequestXmlPath)
        handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t)
        var e2tInstance = &entities.E2TInstance{}
        e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(e2tInstance, nil)
@@ -142,15 +186,7 @@ func TestE2SetupRequestNotificationHandler_HandleNewEnGnbSuccess(t *testing.T) {
 }
 
 func TestE2SetupRequestNotificationHandler_HandleNewNgEnbSuccess(t *testing.T) {
-       path, err :=filepath.Abs("../../tests/resources/setupRequest_ng-eNB.xml")
-       if err != nil {
-               t.Fatal(err)
-       }
-       xmlEnGnb, err := ioutil.ReadFile(path)
-       if err != nil {
-               t.Fatal(err)
-       }
-
+       xmlNgEnb := readXmlFile(t, NgEnbSetupRequestXmlPath)
        handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t)
        var e2tInstance = &entities.E2TInstance{}
        e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(e2tInstance, nil)
@@ -164,54 +200,106 @@ func TestE2SetupRequestNotificationHandler_HandleNewNgEnbSuccess(t *testing.T) {
        rmrMessage := &rmrCgo.MBuf{}
        rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(rmrMessage, errEmpty)
        prefBytes := []byte(prefix)
-       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append(prefBytes, xmlEnGnb...)}
+       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append(prefBytes, xmlNgEnb...)}
        handler.Handle(notificationRequest)
        assertNewNodebSuccessCalls(readerMock, t, e2tInstancesManagerMock, writerMock, routingManagerClientMock, rmrMessengerMock)
 }
 
 func TestE2SetupRequestNotificationHandler_HandleExistingGnbSuccess(t *testing.T) {
-       path, err :=filepath.Abs("../../tests/resources/setupRequest_gnb.xml")
-       if err != nil {
-               t.Fatal(err)
-       }
-       xmlGnb, err := ioutil.ReadFile(path)
-       if err != nil {
-               t.Fatal(err)
-       }
+       xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath)
 
        handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t)
        var e2tInstance = &entities.E2TInstance{}
        e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(e2tInstance, nil)
        var gnb = &entities.NodebInfo{
-               RanName: nodebRanName,
+               RanName:                      nodebRanName,
                AssociatedE2TInstanceAddress: e2tInstanceFullAddress,
-               ConnectionStatus: entities.ConnectionStatus_CONNECTED,
-               NodeType: entities.Node_GNB,
-               Configuration: &entities.NodebInfo_Gnb{Gnb: &entities.Gnb{}},
+               ConnectionStatus:             entities.ConnectionStatus_CONNECTED,
+               NodeType:                     entities.Node_GNB,
+               Configuration:                &entities.NodebInfo_Gnb{Gnb: &entities.Gnb{}},
        }
        readerMock.On("GetNodeb", mock.Anything).Return(gnb, nil)
        routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(nil)
-       writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil)
+
+       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append([]byte(prefix), xmlGnb...)}
+       gnbToUpdate := getExpectedNodebWithFunctionsForExistingRan(*gnb, notificationRequest.Payload)
+       writerMock.On("UpdateNodebInfo", gnbToUpdate).Return(nil)
        e2tInstancesManagerMock.On("AddRansToInstance", mock.Anything, mock.Anything).Return(nil)
        var errEmpty error
-       rmrMessage := &rmrCgo.MBuf{}
-       rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(rmrMessage, errEmpty)
-       prefBytes := []byte(prefix)
-       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append(prefBytes, xmlGnb...)}
+       rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(&rmrCgo.MBuf{}, errEmpty)
        handler.Handle(notificationRequest)
+       writerMock.AssertCalled(t, "UpdateNodebInfo", gnbToUpdate)
        assertExistingNodebSuccessCalls(readerMock, t, e2tInstancesManagerMock, writerMock, routingManagerClientMock, rmrMessengerMock)
 }
 
-func TestE2SetupRequestNotificationHandler_HandleParseError(t *testing.T) {
-       path, err :=filepath.Abs("../../tests/resources/setupRequest_gnb.xml")
-       if err != nil {
-               t.Fatal(err)
+func TestE2SetupRequestNotificationHandler_HandleExistingGnbWithFunctionsSuccess(t *testing.T) {
+       xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath)
+
+       handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t)
+       var e2tInstance = &entities.E2TInstance{}
+       e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(e2tInstance, nil)
+       var gnb = &entities.NodebInfo{
+               RanName:                      nodebRanName,
+               AssociatedE2TInstanceAddress: e2tInstanceFullAddress,
+               ConnectionStatus:             entities.ConnectionStatus_CONNECTED,
+               NodeType:                     entities.Node_GNB,
+               Configuration:                &entities.NodebInfo_Gnb{Gnb: &entities.Gnb{RanFunctions: []*entities.RanFunction{
+                       {
+                               RanFunctionId: &wrappers.UInt32Value{Value:2},
+                               RanFunctionRevision: &wrappers.UInt32Value{Value:2},
+                       },
+               }}},
        }
-       xmlGnb, err := ioutil.ReadFile(path)
-       if err != nil {
-               t.Fatal(err)
+       readerMock.On("GetNodeb", mock.Anything).Return(gnb, nil)
+       routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(nil)
+
+       notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append([]byte(prefix), xmlGnb...)}
+       gnbToUpdate := getExpectedNodebWithFunctionsForExistingRan(*gnb, notificationRequest.Payload)
+
+       writerMock.On("UpdateNodebInfo", gnbToUpdate).Return(nil)
+       e2tInstancesManagerMock.On("AddRansToInstance", mock.Anything, mock.Anything).Return(nil)
+       var errEmpty error
+       rmrMessengerMock.On("SendMsg", mock.Anything, mock.Anything).Return(&rmrCgo.MBuf{}, errEmpty)
+       handler.Handle(notificationRequest)
+       writerMock.AssertCalled(t, "UpdateNodebInfo", gnbToUpdate)
+       assertExistingNodebSuccessCalls(readerMock, t, e2tInstancesManagerMock, writerMock, routingManagerClientMock, rmrMessengerMock)
+}
+
+func getExpectedNodebWithFunctionsForExistingRan(nodeb entities.NodebInfo , payload []byte) *entities.NodebInfo {
+       pipInd := bytes.IndexByte(payload, '|')
+       setupRequest := &models.E2SetupRequestMessage{}
+       _ = xml.Unmarshal(normalizeXml(payload[pipInd+1:]), &setupRequest.E2APPDU)
+       nodeb.GetGnb().RanFunctions = setupRequest.ExtractRanFunctionsList()
+       return &nodeb
+}
+
+func getExpectedNodebWithFunctionsForNewRan(payload []byte) *entities.NodebInfo {
+       pipInd := bytes.IndexByte(payload, '|')
+       setupRequest := &models.E2SetupRequestMessage{}
+       _ = xml.Unmarshal(normalizeXml(payload[pipInd+1:]), &setupRequest.E2APPDU)
+
+       nodeb := &entities.NodebInfo{
+               AssociatedE2TInstanceAddress: e2tInstanceFullAddress,
+               ConnectionStatus:             entities.ConnectionStatus_CONNECTED,
+               RanName:                      nodebRanName,
+               NodeType:                     entities.Node_GNB,
+               Configuration:                &entities.NodebInfo_Gnb{
+                       Gnb: &entities.Gnb{
+                               RanFunctions: setupRequest.ExtractRanFunctionsList(),
+                       },
+               },
+               GlobalNbId:                   &entities.GlobalNbId{
+                       PlmnId: setupRequest.GetPlmnId(),
+                       NbId:   setupRequest.GetNbId(),
+               },
        }
 
+       return nodeb
+}
+
+func TestE2SetupRequestNotificationHandler_HandleParseError(t *testing.T) {
+       xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath)
+
        handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t)
        prefBytes := []byte("invalid_prefix")
        notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append(prefBytes, xmlGnb...)}
@@ -238,17 +326,9 @@ func TestE2SetupRequestNotificationHandler_HandleUnmarshalError(t *testing.T) {
 }
 
 func TestE2SetupRequestNotificationHandler_HandleGetE2TInstanceError(t *testing.T) {
-       path, err :=filepath.Abs("../../tests/resources/setupRequest_gnb.xml")
-       if err != nil {
-               t.Fatal(err)
-       }
-       xmlGnb, err := ioutil.ReadFile(path)
-       if err != nil {
-               t.Fatal(err)
-       }
-
+       xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath)
        handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t)
-       var e2tInstance * entities.E2TInstance
+       var e2tInstance *entities.E2TInstance
        e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(e2tInstance, common.NewResourceNotFoundError("Not found"))
        prefBytes := []byte(prefix)
        notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append(prefBytes, xmlGnb...)}
@@ -263,14 +343,8 @@ func TestE2SetupRequestNotificationHandler_HandleGetE2TInstanceError(t *testing.
 }
 
 func TestE2SetupRequestNotificationHandler_HandleGetNodebError(t *testing.T) {
-       path, err :=filepath.Abs("../../tests/resources/setupRequest_gnb.xml")
-       if err != nil {
-               t.Fatal(err)
-       }
-       xmlGnb, err := ioutil.ReadFile(path)
-       if err != nil {
-               t.Fatal(err)
-       }
+       xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath)
+
        handler, readerMock, writerMock, routingManagerClientMock, e2tInstancesManagerMock, rmrMessengerMock := initMocks(t)
        var e2tInstance = &entities.E2TInstance{}
        e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(e2tInstance, nil)
@@ -289,14 +363,7 @@ func TestE2SetupRequestNotificationHandler_HandleGetNodebError(t *testing.T) {
 }
 
 func TestE2SetupRequestNotificationHandler_HandleAssociationError(t *testing.T) {
-       path, err :=filepath.Abs("../../tests/resources/setupRequest_gnb.xml")
-       if err != nil {
-               t.Fatal(err)
-       }
-       xmlGnb, err := ioutil.ReadFile(path)
-       if err != nil {
-               t.Fatal(err)
-       }
+       xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath)
 
        handler, readerMock, writerMock, rmrMessengerMock, e2tInstancesManagerMock, routingManagerClientMock := initMocks(t)
        var e2tInstance = &entities.E2TInstance{}
@@ -305,7 +372,11 @@ func TestE2SetupRequestNotificationHandler_HandleAssociationError(t *testing.T)
        readerMock.On("GetNodeb", mock.Anything).Return(gnb, common.NewResourceNotFoundError("Not found"))
        writerMock.On("SaveNodeb", mock.Anything, mock.Anything).Return(nil)
        writerMock.On("UpdateNodebInfo", mock.Anything).Return(nil)
+       e2tInstancesManagerMock.On("AddRansToInstance", mock.Anything, mock.Anything).Return(nil)
        routingManagerClientMock.On("AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything).Return(errors.New("association error"))
+       var errEmpty error
+       rmrMessage := &rmrCgo.MBuf{}
+       rmrMessengerMock.On("WhSendMsg", mock.Anything, mock.Anything).Return(rmrMessage, errEmpty)
 
        prefBytes := []byte(prefix)
        notificationRequest := &models.NotificationRequest{RanName: nodebRanName, Payload: append(prefBytes, xmlGnb...)}
@@ -316,25 +387,16 @@ func TestE2SetupRequestNotificationHandler_HandleAssociationError(t *testing.T)
        routingManagerClientMock.AssertCalled(t, "AssociateRanToE2TInstance", e2tInstanceFullAddress, mock.Anything)
        writerMock.AssertCalled(t, "UpdateNodebInfo", mock.Anything)
        e2tInstancesManagerMock.AssertNotCalled(t, "AddRansToInstance", mock.Anything, mock.Anything)
-       rmrMessengerMock.AssertNotCalled(t, "SendMsg", mock.Anything, mock.Anything)
+       rmrMessengerMock.AssertCalled(t, "WhSendMsg", mock.Anything, mock.Anything)
 }
 
-
-func TestE2SetupRequestNotificationHandler_ConvertTo20BitStringError(t *testing.T){
-
-       path, err :=filepath.Abs("../../tests/resources/setupRequest_en-gNB.xml")
-       if err != nil {
-               t.Fatal(err)
-       }
-       xmlEnGnb, err := ioutil.ReadFile(path)
-       if err != nil {
-               t.Fatal(err)
-       }
+func TestE2SetupRequestNotificationHandler_ConvertTo20BitStringError(t *testing.T) {
+       xmlEnGnb := readXmlFile(t, EnGnbSetupRequestXmlPath)
        logger := tests.InitLog(t)
        config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3, GlobalRicId: struct {
                PlmnId      string
                RicNearRtId string
-       }{PlmnId : "131014", RicNearRtId: "10011001101010101011"}}
+       }{PlmnId: "131014", RicNearRtId: "10011001101010101011"}}
        rmrMessengerMock := &mocks.RmrMessengerMock{}
        rmrSender := tests.InitRmrSender(rmrMessengerMock, logger)
        readerMock := &mocks.RnibReaderMock{}
@@ -369,17 +431,9 @@ func TestE2SetupRequestNotificationHandler_ConvertTo20BitStringError(t *testing.
 }
 
 func TestE2SetupRequestNotificationHandler_HandleExistingGnbInvalidStatusError(t *testing.T) {
-       path, err :=filepath.Abs("../../tests/resources/setupRequest_gnb.xml")
-       if err != nil {
-               t.Fatal(err)
-       }
-       xmlGnb, err := ioutil.ReadFile(path)
-       if err != nil {
-               t.Fatal(err)
-       }
-
+       xmlGnb := readXmlFile(t, GnbSetupRequestXmlPath)
        handler, readerMock, writerMock, routingManagerClientMock, e2tInstancesManagerMock, rmrMessengerMock := initMocks(t)
-       var gnb = &entities.NodebInfo{RanName: nodebRanName, ConnectionStatus:entities.ConnectionStatus_SHUTTING_DOWN}
+       var gnb = &entities.NodebInfo{RanName: nodebRanName, ConnectionStatus: entities.ConnectionStatus_SHUTTING_DOWN}
        readerMock.On("GetNodeb", mock.Anything).Return(gnb, nil)
        var e2tInstance = &entities.E2TInstance{}
        e2tInstancesManagerMock.On("GetE2TInstance", e2tInstanceFullAddress).Return(e2tInstance, nil)
@@ -400,7 +454,7 @@ func initMocks(t *testing.T) (E2SetupRequestNotificationHandler, *mocks.RnibRead
        config := &configuration.Configuration{RnibRetryIntervalMs: 10, MaxRnibConnectionAttempts: 3, GlobalRicId: struct {
                PlmnId      string
                RicNearRtId string
-       }{PlmnId : "131014", RicNearRtId: "556670"}}
+       }{PlmnId: "131014", RicNearRtId: "556670"}}
        rmrMessengerMock := &mocks.RmrMessengerMock{}
        rmrSender := tests.InitRmrSender(rmrMessengerMock, logger)
        readerMock := &mocks.RnibReaderMock{}
@@ -431,4 +485,4 @@ func assertExistingNodebSuccessCalls(readerMock *mocks.RnibReaderMock, t *testin
        writerMock.AssertCalled(t, "UpdateNodebInfo", mock.Anything)
        e2tInstancesManagerMock.AssertCalled(t, "AddRansToInstance", mock.Anything, mock.Anything)
        rmrMessengerMock.AssertCalled(t, "SendMsg", mock.Anything, mock.Anything)
-}
\ No newline at end of file
+}