Commit 7b45d8bf authored by Yann Garcia's avatar Yann Garcia
Browse files

Validate template functions calls

parent b87e6fb9
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ system.NGAP_AMF.params := "NGAP/SCTP(server=127.0.0.5,port=38412,debug=1)"
# Verify that the IUT can send a  PDU SESSION RESOURCE SETUP REQUEST with at least one PDU session resource list to established PDU session.
#NGAP_TestCases.TC_NGAP_AMF_PDU_01
# Verify that the IUT can send a  PDU_SESSION_RESOURCE_RELEASE_COMMAND to release PDU session.
NGAP_TestCases.TC_NGAP_AMF_PDU_02
#NGAP_TestCases.TC_NGAP_AMF_PDU_02
# Verify that the IUT can send a  PDU_SESSION_RESOURCE_MODIFY_REQUEST to modify PDU session.
#NGAP_TestCases.TC_NGAP_AMF_PDU_03
# Verify that the AMF node successfully processes a  PDU_SESSION_RESOURCE_MODIFY_INDICATION contains mandatory IEs and answers with PDU_SESSION_RESOURCE_MODIFY_CONFIRM for successfully modified PDU session.
@@ -123,7 +123,7 @@ NGAP_TestCases.TC_NGAP_AMF_PDU_02
# Verify the IUT correctly sets the UE Context after Authentication and Security procedure has been executed
#NGAP_TestCases.TC_NGAP_AMF_CMP_01
# Verify that the IUT can send a UE CONTEXT RELEASE COMMAND that contains both the AMF_UE_NGAP_ID IE and the RAN_UE_NGAP_ID IE or only AMF_UE_NGAP_ID
#NGAP_TestCases.TC_NGAP_AMF_CMP_02
NGAP_TestCases.TC_NGAP_AMF_CMP_02
# Verify that the IUT sends a UE CONTEXT RELEASE COMMAND after UE_CONTEXT_RELEASE_REQUEST to release the UE-associated logic NG-connection due to NG-RAN node generated reasons
#NGAP_TestCases.TC_NGAP_AMF_CMP_03
# Verify that the IUT can send a UE CONTEXT MODIFICATION REQUEST containing mandatory IEs
+2 −2
Original line number Diff line number Diff line
@@ -25111,8 +25111,8 @@ module LibNGAP_Templates {
                                                    template MobilityRestrictionList p_mobilityRestrictionList := omit,
                                                    template UERadioCapability p_uERadioCapability := omit,
                                                    template IndexToRFSP p_indexToRFSP := omit,
                                                    template MaskedIMEISV p_maskedIMEISV := omit,
                                                    template NAS_PDU p_nAS_PDU := omit,
                                                    template MaskedIMEISV p_maskedIMEISV := ?,
                                                    template NAS_PDU p_nAS_PDU := ?,
                                                    template EmergencyFallbackIndicator p_emergencyFallbackIndicator := omit,
                                                    template RRCInactiveTransitionReportRequest p_rRCInactiveTransitionReportRequest := omit,
                                                    template RedirectionVoiceFallback p_redirectionVoiceFallback := omit,
+2 −98
Original line number Diff line number Diff line
@@ -1026,36 +1026,6 @@ module LibNGAP_Functions {
                                                                               PX_AMF_SET_ID,
                                                                               PX_AMF_POINTER
                        ))));
        // f_recv_NGAP_PDU(
        //                 mw_ngap_initMsg(
        //                                 mw_n2_InitialContextSetupRequest/*_withPDUSessionList*/(
        //                                                                                         vc_AMF_UE_ID,
        //                                                                                         vc_RAN_UE_ID,
        //                                                                                         mw_gUAMI
        //                                                                                         (
        //                                                                                             fl_NasNN_MCC2PlmnId(PX_NAS_MCC, PX_NAS_MNC),
        //                                                                                             PX_AMF_REGION_ID,
        //                                                                                             PX_AMF_SET_ID,
        //                                                                                             PX_AMF_POINTER,
        //                                                                                             *
        //                                                                                         )/*,
        //                                                                                         {
        //                                                                                         mw_pDUSessionResourceSetupItemCxtReq
        //                                                                                         (
        //                                                                                             PX_PDU_SESSION_ID,
        //                                                                                             mw_s_NSSAI
        //                                                                                             (
        //                                                                                                 PX_SST
        //                                                                                             ),
        //                                                                                             ?,
        //                                                                                             *,
        //                                                                                             *
        //                                                                                         )
        //                                                                                         },
        //                                                                                         ?,
        //                                                                                         ?,
        //                                                                                         ?     */
        //                 )));
        vc_initialContextSetupRequest := vc_recvNGAP_PDU.initiatingMessage.value_.InitialContextSetupRequest;
        f_NASPDU_Get(vc_recvNGAP_PDU);
        var NG_NAS_DL_Message_Type v_message;
