From fd580e6657cc035f0167c70f356ef5dd9557fd0f Mon Sep 17 00:00:00 2001 From: pintar Date: Thu, 11 May 2017 08:40:44 +0000 Subject: [PATCH] correction due to error on E-RAB Release indication, E-RAB Modification indication --- ttcn3/LibS1AP/LibS1AP_Steps.ttcn | 4 +- ttcn3/LibS1AP/LibS1AP_Templates.ttcn | 78 +++++++++++++++++----------- 2 files changed, 50 insertions(+), 32 deletions(-) diff --git a/ttcn3/LibS1AP/LibS1AP_Steps.ttcn b/ttcn3/LibS1AP/LibS1AP_Steps.ttcn index 8ebe3ca..2e0efb4 100644 --- a/ttcn3/LibS1AP/LibS1AP_Steps.ttcn +++ b/ttcn3/LibS1AP/LibS1AP_Steps.ttcn @@ -157,13 +157,13 @@ module LibS1AP_Steps { function f_recv_E_RABReleaseIndication( template (present) RecordOf_ProtocolIE p_value := ? ) runs on S1APComponent { - f_recv_S1AP_successfulOutcome(mw_E_RABReleaseIndication_IE(p_value)) + f_recv_S1AP_successfulOutcome(mw_E_RABReleaseIndication(p_value)) } function f_recv_E_RABModificationIndication( template (present) RecordOf_ProtocolIE p_value := ? ) runs on S1APComponent { - f_recv_S1AP_successfulOutcome(mw_E_RABModificationIndication_IE(p_value)) + f_recv_S1AP_successfulOutcome(mw_E_RABModificationIndication(p_value)) } diff --git a/ttcn3/LibS1AP/LibS1AP_Templates.ttcn b/ttcn3/LibS1AP/LibS1AP_Templates.ttcn index 572cabb..7a32210 100644 --- a/ttcn3/LibS1AP/LibS1AP_Templates.ttcn +++ b/ttcn3/LibS1AP/LibS1AP_Templates.ttcn @@ -1414,6 +1414,18 @@ module LibS1AP_Templates { mw_eNB_UE_S1AP_ID(p_eNB_value, ignore), mw_E_RABToBeModifiedList(p_RecordOf_E_RABToBeModifyItem_value) } // End of template mw_E_RABSetupReqIEs + + /** + * @desc Receive template for InitiatingMessage E_RAB Modification Indication message + * @param p_value The expected protocol information elements. Default: ? + */ + template (present) InitiatingMessage mw_E_RABModificationIndication( + template (present) RecordOf_ProtocolIE p_value := ? + ) := { + procedureCode := id_E_RABModificationIndication, + criticality := reject, + value_ := { RecordOf_ProtocolIE :=p_value} + }// End of template mw_E_RABModificationIndication template (present) RecordOf_ProtocolIE mw_E_RABModificationIndicationIEs( template (present) MME_UE_S1AP_ID p_MME_value := ?, @@ -1534,18 +1546,6 @@ module LibS1AP_Templates { } // End of template mw_UserLocationInformation - - template (present) RecordOf_ProtocolIE mw_E_RABReleaseIndicationIEs( - template (present) MME_UE_S1AP_ID p_MME_value := ?, - template (present) ENB_UE_S1AP_ID p_eNB_value := ?, - template (present) RecordOf_E_RABItem p_RecordOf_E_RABItem_value := ?, - template (present) UserLocationInformation p_UserLocationInformation := ? - ) := { - mw_MME_UE_S1AP_ID(p_MME_value, ignore), - mw_eNB_UE_S1AP_ID(p_eNB_value, ignore), - mw_E_RABReleaseList(p_RecordOf_E_RABItem_value), - mw_UserLocationInformation_IE(p_UserLocationInformation) - } /** * @desc Receive template for UserLocationInformation message @@ -2620,7 +2620,7 @@ module LibS1AP_Templates { /** * @desc Receive messages for Handover Notification Procedure */ - group HandoverNotification_receive { + group HandoverNotification { /** * @desc Receive template for InitiatingMessage message with HANDOVER_NOTIFY payload @@ -2653,7 +2653,41 @@ module LibS1AP_Templates { mw_tAI_IE(p_tai) } // End of template mw_HandoverNotifyIEs - } // End of group HandoverNotification_receive + } // End of group HandoverNotification + + /** + * @desc Receive messages for E_RAB Release Indication + */ + group E_RABReleaseIndication { + + /** + * @desc Receive template for InitiatingMessage message with E_RAB Release Indication payload + * @param p_value Expected protocol information elements. Default: ? + */ + template (present) InitiatingMessage mw_E_RABReleaseIndication( + template (present) RecordOf_ProtocolIE p_value := ? + ) := { + procedureCode := id_E_RABReleaseIndication, + criticality := ignore, + value_ := { RecordOf_ProtocolIE :=p_value} + }// End of template mw_E_RABReleaseIndication + + /** + * @desc Receive template for E_RABReleaseIndication message + */ + template (present) RecordOf_ProtocolIE mw_E_RABReleaseIndicationIEs( + template (present) MME_UE_S1AP_ID p_MME_value := ?, + template (present) ENB_UE_S1AP_ID p_eNB_value := ?, + template (present) RecordOf_E_RABItem p_RecordOf_E_RABItem_value := ?, + template (present) UserLocationInformation p_UserLocationInformation := ? + ) := { + mw_MME_UE_S1AP_ID(p_MME_value), + mw_eNB_UE_S1AP_ID(p_eNB_value), + mw_E_RABReleaseList(p_RecordOf_E_RABItem_value), + mw_UserLocationInformation_IE(p_UserLocationInformation) + } // End of template mw_E_RABReleaseIndicationIEs + + } // End of group E_RABReleaseIndication /** * @desc Receive messages for Error Indication Procedures @@ -5606,14 +5640,6 @@ module LibS1AP_Templates { value_ := {CSGMembershipInfo := p_value} } // End of template mw_cSGMembershipInfoIE - template (present) ProtocolIE mw_E_RABModificationIndication_IE( - template (present) RecordOf_ProtocolIE p_value := ? - ) := { - id := S1AP_Constants.id_E_RABModificationIndication, - criticality := reject, - value_ := { RecordOf_ProtocolIE :=p_value} - } - template (present) ProtocolIE mw_E_RABModifiedListModIndIE( template (present) RecordOf_E_RABToBeModifiedItemBearerModInd p_value := ? ) := { @@ -5646,14 +5672,6 @@ module LibS1AP_Templates { criticality := reject, value_ := {RecordOf_ProtocolIE := p_value} } // End of template mw_E_RABResponse - - template (present) ProtocolIE mw_E_RABReleaseIndication_IE( - template (present) RecordOf_ProtocolIE p_value := ? - ) := { - id := S1AP_Constants.id_E_RABReleaseIndication, - criticality := ignore, - value_ := { RecordOf_ProtocolIE :=p_value} - } /**