From dbaae618869ae7b7cc3576a8236035a980da61a0 Mon Sep 17 00:00:00 2001 From: garciay Date: Wed, 10 May 2017 06:23:35 +0000 Subject: [PATCH] STF519 Week #19: - Remove FIXME - Remove TODOs (39/43) - Comments review --- ttcn3/LibS1AP/LibS1AP_Interface.ttcn | 2 +- ttcn3/LibS1AP/LibS1AP_Steps.ttcn | 84 +++++++++--------- ttcn3/LibS1AP/LibS1AP_Templates.ttcn | 126 ++++++++++++++++----------- ttcn3/S1AP_TCFunctions.ttcn | 59 +++++-------- ttcn3/S1AP_Templates.ttcn | 6 +- ttcn3/S1AP_TestCases.ttcn | 2 +- 6 files changed, 138 insertions(+), 141 deletions(-) diff --git a/ttcn3/LibS1AP/LibS1AP_Interface.ttcn b/ttcn3/LibS1AP/LibS1AP_Interface.ttcn index 1d569c1..f38bbde 100644 --- a/ttcn3/LibS1AP/LibS1AP_Interface.ttcn +++ b/ttcn3/LibS1AP/LibS1AP_Interface.ttcn @@ -67,7 +67,7 @@ module LibS1AP_Interface { var S1AP_PDU vc_recvS1AP_PDUDefault ; //global variable defined to save Dimeter message received within default altstep // Init of values at component started - // TODO: generation of following MME and ENB UE IDs can be done randomly in init + // Note: generation of following MME and ENB UE IDs can be done randomly in init var MME_UE_S1AP_ID vc_MME_UE_ID := 10; var ENB_UE_S1AP_ID vc_eNB_UE_ID := 11; diff --git a/ttcn3/LibS1AP/LibS1AP_Steps.ttcn b/ttcn3/LibS1AP/LibS1AP_Steps.ttcn index 4587397..2d22865 100644 --- a/ttcn3/LibS1AP/LibS1AP_Steps.ttcn +++ b/ttcn3/LibS1AP/LibS1AP_Steps.ttcn @@ -31,34 +31,6 @@ module LibS1AP_Steps { */ group commonFunctions { - /** - * @desc Indicate if the provided value is greather or equal to 0 - * @return true if value of p_int greater than 0 - * @param p_int - integer value - */ - function f_gtZero( // FIXME: Not used to be removed - in integer p_int - ) return boolean { - if (p_int > 0){ - return true; - } - else{ - return false; - } - } // End of function f_gtZero - - /** - * @desc Increment the provided value by one - * @return incremented value of p_int 0 - * @param p_int - integer value - */ - function f_inc( // FIXME: Not used to be removed - inout UInt32 p_int - ) return UInt32 { - p_int := p_int + 1; - return p_int; - } // End of function f_inc - } // End of group commonFunctions /** @@ -77,13 +49,13 @@ module LibS1AP_Steps { vc_recvS1AP_PDU := p_PDU; if (ischosen(p_PDU.initiatingMessage)) { - //TODO... + // Nothing to do } if (ischosen(p_PDU.successfulOutcome)) { - //TODO... + // Nothing to do } if (ischosen(p_PDU.unsuccessfulOutcome)) { - //TODO... + // Nothing to do } } // End of function f_S1APPDU_Get @@ -738,14 +710,14 @@ module LibS1AP_Steps { /** * @desc Receive S1AP Message HANDOVER_REQUIRED - * @param p_value Receive template for UPLINK_NON_UE_ASSOCIATED_LPPA_TRANSPORT IEs + * @param p_value Receive template for HandoverRequired 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 := ? + template (present) RecordOf_ProtocolIE p_value := ? ) runs on S1APComponent { - // TODO - } // End of f_recv_Uplink_Non_UE_Associated_Lppa_Transport + f_recv_HandoverCommand(p_value); + } // End of f_recv_Handover_Required /** * @desc Receive S1AP Message UE Context Release Request @@ -942,15 +914,12 @@ module LibS1AP_Steps { ) runs on S1APComponent { if (ischosen(p_PDU.initiatingMessage)) { - //TODO... vc_sendS1AP_PDU:=valueof(p_PDU); } if (ischosen(p_PDU.successfulOutcome)) { - //TODO... vc_sendS1AP_PDU:=valueof(p_PDU); } if (ischosen(p_PDU.unsuccessfulOutcome)) { - //TODO... vc_sendS1AP_PDU:=valueof(p_PDU); } @@ -1416,7 +1385,32 @@ module LibS1AP_Steps { * @desc Initiate an Handover procedure */ function f_initiate_handover() runs on S1APComponent { - // TODO + // Local variables + const Source_ToTarget_TransparentContainer c_source_ToTarget_TransparentContainer := '12121212'O; + + f_send_HandoverRequest( + m_HandoverReqIEs( + vc_MME_UE_ID, + intralte, // Handover Type + m_cause_ran( + successful_handover + ), // Cause + m_UEAggregateMaximumBitrate(1,1), // UE Aggregate_Max_Bit_Rate + { + m_E_RABToBeSetupItemHOReq ( + -, + -, + -, + m_e_RABlevelQoSParameters (5) + ) + }, // E_RabsToBeSetupList + c_source_ToTarget_TransparentContainer, // SourceToTargetTransparentContainer + m_UESecurityCapabilities( + '0101010101010101'B, + '0101010101010101'B + ), // UeSecurityCapabilities + m_securityContext // SecurityContext + )); } // End of function f_initiate_handover /** @@ -1714,7 +1708,7 @@ module LibS1AP_Steps { */ function f_preambleS1AP_MME() runs on S1APComponent { - //TODO:... + // Nothing to do } // End of function f_preambleS1AP_MME /** @@ -1723,7 +1717,7 @@ module LibS1AP_Steps { */ function f_preambleS1AP_eNB() runs on S1APComponent { - //TODO:... + // Nothing to do } // End of function f_preambleS1AP_eNB } // End of group preamble_S1AP @@ -1740,7 +1734,7 @@ module LibS1AP_Steps { */ function f_postambleS1AP_MME() runs on S1APComponent { - // TODO:... + // Nothing to do } // End of function f_postambleS1AP_MME /** @@ -1749,7 +1743,7 @@ module LibS1AP_Steps { */ function f_postambleS1AP_eNB() runs on S1APComponent { - // TODO:... + // Nothing to do } // End of function f_postambleS1AP_eNB } // End of group postamble_S1AP @@ -1870,7 +1864,7 @@ module LibS1AP_Steps { stop; } } - // TODO:... + // Note: possible unscollicited messages should be filtered } // End of altstep a_defaultS1AP_MME altstep a_defaultS1AP_eNB() @@ -1884,7 +1878,7 @@ module LibS1AP_Steps { stop; } } - // TODO:... + // Note: possible unscollicited messages should be filtered } // End of altstep a_defaultS1AP_eNB } // End of group defaultsTestStep diff --git a/ttcn3/LibS1AP/LibS1AP_Templates.ttcn b/ttcn3/LibS1AP/LibS1AP_Templates.ttcn index 5d6ff26..b413288 100644 --- a/ttcn3/LibS1AP/LibS1AP_Templates.ttcn +++ b/ttcn3/LibS1AP/LibS1AP_Templates.ttcn @@ -274,7 +274,7 @@ module LibS1AP_Templates { m_UE_aggregate_maximum_bitrate_IE(p_uEAggregateMaximumBitrate), m_E_RABToBeSetupList(p_RecordOf_E_RABToBeSetupItem_value) } // End of template m_E_RABSetupReqIEs - + /** * @desc Send template for InitiatingMessage message with E-RABSetup response payload * @param p_value The procedure code value @@ -441,6 +441,15 @@ module LibS1AP_Templates { m_securityKey_IE(p_SecurityKey) } // End of templaunknown_IDunknown_IDte m_InitialContextSetupReqIEs + /** + * @desc Send template for InitialContextSetupReq message, with no eNB ID + * @param p_eNB_value The eNB UE S1AP ID value. + * @param p_MME_value The MME UE S1AP ID value. + * @param p_uEAggregateMaximumBitrate The UE Aggregate Maximum Bit rate value. + * @param p_RecordOf_E_RABToBeSetupItemCtxt_value The list og E-RAB To Be Setup Item Ctxt values. + * @param @param p_uESecurityCapabilities The UE Security Capabilities value. + * @param p_SecurityKey The security key value. + */ template (value) RecordOf_ProtocolIE m_InitialContextSetupReqIEs_noENB( in template (value) MME_UE_S1AP_ID p_MME_value, in template (value) UEAggregateMaximumBitrate p_uEAggregateMaximumBitrate, @@ -473,8 +482,17 @@ module LibS1AP_Templates { in template (value) SecurityKey p_SecurityKey ) modifies m_InitialContextSetupReqIEs := { m_eNB_UE_S1AP_ID(p_eNB_value) - } // End of templaunknown_IDunknown_IDte m_InitialContextSetupReqIEs_duplicate_ENB + } // End of template m_InitialContextSetupReqIEs_duplicate_eNB + /** + * @desc Send template for InitialContextSetupReq message, with some unknown IE + * @param p_eNB_value The eNB UE S1AP ID value. + * @param p_MME_value The MME UE S1AP ID value. + * @param p_uEAggregateMaximumBitrate The UE Aggregate Maximum Bit rate value. + * @param p_RecordOf_E_RABToBeSetupItemCtxt_value The list og E-RAB To Be Setup Item Ctxt values. + * @param @param p_uESecurityCapabilities The UE Security Capabilities value. + * @param p_SecurityKey The security key value. + */ template (value) RecordOf_ProtocolIE m_InitialContextSetupReqIEs_unknown_ID( in template (value) MME_UE_S1AP_ID p_MME_value, in template (value) ENB_UE_S1AP_ID p_eNB_value, @@ -488,7 +506,7 @@ module LibS1AP_Templates { /** * @desc Send template for InitiatingMessage message with UeContextReleaseRequest payload - * @param p_value Expected procedure code + * @param p_value The protocol information elements. */ template (value) InitiatingMessage m_UeContextReleaseRequest( in template (value) RecordOf_ProtocolIE p_value) := { @@ -510,7 +528,7 @@ module LibS1AP_Templates { /** * @desc Send template for InitiatingMessage message with UEContextRelease payload - * @param p_value Expected procedure code + * @param p_value The protocol information elements. */ template (value) InitiatingMessage m_UeContextReleaseCommand( in template (value) RecordOf_ProtocolIE p_value) := { @@ -537,7 +555,7 @@ module LibS1AP_Templates { /** * @desc Send template for InitiatingMessage message with UEContextReleaseComplete payload - * @param p_value Expected procedure code + * @param p_value The protocol information elements. */ template (value) InitiatingMessage m_UeContextReleaseComplete( in template (value) RecordOf_ProtocolIE p_value) := { @@ -557,7 +575,7 @@ module LibS1AP_Templates { /** * @desc Send template for InitiatingMessage message with UEContextSuspendRequest payload - * @param p_value Expected procedure code + * @param p_value The protocol information elements. */ template (value) InitiatingMessage m_UeContextSuspendRequest( in template (value) RecordOf_ProtocolIE p_value) := { @@ -576,7 +594,8 @@ module LibS1AP_Templates { /** * @desc Send template for InitiatingMessage message with UEContextResumeRequest payload - * @param p_value Expected procedure code + * @param p_value The protocol information elements. + * @param p_criticality The Criticality value. defaulf: reject */ template (value) InitiatingMessage m_UeContextResumeRequest( in template (value) RecordOf_ProtocolIE p_value, @@ -629,7 +648,7 @@ module LibS1AP_Templates { /** * @desc Send template for InitiatingMessage message with m_UeContextModificationRequest payload - * @param p_value Expected procedure code + * @param p_value The protocol information elements. */ template (value) InitiatingMessage m_UeContextModificationRequest( in template (value) RecordOf_ProtocolIE p_value) := { @@ -674,7 +693,7 @@ module LibS1AP_Templates { /** * @desc Send template for InitiatingMessage message with m_UeContextModificationIndication payload - * @param p_value Expected procedure code + * @param p_value The protocol information elements. */ template (value) InitiatingMessage m_UeContextModificationIndication( in template (value) RecordOf_ProtocolIE p_value) := { @@ -703,7 +722,7 @@ module LibS1AP_Templates { /** * @desc Send template for InitiatingMessage message with m_UeRadioCapabilityMatchRequest payload - * @param p_value Expected procedure code + * @param p_value The protocol information elements. */ template (value) InitiatingMessage m_UeRadioCapabilityMatchRequest( in template (value) RecordOf_ProtocolIE p_value) := { @@ -809,7 +828,7 @@ module LibS1AP_Templates { /** * @desc Send template for InitiatingMessage message with ENB CONFIGURATION UPDATE ACKNOWLEDGE payload - * @param p_value Expected protocol information elements. + * @param p_value The protocol information elements. */ template (value) SuccessfulOutcome m_eNB_Configuration_Update_Acknowledge( in template (value) RecordOf_ProtocolIE p_value @@ -828,7 +847,7 @@ module LibS1AP_Templates { /** * @desc Send template for InitiatingMessage message with MME CONFIGURATION UPDATE payload - * @param p_value Expected protocol information elements. + * @param p_value The protocol information elements. */ template (value) InitiatingMessage m_mME_Configuration_Update( in template (value) RecordOf_ProtocolIE p_value @@ -851,7 +870,7 @@ module LibS1AP_Templates { /** * @desc Send template for InitiatingMessage message with MME CONFIGURATION UPDATE ACKNOWLEDGE payload - * @param p_value Expected protocol information elements. + * @param p_value The protocol information elements. */ template (value) SuccessfulOutcome m_mME_Configuration_Update_Acknowledge( in template (value) RecordOf_ProtocolIE p_value @@ -963,7 +982,7 @@ module LibS1AP_Templates { /** * @desc Send template for InitiatingMessage message with KILL REQUEST payload - * @param p_value The procedure code value + * @param p_value The protocol information elements */ template (value) InitiatingMessage m_kill_Request( in template (value) RecordOf_ProtocolIE p_value) := { @@ -987,7 +1006,7 @@ module LibS1AP_Templates { /** * @desc Send template for InitiatingMessage message with KILL REQUEST payload - * @param p_value The procedure code value + * @param p_value The protocol information elements */ template (value) InitiatingMessage m_kill_Response( in template (value) RecordOf_ProtocolIE p_value) := { @@ -1226,7 +1245,8 @@ module LibS1AP_Templates { /** * @desc Receive template for SuccessfulOutcome/R-RAB_Setup message - * @param p_value The expected protocol information elements. Default: ? + * @param p_procedureCode Expected procedure code. Default: ? + * @param p_value Expected procedure code. Default: ? */ template (present) SuccessfulOutcome mw_E_RABModifiedResponse( template (present) RecordOf_ProtocolIE p_value := ? @@ -1397,6 +1417,12 @@ module LibS1AP_Templates { mw_E_RABFailedToSetupList(p_E_RABItem_value) } // End of template mw_InitialContextSetupResIEs + /** + * @desc Receive template for InitialContextSetupFailure message + * @param p_MME_value The expected MME UE S1AP ID value. Default: ? + * @param p_eNB_value The expected eNB UE S1AP ID value. Default: ? + * @param p_cause The expected cause value. Default: ? + */ template (present) RecordOf_ProtocolIE mw_InitialContextSetupFailureIEs( template (present) MME_UE_S1AP_ID p_MME_value := ?, template (present) ENB_UE_S1AP_ID p_eNB_value := ?, @@ -1407,6 +1433,13 @@ module LibS1AP_Templates { mw_cause_IE(p_cause) } // End of template mw_InitialContextSetupResIEs + /** + * @desc Receive template for InitialContextSetupFailure message with Criticaly Diagnostic IE + * @param p_MME_value The expected MME UE S1AP ID value. Default: ? + * @param p_eNB_value The expected eNB UE S1AP ID value. Default: ? + * @param p_cause The expected cause value. Default: ? + * @param p_criticalyDiagnostic The expected criticaly diagnostic value. Default: ? + */ template (present) RecordOf_ProtocolIE mw_InitialContextSetupFailureIEs_CriticalyDiagnostic( template (present) MME_UE_S1AP_ID p_MME_value := ?, template (present) ENB_UE_S1AP_ID p_eNB_value := ?, @@ -1421,8 +1454,8 @@ module LibS1AP_Templates { /** * @desc Receive template for InitialContextSetup message - * @param p_procedureCode Expected procedure code. Default: ? - * @param p_value Expected procedure code. Default: ? + * @param p_value The expected protocol information elements. Default: ? + * @param p_criticality The expected criticality value. Default: reject */ template (present) SuccessfulOutcome mw_InitialContextSetupRequest( template (present) RecordOf_ProtocolIE p_value := ?, @@ -1452,8 +1485,7 @@ module LibS1AP_Templates { /** * @desc Receive template for UeContextReleaseRequest message - * @param p_procedureCode Expected procedure code. Default: ? - * @param p_value Expected procedure code. Default: ? + * @param p_value The expected protocol information elements. Default: ? */ template (present) SuccessfulOutcome mw_UeContextReleaseRequest( template (present) RecordOf_ProtocolIE p_value := ? @@ -1477,8 +1509,7 @@ module LibS1AP_Templates { /** * @desc Receive template for UeContextReleaseCommand message - * @param p_procedureCode Expected procedure code. Default: ? - * @param p_value Expected procedure code. Default: ? + * @param p_value The expected protocol information elements. Default: ? */ template (present) SuccessfulOutcome mw_UeContextReleaseCommand( template (present) RecordOf_ProtocolIE p_value := ? @@ -1507,8 +1538,7 @@ module LibS1AP_Templates { /** * @desc Receive template for UeContextReleaseComplete message - * @param p_procedureCode Expected procedure code. Default: ? - * @param p_value Expected procedure code. Default: ? + * @param p_value The expected protocol information elements. Default: ? */ template (present) SuccessfulOutcome mw_UeContextReleaseComplete( template (present) RecordOf_ProtocolIE p_value := ? @@ -1531,8 +1561,7 @@ module LibS1AP_Templates { /** * @desc Receive template for mw_UeContextModificationResponse message - * @param p_procedureCode Expected procedure code. Default: ? - * @param p_value Expected procedure code. Default: ? + * @param p_value The expected protocol information elements. Default: ? */ template (present) SuccessfulOutcome mw_UeContextModificationResponse( template (present) RecordOf_ProtocolIE p_value := ? @@ -1552,8 +1581,7 @@ module LibS1AP_Templates { /** * @desc Receive template for mw_UeContextModificationFailure message - * @param p_procedureCode Expected procedure code. Default: ? - * @param p_value Expected procedure code. Default: ? + * @param p_value The expected protocol information elements. Default: ? */ template (present) SuccessfulOutcome mw_UeContextModificationFailure( template (present) RecordOf_ProtocolIE p_value := ? @@ -1577,8 +1605,7 @@ module LibS1AP_Templates { /** * @desc Receive template for mw_UeContextModificationRequest message - * @param p_procedureCode Expected procedure code. Default: ? - * @param p_value Expected procedure code. Default: ? + * @param p_value The expected protocol information elements. Default: ? */ template (present) SuccessfulOutcome mw_UeContextModificationRequest( template (present) RecordOf_ProtocolIE p_value := ? @@ -1601,8 +1628,7 @@ module LibS1AP_Templates { /** * @desc Receive template for mw_UeContextModificationIndication message - * @param p_procedureCode Expected procedure code. Default: ? - * @param p_value Expected procedure code. Default: ? + * @param p_value The expected protocol information elements. Default: ? */ template (present) SuccessfulOutcome mw_UeContextModificationIndication( template (present) RecordOf_ProtocolIE p_value := ? @@ -1623,8 +1649,7 @@ module LibS1AP_Templates { /** * @desc Receive template for mw_UeContextModificationConfirm message - * @param p_procedureCode Expected procedure code. Default: ? - * @param p_value Expected procedure code. Default: ? + * @param p_value The expected protocol information elements. Default: ? */ template (present) SuccessfulOutcome mw_UeContextModificationConfirm( template (present) RecordOf_ProtocolIE p_value := ? @@ -1653,8 +1678,7 @@ module LibS1AP_Templates { /** * @desc Receive template for mw_UeContextSuspendRequest message - * @param p_procedureCode Expected procedure code. Default: ? - * @param p_value Expected procedure code. Default: ? + * @param p_value The expected protocol information elements. Default: ? */ template (present) SuccessfulOutcome mw_UeContextSuspendRequest( template (present) RecordOf_ProtocolIE p_value := ? @@ -1674,8 +1698,7 @@ module LibS1AP_Templates { /** * @desc Receive template for mw_UeContextResumeRequest message - * @param p_procedureCode Expected procedure code. Default: ? - * @param p_value Expected procedure code. Default: ? + * @param p_value The expected protocol information elements. Default: ? */ template (present) SuccessfulOutcome mw_UeContextSuspendResponse( template (present) RecordOf_ProtocolIE p_value := ? @@ -1695,8 +1718,7 @@ module LibS1AP_Templates { /** * @desc Receive template for mw_UeContextResumeFailure message - * @param p_procedureCode Expected procedure code. Default: ? - * @param p_value Expected procedure code. Default: ? + * @param p_value The expected protocol information elements. Default: ? */ template (present) SuccessfulOutcome mw_UeContextResumeRequest( template (present) RecordOf_ProtocolIE p_value := ? @@ -1720,8 +1742,7 @@ module LibS1AP_Templates { /** * @desc Receive template for mw_UeContextResumeResponse message - * @param p_procedureCode Expected procedure code. Default: ? - * @param p_value Expected procedure code. Default: ? + * @param p_value The expected protocol information elements. Default: ? */ template (present) SuccessfulOutcome mw_UeContextResumeResponse( template (present) RecordOf_ProtocolIE p_value := ? @@ -1741,7 +1762,7 @@ module LibS1AP_Templates { /** * @desc Receive template for mw_UeContextResumeFailure message - * @param p_value Expected procedure code. Default: ? + * @param p_value The expected protocol information elements. Default: ? */ template (present) SuccessfulOutcome mw_UeContextResumeFailure( template (present) RecordOf_ProtocolIE p_value := ? @@ -1765,8 +1786,7 @@ module LibS1AP_Templates { /** * @desc Receive template for mw_UeRadioCapabilityMatchResponse message - * @param p_procedureCode Expected procedure code. Default: ? - * @param p_value Expected procedure code. Default: ? + * @param p_value The expected protocol information elements. Default: ? */ template (present) SuccessfulOutcome mw_UeRadioCapabilityMatchResponse( template (present) RecordOf_ProtocolIE p_value := ? @@ -1789,8 +1809,7 @@ module LibS1AP_Templates { /** * @desc Receive template for mw_UeRadioCapabilityMatchRequest message - * @param p_procedureCode Expected procedure code. Default: ? - * @param p_value Expected procedure code. Default: ? + * @param p_value The expected protocol information elements. Default: ? */ template (present) SuccessfulOutcome mw_UeRadioCapabilityMatchRequest( template (present) RecordOf_ProtocolIE p_value := ? @@ -1810,8 +1829,7 @@ module LibS1AP_Templates { /** * @desc Receive template for mw_ConnectionEstablishmentIndication message - * @param p_procedureCode Expected procedure code. Default: ? - * @param p_value Expected procedure code. Default: ? + * @param p_value The expected protocol information elements. Default: ? */ template (present) SuccessfulOutcome mw_ConnectionEstablishmentIndication( template (present) RecordOf_ProtocolIE p_value := ? @@ -2201,8 +2219,6 @@ module LibS1AP_Templates { }// End of group Warning_Message_Transmission_receive - //TODO: Other.... - } // End of group receiveClass1 } // End of group class1 @@ -3831,7 +3847,7 @@ module LibS1AP_Templates { criticality := reject, value_ := { RecordOf_E_RABToBeSetupItemHOReq := valueof(p_value) } } // End of template m_E_RABToBeSetupListHOReq - + /** * @desc Send template for E-RABSetupListBearerSURes protocol IE * @param p_value Protocol IE value. Default: m_E_RABToBeSetupItemBearerSUReq @@ -5211,7 +5227,7 @@ module LibS1AP_Templates { gTP_TEID := ?, iE_Extensions := * } // End of template mw_E_RABSetupItemBearerSURes - + /** * @desc * @param p_e_RAB_ID @@ -5826,6 +5842,10 @@ module LibS1AP_Templates { } // End of group nasRelated_IEs + /** + * @desc NAS Related IEs group + * @see ETSI TS 136 413 V13.4.0 Clause 10 Handling of Unknown, Unforeseen and Erroneous Protocol Data + */ group Unknown_unforseen_errorneous_group { /** diff --git a/ttcn3/S1AP_TCFunctions.ttcn b/ttcn3/S1AP_TCFunctions.ttcn index 5162d9a..ef2b7fa 100644 --- a/ttcn3/S1AP_TCFunctions.ttcn +++ b/ttcn3/S1AP_TCFunctions.ttcn @@ -181,7 +181,7 @@ module S1AP_TCFunctions { */ function f_TC_S1AP_eNB_RAB_04() runs on S1APComponent { // Local variables - const QCI c_qci_id := 1; // TODO + const QCI c_qci_id := 1; // Preamble f_S1AP_enb_init(); @@ -226,7 +226,7 @@ module S1AP_TCFunctions { */ function f_TC_S1AP_eNB_RAB_05() runs on S1APComponent { // Local variables - const QCI c_qci_id := 1; // TODO + const QCI c_qci_id := 1; // Preamble f_S1AP_enb_init(); @@ -533,7 +533,7 @@ module S1AP_TCFunctions { */ function f_TC_S1AP_eNB_RAB_11 () runs on S1APComponent { // Local variables - const QCI c_qci_id := 1; // TODO + const QCI c_qci_id := 1; const E_RAB_ID c_E_RAB_ID_A := 0; const NAS_PDU c_nAS_PDU := '0000'O; @@ -636,7 +636,7 @@ module S1AP_TCFunctions { */ function f_TC_S1AP_eNB_RAB_13 () runs on S1APComponent { // Local variables - const QCI c_qci_id := 99; // TODO unknown QCI Id + const QCI c_qci_id := 99; // Unknown QCI Id const E_RAB_ID c_E_RAB_ID_A := 0; const NAS_PDU c_nAS_PDU := '0000'O; @@ -701,7 +701,6 @@ module S1AP_TCFunctions { m_E_RABItem( c_E_RAB_ID_A, { - // TODO radioNetwork :=not_supported_QCI_value } ) @@ -748,7 +747,6 @@ module S1AP_TCFunctions { m_E_RABItem( c_E_RAB_ID_A, { - // TODO radioNetwork :=not_supported_QCI_value } ) @@ -795,7 +793,6 @@ module S1AP_TCFunctions { m_E_RABItem( c_E_RAB_ID_A, { - // TODO radioNetwork :=not_supported_QCI_value } ) @@ -930,14 +927,12 @@ module S1AP_TCFunctions { m_E_RABItem( c_E_RAB_ID_A, { - // TODO radioNetwork :=not_supported_QCI_value } ), m_E_RABItem( c_E_RAB_ID_A, { - // TODO radioNetwork :=not_supported_QCI_value } ) @@ -982,7 +977,6 @@ module S1AP_TCFunctions { m_E_RABItem( c_E_RAB_ID_A, { - // TODO radioNetwork :=not_supported_QCI_value } ) @@ -2552,9 +2546,8 @@ module S1AP_TCFunctions { PX_PLMN_IDENTITY, PX_CELL_ID ), - mw_cause_ran( - - // TODO To be refined - ))); + mw_cause_ran + )); } f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); @@ -2590,9 +2583,8 @@ module S1AP_TCFunctions { PX_PLMN_IDENTITY, PX_CELL_ID ), - mw_cause_ran( - - // TODO To be refined - ))); + mw_cause_ran + )); f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict()); log("*** " & __SCOPE__ & ": INFO: Preamble done. ***"); @@ -2652,7 +2644,7 @@ module S1AP_TCFunctions { vc_eNB_UE_ID, -, mw_cause_ran( - unspecified // TODO Check the value to be used + unspecified // Check the value to be used ) )); } @@ -2689,7 +2681,7 @@ module S1AP_TCFunctions { f_send_Reset( m_resetIEs( m_cause_nas( - unspecified // TODO Check the value to be used + unspecified // Check the value to be used ), m_resetType_all )); @@ -2733,7 +2725,7 @@ module S1AP_TCFunctions { f_recv_Reset( mw_resetIEs( mw_cause_nas( - unspecified // TODO Check the value to be used + unspecified // Check the value to be used ), m_resetType_all )); @@ -2762,7 +2754,7 @@ module S1AP_TCFunctions { f_send_Reset( m_resetIEs( m_cause_nas( - unspecified // TODO Check the value to be used + unspecified // Check the value to be used ), m_resetType_partOfS1_Interface( { @@ -3092,8 +3084,7 @@ module S1AP_TCFunctions { f_recv_eNB_UE_Capability_Info_Indication( mw_uE_Capability_Info_IndicationIEs( vc_MME_UE_ID, - vc_eNB_UE_ID, - - // TODO To be refined + vc_eNB_UE_ID )); f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); } @@ -3142,8 +3133,7 @@ module S1AP_TCFunctions { mw_trace_Failure_IndicationIEs( vc_MME_UE_ID, vc_eNB_UE_ID, - PX_EUTRAN_TRACE_ID, - - // TODO To be refined + PX_EUTRAN_TRACE_ID )); f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); @@ -3182,8 +3172,7 @@ module S1AP_TCFunctions { mw_trace_Failure_IndicationIEs( vc_MME_UE_ID, vc_eNB_UE_ID, - PX_EUTRAN_TRACE_ID, - - // TODO To be refined + PX_EUTRAN_TRACE_ID )); f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); @@ -3217,8 +3206,7 @@ module S1AP_TCFunctions { vc_MME_UE_ID, vc_eNB_UE_ID, PX_EUTRAN_TRACE_ID, - mw_eUTRAN_CGI, - - // TODO To be refined + mw_eUTRAN_CGI )); f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); @@ -3418,7 +3406,7 @@ module S1AP_TCFunctions { mw_location_Report_Failure_IndicationIEs( vc_MME_UE_ID, vc_eNB_UE_ID, - ? // TODO To be refined: what kind of cause :-( + ? )); f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); @@ -4220,7 +4208,7 @@ module S1AP_TCFunctions { f_recv_E_RABSetupRequest(mw_E_RABSetupReqIEs( vc_MME_UE_ID, vc_eNB_UE_ID, - {mw_E_RABToBeSetupItemBearerSUReq(?,?,?,?,?)} + { mw_E_RABToBeSetupItemBearerSUReq(?,?,?,?,?) } )); f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); @@ -4746,8 +4734,7 @@ module S1AP_TCFunctions { mw_uEPagingID_iMSI( PX_IMSI ), - PX_CNDOMAIN, - - // TODO To be refined + PX_CNDOMAIN )); f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); } @@ -4868,7 +4855,7 @@ module S1AP_TCFunctions { f_recv_Reset( mw_resetIEs( mw_cause_nas( - unspecified // TODO Check the value to be used + unspecified // Check the value to be used ), m_resetType_all )); @@ -4897,7 +4884,7 @@ module S1AP_TCFunctions { f_send_Reset( m_resetIEs( m_cause_nas( - unspecified // TODO Check the value to be used + unspecified // Check the value to be used ), m_resetType_all )); @@ -4935,7 +4922,7 @@ module S1AP_TCFunctions { f_send_Reset( m_resetIEs( m_cause_nas( - unspecified // TODO Check the value to be used + unspecified // Check the value to be used ), m_resetType_all )); @@ -5314,7 +5301,7 @@ module S1AP_TCFunctions { vc_MME_UE_ID, vc_eNB_UE_ID, { - mw_eRABDataForwardingItem // TODO To be refined + mw_eRABDataForwardingItem }, PX_CDMA200_PDU, PX_CDMA200_RAT_TYPE diff --git a/ttcn3/S1AP_Templates.ttcn b/ttcn3/S1AP_Templates.ttcn index c5a4eb2..1ed3079 100644 --- a/ttcn3/S1AP_Templates.ttcn +++ b/ttcn3/S1AP_Templates.ttcn @@ -16,7 +16,7 @@ * All rights reserved. * @see ETSI TS 136 413 / 3GPP TS 36.413 version 13.4.0 Release 13 */ -module S1AP_Templates { +module S1AP_Templates { // TODO Remove this file, it seems to be useless group S1AP_PDU { @@ -44,8 +44,6 @@ module S1AP_Templates { } //End group HandoverResourceAllocation - //TODO: Other.... - } // End of group Send group Receive { @@ -58,8 +56,6 @@ module S1AP_Templates { }//End group HandoverResourceAllocation - //TODO: Other.... - } // End of group Receive } //End of group Class1 diff --git a/ttcn3/S1AP_TestCases.ttcn b/ttcn3/S1AP_TestCases.ttcn index 1aac286..a68c011 100644 --- a/ttcn3/S1AP_TestCases.ttcn +++ b/ttcn3/S1AP_TestCases.ttcn @@ -2397,7 +2397,7 @@ module S1AP_TestCases { } // End of group eNB_Role - group MME_Role { // TODO Review all preamble action: E-RAB Setup is exchanged for MME role, shall not be f_rABSetupRequest + group MME_Role { /** * @desc E-RAB management group