@@ -1108,36 +1078,6 @@ module LibNGAP_Functions {
                                                                               PX_AMF_SET_ID,
                                                                               PX_AMF_POINTER
                        ))));
        // f_recv_NGAP_PDU(
        //                 mw_ngap_initMsg(
        //                                 mw_n2_InitialContextSetupRequest/*_withPDUSessionList*/(
        //                                                                                         vc_AMF_UE_ID,
        //                                                                                         vc_RAN_UE_ID,
        //                                                                                         mw_gUAMI
        //                                                                                         (
        //                                                                                             fl_NasNN_MCC2PlmnId(PX_NAS_MCC, PX_NAS_MNC),
        //                                                                                             PX_AMF_REGION_ID,
        //                                                                                             PX_AMF_SET_ID,
        //                                                                                             PX_AMF_POINTER,
        //                                                                                             *
        //                                                                                         )/*,
        //                                                                                         {
        //                                                                                         mw_pDUSessionResourceSetupItemCxtReq
        //                                                                                         (
        //                                                                                             PX_PDU_SESSION_ID,
        //                                                                                             mw_s_NSSAI
        //                                                                                             (
        //                                                                                                 PX_SST
        //                                                                                             ),
        //                                                                                             ?,
        //                                                                                             *,
        //                                                                                             *
        //                                                                                         )
        //                                                                                         },
        //                                                                                         ?,
        //                                                                                         ?,
        //                                                                                         ?     */
        //                 )));
        vc_initialContextSetupRequest := vc_recvNGAP_PDU.initiatingMessage.value_.InitialContextSetupRequest;
        f_NASPDU_Get(vc_recvNGAP_PDU);
        var NG_NAS_DL_Message_Type v_message;
@@ -1686,27 +1626,9 @@ module LibNGAP_Functions {
                                                                                                                       -,//in template (omit) NAS_PDU p_pDUSessionNAS_PDU := omit,
                                                                                                                       -//in template (omit) PDUSessionResourceSetupItemSUReq.iE_Extensions p_iE_Extensions := omit
                                                                                                                       )
                                                                               }
                                                                               },
                                                                               ?
                        )));
        // f_recv_NGAP_PDU(
        //                 mw_ngap_initMsg(
        //                                 mw_n2_PDUSessionResourceSetupRequest(
        //                                                                     vc_AMF_UE_ID,
        //                                                                     vc_RAN_UE_ID,
        //                                                                     {
        //                                                                         mw_pDUSessionResourceSetupItemSUReq(
        //                                                                                                             PX_PDU_SESSION_ID,
        //                                                                                                             mw_s_NSSAI(
        //                                                                                                                        PX_SST/*,
        //                                                                                                                        PX_SD,
        //                                                                                                                        -*/
        //                                                                                                             ),
        //                                                                                                             ?,//decmatch(mw_pDUSessionResourceSetupRequestTransfer(?)),//OCTETSTRING
        //                                                                                                             -,//in template (omit) NAS_PDU p_pDUSessionNAS_PDU := omit,
        //                                                                                                             -//in template (omit) PDUSessionResourceSetupItemSUReq.iE_Extensions p_iE_Extensions := omit
        //                                                                                                             )
        //                                                                     }
        //                 )));

        var integer numOfIEs := lengthof(vc_recvNGAP_PDU.initiatingMessage.value_.pDUSessionResourceSetupRequest.protocolIEs)
        log("*** " & __SCOPE__ & ": DBG: numOfIEs: ", numOfIEs, "");
@@ -2130,12 +2052,6 @@ module LibNGAP_Functions {
                                                                         vc_AMF_UE_ID,
                                                                         vc_RAN_UE_ID
                        )));
        // f_recv_NGAP_PDU(
        //                 mw_ngap_succMsg(
        //                                 mw_n2_UEContextReleaseComplete_noPDUSessionResourceSetupListSURes(
        //                                                                                                   vc_AMF_UE_ID,
        //                                                                                                   vc_RAN_UE_ID
        //                 )));
    }

    function f_await_ue_context_release_command_send_ue_context_release_complete() runs on NGNASComponent {
@@ -2198,12 +2114,6 @@ module LibNGAP_Functions {
                                                                         vc_AMF_UE_ID,
                                                                         vc_RAN_UE_ID
                        )));
        // f_recv_NGAP_PDU(
        //                 mw_ngap_succMsg(
        //                                 mw_n2_UEContextReleaseComplete_noPDUSessionResourceSetupListSURes(
        //                                                                                                   vc_AMF_UE_ID,
        //                                                                                                   vc_RAN_UE_ID
        //                 )));
    }

    function f_send_ue_context_release_complete() runs on NGNASComponent {
@@ -2286,12 +2196,6 @@ module LibNGAP_Functions {
                                                                         vc_AMF_UE_ID,
                                                                         vc_RAN_UE_ID
                        )));
        // f_recv_NGAP_PDU(
        //                 mw_ngap_succMsg(
        //                                 mw_n2_UEContextReleaseComplete(
        //                                                                vc_AMF_UE_ID,
        //                                                                vc_RAN_UE_ID
        //                 )));
    }

    /**