Merge "merge of Natalia - change rnib errors"

diff --git a/E2Manager/e2pdus/x2_reset_known_causes_test.go b/E2Manager/e2pdus/x2_reset_known_causes_test.go
index 449cbbf..0974e6f 100644 (file)
--- a/E2Manager/e2pdus/x2_reset_known_causes_test.go
+++ b/E2Manager/e2pdus/x2_reset_known_causes_test.go
@@ -95,7 +95,7 @@ func TestPrepareX2ResetPDUsFailure(t *testing.T) {
                t.Errorf("want: error, got: success.\n")
        }
 
-       expected := "#x2_reset_known_causes.prepareX2ResetPDUs - failed to build and pack the reset message #src/asn1codec_utils.c.pack_pdu_aux - Encoded output of E2AP-PDU, is too big:"
+       expected := "failed to build and pack the reset message #src/asn1codec_utils.c.pack_pdu_aux - Encoded output of E2AP-PDU, is too big:"
        if !strings.Contains(err.Error(), expected) {
                t.Errorf("want :[%s], got: [%s]\n", expected, err)
        }

diff --git a/E2Manager/handlers/endc_x2Setup_failure_response_notification_handler.go b/E2Manager/handlers/endc_x2Setup_failure_response_notification_handler.go
index cfbb500..d987a34 100644 (file)
--- a/E2Manager/handlers/endc_x2Setup_failure_response_notification_handler.go
+++ b/E2Manager/handlers/endc_x2Setup_failure_response_notification_handler.go
@@ -45,7 +45,9 @@ func (src EndcX2SetupFailureResponseNotificationHandler) Handle(logger *logger.L
                        nb := &entities.NodebInfo{}
                        nbIdentity := &entities.NbIdentity{}
 
+                       nb.RanName = e2session.Request.RanName
                        nb.ConnectionStatus = entities.ConnectionStatus_CONNECTED_SETUP_FAILED
+                       nb.E2ApplicationProtocol = entities.E2ApplicationProtocol_ENDC_X2_SETUP_REQUEST
                        nb.Ip = e2session.Request.RanIp
                        nb.Port = uint32(e2session.Request.RanPort)
                        nb.SetupFailure = failureResponse

diff --git a/E2Manager/handlers/x2Setup_failure_response_notification_handler.go b/E2Manager/handlers/x2Setup_failure_response_notification_handler.go
index fb9c602..2994851 100644 (file)
--- a/E2Manager/handlers/x2Setup_failure_response_notification_handler.go
+++ b/E2Manager/handlers/x2Setup_failure_response_notification_handler.go
@@ -44,7 +44,9 @@ func (src X2SetupFailureResponseNotificationHandler) Handle(logger *logger.Logge
                        nb := &entities.NodebInfo{}
                        nbIdentity := &entities.NbIdentity{}
 
+                       nb.RanName = e2session.Request.RanName
                        nb.ConnectionStatus = entities.ConnectionStatus_CONNECTED_SETUP_FAILED
+                       nb.E2ApplicationProtocol = entities.E2ApplicationProtocol_X2_SETUP_REQUEST
                        nb.Ip = e2session.Request.RanIp
                        nb.Port = uint32(e2session.Request.RanPort)
                        nb.SetupFailure = failureResponse