From 71c0b439f99dc6273b064253877e8561e80965ab Mon Sep 17 00:00:00 2001 From: garciay Date: Mon, 27 Mar 2017 07:18:34 +0000 Subject: [PATCH] STF519: Week #12, Update TestControl module --- ttcn3/LibS1AP/LibS1AP_Steps.ttcn | 310 +++++++++++++-------------- ttcn3/LibS1AP/LibS1AP_Templates.ttcn | 4 +- ttcn3/S1AP_TCFunctions.ttcn | 12 +- ttcn3/S1AP_TestControl.ttcn | 23 ++ 4 files changed, 186 insertions(+), 163 deletions(-) diff --git a/ttcn3/LibS1AP/LibS1AP_Steps.ttcn b/ttcn3/LibS1AP/LibS1AP_Steps.ttcn index 1e6f5fd..bb5b22e 100644 --- a/ttcn3/LibS1AP/LibS1AP_Steps.ttcn +++ b/ttcn3/LibS1AP/LibS1AP_Steps.ttcn @@ -158,15 +158,15 @@ module LibS1AP_Steps { f_recv_S1AP_successfulOutcome(mw_E_RABSetupResponse(p_value)) } // End of f_recv_E_RABSetupResponse - /** - * @desc Receive S1AP Message E_RABModifiedResponse - * @param p_value Receive template for E_RABModifiedResponse IEs - */ - function f_recv_E_RABModifiedResponse( - template (present) RecordOf_ProtocolIE p_value := ? - ) runs on S1APComponent { - f_recv_S1AP_successfulOutcome(mw_E_RABModifiedResponse(p_value)) - } // End of f_recv_E_RABModifiedResponse + /** + * @desc Receive S1AP Message E_RABModifiedResponse + * @param p_value Receive template for E_RABModifiedResponse IEs + */ + function f_recv_E_RABModifiedResponse( + template (present) RecordOf_ProtocolIE p_value := ? + ) runs on S1APComponent { + f_recv_S1AP_successfulOutcome(mw_E_RABModifiedResponse(p_value)) + } // End of f_recv_E_RABModifiedResponse /** * @desc Receive S1AP Message Handover Required @@ -196,15 +196,15 @@ module LibS1AP_Steps { f_recv_S1AP_successfulOutcome(mw_InitialContextSetupResponse(p_value)) } // End of f_recv_InitialContext_SetupResponse - /** - * @desc Receive S1AP Message InitialContext_SetupRequest - * @param p_value Receive template for InitialContext_SetupRequest IEs - */ - function f_recv_InitialContext_SetupRequest( - template (present) RecordOf_ProtocolIE p_value := ? - ) runs on S1APComponent { - f_recv_S1AP_successfulOutcome(mw_InitialContextSetupRequest(p_value)) - } // End of f_recv_InitialContext_SetupRequest + /** + * @desc Receive S1AP Message InitialContext_SetupRequest + * @param p_value Receive template for InitialContext_SetupRequest IEs + */ + function f_recv_InitialContext_SetupRequest( + template (present) RecordOf_ProtocolIE p_value := ? + ) runs on S1APComponent { + f_recv_S1AP_successfulOutcome(mw_InitialContextSetupRequest(p_value)) + } // End of f_recv_InitialContext_SetupRequest /** * @desc Receive S1AP Message INITIAL UE MESSAGE @@ -652,72 +652,72 @@ module LibS1AP_Steps { f_recv_S1AP_initiatingMessage(mw_UplinkNonUEAssociatedLppaTransport(p_value)) } // End of f_recv_Uplink_Non_UE_Associated_Lppa_Transport - /** - * @desc Receive S1AP Message HANDOVER_REQUIRED - * @param p_value Receive template for UPLINK_NON_UE_ASSOCIATED_LPPA_TRANSPORT IEs - * @see ETSI TS 136 413 V13.4.0 Clause 9.1.5.1 HANDOVER_REQUIRED - */ - function f_recv_Handover_Required( - template (present) RecordOf_ProtocolIE p_value := ? - ) runs on S1APComponent { - // TODO - } // End of f_recv_Uplink_Non_UE_Associated_Lppa_Transport + /** + * @desc Receive S1AP Message HANDOVER_REQUIRED + * @param p_value Receive template for UPLINK_NON_UE_ASSOCIATED_LPPA_TRANSPORT IEs + * @see ETSI TS 136 413 V13.4.0 Clause 9.1.5.1 HANDOVER_REQUIRED + */ + function f_recv_Handover_Required( + template (present) RecordOf_ProtocolIE p_value := ? + ) runs on S1APComponent { + // TODO + } // End of f_recv_Uplink_Non_UE_Associated_Lppa_Transport - /** - * @desc Receive S1AP Message UE Context Release Request - * @param p_value Receive template for UE CONTEXT RELEASE REQUEST - * @see ETSI TS 136 413 V13.4.0 Clause 9.1.4.5 UE CONTEXT RELEASE REQUEST - */ - function f_recv_UE_Context_Release_Request( - template (present) RecordOf_ProtocolIE p_value := ? - ) runs on S1APComponent { - f_recv_S1AP_initiatingMessage(mw_UeContextReleaseRequest(p_value)) - } // End of f_recv_UE_Context_Release_Request + /** + * @desc Receive S1AP Message UE Context Release Request + * @param p_value Receive template for UE CONTEXT RELEASE REQUEST + * @see ETSI TS 136 413 V13.4.0 Clause 9.1.4.5 UE CONTEXT RELEASE REQUEST + */ + function f_recv_UE_Context_Release_Request( + template (present) RecordOf_ProtocolIE p_value := ? + ) runs on S1APComponent { + f_recv_S1AP_initiatingMessage(mw_UeContextReleaseRequest(p_value)) + } // End of f_recv_UE_Context_Release_Request - /** - * @desc Receive S1AP Message UE Context Release Complete - * @param p_value Receive template for UE CONTEXT RELEASE COMPLETE - * @see ETSI TS 136 413 V13.4.0 Clause 9.1.4.7 UE CONTEXT RELEASE COMPLETE - */ - function f_recv_UE_Context_Release_Complete( - template (present) RecordOf_ProtocolIE p_value := ? - ) runs on S1APComponent { - f_recv_S1AP_initiatingMessage(mw_UeContextReleaseComplete(p_value)) - } // End of f_recv_UE_Context_Release_Complete + /** + * @desc Receive S1AP Message UE Context Release Complete + * @param p_value Receive template for UE CONTEXT RELEASE COMPLETE + * @see ETSI TS 136 413 V13.4.0 Clause 9.1.4.7 UE CONTEXT RELEASE COMPLETE + */ + function f_recv_UE_Context_Release_Complete( + template (present) RecordOf_ProtocolIE p_value := ? + ) runs on S1APComponent { + f_recv_S1AP_initiatingMessage(mw_UeContextReleaseComplete(p_value)) + } // End of f_recv_UE_Context_Release_Complete - /** - * @desc Receive S1AP Message UE Context Release Command - * @param p_value Receive template for UE CONTEXT RELEASE COMMAND - * @see ETSI TS 136 413 V13.4.0 Clause 9.1.4.6 UE CONTEXT RELEASE COMMAND - */ - function f_recv_UE_Context_Release_Command( - template (present) RecordOf_ProtocolIE p_value := ? - ) runs on S1APComponent { - f_recv_S1AP_initiatingMessage(mw_UeContextReleaseCommand(p_value)) - } // End of f_recv_UE_Context_Release_Command + /** + * @desc Receive S1AP Message UE Context Release Command + * @param p_value Receive template for UE CONTEXT RELEASE COMMAND + * @see ETSI TS 136 413 V13.4.0 Clause 9.1.4.6 UE CONTEXT RELEASE COMMAND + */ + function f_recv_UE_Context_Release_Command( + template (present) RecordOf_ProtocolIE p_value := ? + ) runs on S1APComponent { + f_recv_S1AP_initiatingMessage(mw_UeContextReleaseCommand(p_value)) + } // End of f_recv_UE_Context_Release_Command - /** - * @desc Receive S1AP Message UE Context Modification Response - * @param p_value Receive template for UE CONTEXT MODIFICATION RESPONSE - * @see ETSI TS 136 413 V13.4.0 Clause 9.1.4.9 UE CONTEXT MODIFICATION RESPONSE - */ - function f_recv_UE_Context_Modification_Response( - template (present) RecordOf_ProtocolIE p_value := ? - ) runs on S1APComponent { - f_recv_S1AP_initiatingMessage(mw_UeContextModificationResponse(p_value)) - } // End of f_recv_UE_Context_Modification_Response + /** + * @desc Receive S1AP Message UE Context Modification Response + * @param p_value Receive template for UE CONTEXT MODIFICATION RESPONSE + * @see ETSI TS 136 413 V13.4.0 Clause 9.1.4.9 UE CONTEXT MODIFICATION RESPONSE + */ + function f_recv_UE_Context_Modification_Response( + template (present) RecordOf_ProtocolIE p_value := ? + ) runs on S1APComponent { + f_recv_S1AP_initiatingMessage(mw_UeContextModificationResponse(p_value)) + } // End of f_recv_UE_Context_Modification_Response - /** - * @desc Receive S1AP Message UE Context Modification Failure - * @param p_value Receive template for UE CONTEXT MODIFICATION FAILURE - * @see ETSI TS 136 413 V13.4.0 Clause 9.1.4.10 UE CONTEXT MODIFICATION FAILURE - */ - function f_recv_UE_Context_Modification_Failure( - template (present) RecordOf_ProtocolIE p_value := ? - ) runs on S1APComponent { - f_recv_S1AP_initiatingMessage(mw_UeContextModificationFailure(p_value)) - } // End of f_recv_UE_Context_Modification_Failure + /** + * @desc Receive S1AP Message UE Context Modification Failure + * @param p_value Receive template for UE CONTEXT MODIFICATION FAILURE + * @see ETSI TS 136 413 V13.4.0 Clause 9.1.4.10 UE CONTEXT MODIFICATION FAILURE + */ + function f_recv_UE_Context_Modification_Failure( + template (present) RecordOf_ProtocolIE p_value := ? + ) runs on S1APComponent { + f_recv_S1AP_initiatingMessage(mw_UeContextModificationFailure(p_value)) + } // End of f_recv_UE_Context_Modification_Failure /** * @desc Receive S1AP Message UE Context Modification Indication @@ -754,16 +754,16 @@ module LibS1AP_Steps { } // End of f_recv_Ue_Context_Resume_Request - /** - * @desc Receive S1AP Message UE RADIO_CAPABILITY_MATCH_RESPONSE - * @param p_value Receive template for UE_RADIO_CAPABILITY_MATCH_RESPONSE - * @see ETSI TS 136 413 V13.4.0 Clause 9.1.4.12 UE_RADIO_CAPABILITY_MATCH_RESPONSE - */ - function f_recv_UeRadioCapabilityMatchResponse( - template (present) RecordOf_ProtocolIE p_value := ? - ) runs on S1APComponent { - f_recv_S1AP_initiatingMessage(mw_UeRadioCapabilityMatchResponse(p_value)) - } // End of f_recv_UeRadioCapabilityMatchResponse + /** + * @desc Receive S1AP Message UE RADIO_CAPABILITY_MATCH_RESPONSE + * @param p_value Receive template for UE_RADIO_CAPABILITY_MATCH_RESPONSE + * @see ETSI TS 136 413 V13.4.0 Clause 9.1.4.12 UE_RADIO_CAPABILITY_MATCH_RESPONSE + */ + function f_recv_UeRadioCapabilityMatchResponse( + template (present) RecordOf_ProtocolIE p_value := ? + ) runs on S1APComponent { + f_recv_S1AP_initiatingMessage(mw_UeRadioCapabilityMatchResponse(p_value)) + } // End of f_recv_UeRadioCapabilityMatchResponse } // End of group receivePDU @@ -845,23 +845,23 @@ module LibS1AP_Steps { f_send_S1AP_initiatingMessage(m_E_RABSetupRequest(p_value)) } // End of function f_send_E_RABSetupRequest - /** - * @desc Send S1AP Message E-RAB_ModifiedRequest - * @param p_value Send template with IE for E-RAB_ModifiedRequest - */ - function f_send_E_RABModifiedRequest(in template (value) RecordOf_ProtocolIE p_value - ) runs on S1APComponent { - f_send_S1AP_initiatingMessage(m_E_RABModifiedRequest(p_value)) - } // End of function f_send_E_RABSetupRequest + /** + * @desc Send S1AP Message E-RAB_ModifiedRequest + * @param p_value Send template with IE for E-RAB_ModifiedRequest + */ + function f_send_E_RABModifiedRequest(in template (value) RecordOf_ProtocolIE p_value + ) runs on S1APComponent { + f_send_S1AP_initiatingMessage(m_E_RABModifiedRequest(p_value)) + } // End of function f_send_E_RABSetupRequest - /** - * @desc Send S1AP Message InitialContext_SetupRequest - * @param p_value Send template with IE for InitialContext_SetupRequest - */ - function f_send_InitialContext_SetupRequest(in template (value) RecordOf_ProtocolIE p_value - ) runs on S1APComponent { - f_send_S1AP_initiatingMessage(m_InitialContextSetupRequest(p_value)) - } // End of function f_send_InitialContext_SetupRequest + /** + * @desc Send S1AP Message InitialContext_SetupRequest + * @param p_value Send template with IE for InitialContext_SetupRequest + */ + function f_send_InitialContext_SetupRequest(in template (value) RecordOf_ProtocolIE p_value + ) runs on S1APComponent { + f_send_S1AP_initiatingMessage(m_InitialContextSetupRequest(p_value)) + } // End of function f_send_InitialContext_SetupRequest /** * @desc Send S1AP Message S1 SETUP RESPONSE @@ -1003,61 +1003,61 @@ module LibS1AP_Steps { f_send_S1AP_initiatingMessage(m_kill_Response(p_value)) } // End of function f_send_Kill_Response - /** - * @desc Send S1AP Message UE Context Release Command - * @param p_value Send template for UE CONTEXT RELEASE REQUEST - * @see ETSI TS 136 413 V13.4.0 Clause 9.1.4.6 UE CONTEXT RELEASE COMMAND - */ - function f_send_UE_Context_Release_Command( - template (value) RecordOf_ProtocolIE p_value - ) runs on S1APComponent { - f_send_S1AP_initiatingMessage(m_UeContextReleaseCommand(p_value)) - } // End of f_send_UE_Context_Release_Command + /** + * @desc Send S1AP Message UE Context Release Command + * @param p_value Send template for UE CONTEXT RELEASE REQUEST + * @see ETSI TS 136 413 V13.4.0 Clause 9.1.4.6 UE CONTEXT RELEASE COMMAND + */ + function f_send_UE_Context_Release_Command( + template (value) RecordOf_ProtocolIE p_value + ) runs on S1APComponent { + f_send_S1AP_initiatingMessage(m_UeContextReleaseCommand(p_value)) + } // End of f_send_UE_Context_Release_Command - /** - * @desc Send S1AP Message UE Context Release Complete - * @param p_value Send template for UE CONTEXT RELEASE COMPLETE - * @see ETSI TS 136 413 V13.4.0 Clause 9.1.4.7 UE CONTEXT RELEASE COMPLETE - */ - function f_send_UE_Context_Release_Complete( - template (value) RecordOf_ProtocolIE p_value - ) runs on S1APComponent { - f_send_S1AP_initiatingMessage(m_UeContextReleaseComplete(p_value)) - } // End of f_send_UE_Context_Release_Command - - /** - * @desc Send S1AP Message UE Context Release Request - * @param p_value Receive template for UE CONTEXT RELEASE REQUEST - * @see ETSI TS 136 413 V13.4.0 Clause 9.1.4.5 UE CONTEXT RELEASE REQUEST - */ - function f_send_UE_Context_Release_Request( - template (value) RecordOf_ProtocolIE p_value - ) runs on S1APComponent { - f_send_S1AP_initiatingMessage(m_UeContextReleaseRequest(p_value)) - } // End of f_send_UE_Context_Release_Request + /** + * @desc Send S1AP Message UE Context Release Complete + * @param p_value Send template for UE CONTEXT RELEASE COMPLETE + * @see ETSI TS 136 413 V13.4.0 Clause 9.1.4.7 UE CONTEXT RELEASE COMPLETE + */ + function f_send_UE_Context_Release_Complete( + template (value) RecordOf_ProtocolIE p_value + ) runs on S1APComponent { + f_send_S1AP_initiatingMessage(m_UeContextReleaseComplete(p_value)) + } // End of f_send_UE_Context_Release_Command + + /** + * @desc Send S1AP Message UE Context Release Request + * @param p_value Receive template for UE CONTEXT RELEASE REQUEST + * @see ETSI TS 136 413 V13.4.0 Clause 9.1.4.5 UE CONTEXT RELEASE REQUEST + */ + function f_send_UE_Context_Release_Request( + template (value) RecordOf_ProtocolIE p_value + ) runs on S1APComponent { + f_send_S1AP_initiatingMessage(m_UeContextReleaseRequest(p_value)) + } // End of f_send_UE_Context_Release_Request - /** - * @desc Send S1AP Message UE Context Modification Request - * @param p_value Send template for UE CONTEXT MODIFICATION REQUEST - * @see ETSI TS 136 413 V13.4.0 Clause 9.1.4.8 UE CONTEXT MODIFICATION COMMAND - */ - function f_send_UE_Context_Modification_Request( - template (value) RecordOf_ProtocolIE p_value - ) runs on S1APComponent { - f_send_S1AP_initiatingMessage(m_UeContextModificationRequest(p_value)) - } // End of f_send_UE_Context_Modification_Request + /** + * @desc Send S1AP Message UE Context Modification Request + * @param p_value Send template for UE CONTEXT MODIFICATION REQUEST + * @see ETSI TS 136 413 V13.4.0 Clause 9.1.4.8 UE CONTEXT MODIFICATION COMMAND + */ + function f_send_UE_Context_Modification_Request( + template (value) RecordOf_ProtocolIE p_value + ) runs on S1APComponent { + f_send_S1AP_initiatingMessage(m_UeContextModificationRequest(p_value)) + } // End of f_send_UE_Context_Modification_Request - /** - * @desc Send S1AP Message UE Radio Capability Match Request - * @param p_value Send template for UE_RADIO_CAPABILITY_MATCH_REQUEST - * @see ETSI TS 136 413 V13.4.0 Clause 9.1.4.11 UE CONTEXT MODIFICATION COMMAND - */ - function f_send_UE_Radio_Capability_Match_Request( - template (value) RecordOf_ProtocolIE p_value - ) runs on S1APComponent { - f_send_S1AP_initiatingMessage(m_UeRadioCapabilityMatchRequest(p_value)) - } // End of f_send_UE_Radio_Capability_Match_Request + /** + * @desc Send S1AP Message UE Radio Capability Match Request + * @param p_value Send template for UE_RADIO_CAPABILITY_MATCH_REQUEST + * @see ETSI TS 136 413 V13.4.0 Clause 9.1.4.11 UE CONTEXT MODIFICATION COMMAND + */ + function f_send_UE_Radio_Capability_Match_Request( + template (value) RecordOf_ProtocolIE p_value + ) runs on S1APComponent { + f_send_S1AP_initiatingMessage(m_UeRadioCapabilityMatchRequest(p_value)) + } // End of f_send_UE_Radio_Capability_Match_Request } // End of group sendPDU diff --git a/ttcn3/LibS1AP/LibS1AP_Templates.ttcn b/ttcn3/LibS1AP/LibS1AP_Templates.ttcn index 9b9bfa2..4fa1cd7 100644 --- a/ttcn3/LibS1AP/LibS1AP_Templates.ttcn +++ b/ttcn3/LibS1AP/LibS1AP_Templates.ttcn @@ -615,7 +615,7 @@ module LibS1AP_Templates { mw_cause_IE(p_Cause_value), mw_source_ToTarget_TransparentContainer_IE(p_Source_ToTarget_TransparentContainer_value) } // End of template mw_HandoverRequiredIEs - + }// End of group HandoverPreparation group HandoverPreparation{ @@ -3102,7 +3102,7 @@ module LibS1AP_Templates { criticality := ignore, value_ := { RecordOf_E_RABSetupItemBearerSURes := p_value } } // End of template - + /** * @desc Receive template for E-RABSetupListCtxtSUReq protocol IE * @param p_value Expected protocol IE value. Default: m_E_RABToBeSetupItemBearerSUReq diff --git a/ttcn3/S1AP_TCFunctions.ttcn b/ttcn3/S1AP_TCFunctions.ttcn index 462d415..a98c055 100644 --- a/ttcn3/S1AP_TCFunctions.ttcn +++ b/ttcn3/S1AP_TCFunctions.ttcn @@ -1692,7 +1692,7 @@ module S1AP_TCFunctions { log("*** " & __SCOPE__ & ": INFO: Postamble done. ***"); } // End of function f_TC_S1AP_eNB_HAS_04 - + /** * @desc Testcase function for TC_S1AP_eNB_HAS_05 */ @@ -1729,11 +1729,11 @@ module S1AP_TCFunctions { //TODO f_wait f_recv_HandoverCancel( - mw_HandoverCancelIEs( - vc_MME_UE_ID, - vc_eNB_UE_ID, - -//Cause - )); + mw_HandoverCancelIEs( + vc_MME_UE_ID, + vc_eNB_UE_ID, + -//Cause + )); f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); diff --git a/ttcn3/S1AP_TestControl.ttcn b/ttcn3/S1AP_TestControl.ttcn index 6c086ee..16259c6 100644 --- a/ttcn3/S1AP_TestControl.ttcn +++ b/ttcn3/S1AP_TestControl.ttcn @@ -21,6 +21,26 @@ module S1AP_TestControl { // ETSI TS 103 497-2 Clause 5.2.2.1.2 E-RAB management group execute(TC_S1AP_eNB_RAB_01()); execute(TC_S1AP_eNB_RAB_02()); + // ETSI TS 103 497-2 Clause 5.2.2.1.3 Context management group + execute(TC_S1AP_eNB_CMP_01()); + execute(TC_S1AP_eNB_CMP_02()); + execute(TC_S1AP_eNB_CMP_03()); + execute(TC_S1AP_eNB_CMP_04()); + execute(TC_S1AP_eNB_CMP_05()); + execute(TC_S1AP_eNB_CMP_06()); + execute(TC_S1AP_eNB_CMP_07()); + execute(TC_S1AP_eNB_CMP_08()); + execute(TC_S1AP_eNB_CMP_09()); + execute(TC_S1AP_eNB_CMP_10()); + execute(TC_S1AP_eNB_CMP_11()); + execute(TC_S1AP_eNB_CMP_12()); + execute(TC_S1AP_eNB_CMP_13()); + execute(TC_S1AP_eNB_CMP_14()); + execute(TC_S1AP_eNB_CMP_15()); + execute(TC_S1AP_eNB_CMP_16()); + execute(TC_S1AP_eNB_CMP_17()); + execute(TC_S1AP_eNB_CMP_18()); + execute(TC_S1AP_eNB_CMP_19()); // ETSI TS 103 497-2 Clause 5.2.2.1.6 NAS transport group execute(TC_S1AP_eNB_NAS_01()); execute(TC_S1AP_eNB_NAS_02()); @@ -63,6 +83,9 @@ module S1AP_TestControl { if (PICS_S1AP_MME_IUT) { // ETSI TS 103 497-2 Clause 5.2.2.2.2 E-RAB management group execute(TC_S1AP_MME_RAB_01()); + // ETSI TS 103 497-2 Clause 5.2.2.2.3 Context management group + execute(TC_S1AP_MME_CMP_01()); + execute(TC_S1AP_MME_CMP_02()); // ETSI TS 103 497-2 Clause 5.2.2.2.5 Paging group execute(TC_S1AP_MME_PAG_01()); // ETSI TS 103 497-2 Clause 5.2.2.2.6 NAS transport group