Commit 4a65f9ff authored by kretzschmann's avatar kretzschmann
Browse files

merge

parents d9434618 ccf67622
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ Package TP_AMF {
            
            TP Id TP_NGNAS_AMF_AUT_SEQ_01 
            
            Test objective "Verify that the IUT sends a SECURITY MODE CONTROL message correctly to indicate NAS security mode procedure upon receipt of a NAS AUTHENTICATION RESPONSE."
            Test objective "Verify that the IUT sends a SECURITY MODE COMMAND message correctly to indicate NAS security mode procedure upon receipt of a NAS AUTHENTICATION RESPONSE."
            
            Reference 
                "ETSI TS 124 501 [1], Clause 5.4.1.2"
@@ -358,7 +358,7 @@ Package TP_AMF {
            
                TP Id TP_5GNAS_AMF_SEC_ACC_01 
                
                Test objective "Verify that the IUT, upon receiving the NAS Security Mode Complete Message after completing the NAS Authentication and Security procedure, successfully completes the registration process by accepting the registration."
                Test objective "Verify that the IUT, upon receiving the NAS SECURITY MODE COMPLETE message after completing the NAS Authentication and Security procedure, successfully completes the registration process by accepting the registration."

                Reference 
                    "ETSI TS 124 501 [1], Clause 5.4.2 and 8.2.25"
@@ -418,7 +418,7 @@ Package TP_AMF {
            
                TP Id TP_5GNAS_AMF_SEC_REJ_01 
                
                Test objective "Verify that the IUT, upon receiving the NAS Security Mode Reject Message after a failed NAS Authentication and security procedure, successfully aborts the registration process by rejecting the registration."
                Test objective "Verify that the IUT, upon receiving the NAS SECURITY MODE REJECT message after a failed NAS Authentication and security procedure, successfully aborts the registration process by rejecting the registration."

                Reference 
                    "ETSI TS 124 501 [1], Clause 5.4.2 and 8.2.25"
+203 −0
Original line number Diff line number Diff line
@@ -1042,6 +1042,46 @@ module NG_NAS_TCFunctions {
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");

                // Body
                vt_NgNasUl_Msg := 
                    m_NG_DEREGISTRATION_REQUEST_MO(
                        crs_DeregisterType ('0'B,//B1_Type p_SwitchOff,
                                            '0'B,//B1_Type p_ReReg,
                                            '01'B//B2_Type p_Access := '01'B),//in template (value) DeregisterType p_DeregisterType,
                        ),
                        m_NAS_KeySetIdentifier('111'B,'1'B),//in template (value) NAS_KeySetIdentifier p_KSI,
                        m_NG_MobileIdentitySUCI('0000'B,'00f110214300014444330302'O)//in template (value) NG_MobileIdentity p_MobileId,                            
                    );
                 f_send_NGAP_PDU(
                    m_ngap_initMsg(
                        m_n2_initialUeMessage(
                            -,
                            bit2oct(encvalue( vt_NgNasUl_Msg )),//vc_sendNAS_PDU
                            m_uPTransportLayerInformation_userLocationInformationNR(
                                                                                    m_userLocationInformationNR(
                                                                                        m_nR_CGI,
                                                                                        m_tAI
                                                                                    ))
                    ))
                );

                f_recv_NGAP_PDU(
                    mw_ngap_initMsg(
                        mw_n2_DownlinkNASTransport(
                            PX_AMF_UE_NGAP_ID,
                            PX_RAN_UE_NGAP_ID,
                            ?//template (present) NAS_PDU p_nasPdu := ?
                    ))
                );

                f_NASPDU_Get(vc_recvNGAP_PDU);
                if (f_Check_5GAKA_NAS_DL_Message(vc_recvNAS_PDU, 
                                                 mw_NG_DEREGISTRATION_ACCEPT_MO
                                                 ) == false) {

                    log("*** " & __SCOPE__ & ": FAIL: NG_DEREGISTRATION_ACCEPT mismatch. ***");
                    f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
                }

                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
                log("*** " & __SCOPE__ & ": INFO: Testbody done. ***");

@@ -1064,6 +1104,46 @@ module NG_NAS_TCFunctions {
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");

                // Body
                vt_NgNasUl_Msg := 
                    m_NG_DEREGISTRATION_REQUEST_MO(
                        crs_DeregisterType ('1'B,//B1_Type p_SwitchOff,
                                            '0'B,//B1_Type p_ReReg,
                                            '01'B//B2_Type p_Access := '01'B),//in template (value) DeregisterType p_DeregisterType,
                        ),
                        m_NAS_KeySetIdentifier('111'B,'1'B),//in template (value) NAS_KeySetIdentifier p_KSI,
                        m_NG_MobileIdentitySUCI('0000'B,'00f110214300014444330302'O)//in template (value) NG_MobileIdentity p_MobileId,                            
                    );
                 f_send_NGAP_PDU(
                    m_ngap_initMsg(
                        m_n2_initialUeMessage(
                            -,
                            bit2oct(encvalue( vt_NgNasUl_Msg )),//vc_sendNAS_PDU
                            m_uPTransportLayerInformation_userLocationInformationNR(
                                                                                    m_userLocationInformationNR(
                                                                                        m_nR_CGI,
                                                                                        m_tAI
                                                                                    ))
                    ))
                );

                f_recv_NGAP_PDU(
                    mw_ngap_initMsg(
                        mw_n2_DownlinkNASTransport(
                            PX_AMF_UE_NGAP_ID,
                            PX_RAN_UE_NGAP_ID,
                            ?//template (present) NAS_PDU p_nasPdu := ?
                    ))
                );

                f_NASPDU_Get(vc_recvNGAP_PDU);
                if (f_Check_5GAKA_NAS_DL_Message(vc_recvNAS_PDU, 
                                                 mw_NG_DEREGISTRATION_ACCEPT_MO
                                                 ) == false) {

                    log("*** " & __SCOPE__ & ": FAIL: NG_DEREGISTRATION_ACCEPT mismatch. ***");
                    f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
                }

                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
                log("*** " & __SCOPE__ & ": INFO: Testbody done. ***");

@@ -1087,9 +1167,41 @@ module NG_NAS_TCFunctions {
                // Preamble
                f_NGAP_gnb_init();
                f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict());
                //USER REGISTRATION
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");

                // Body
                f_recv_NGAP_PDU(
                    mw_ngap_initMsg(
                        mw_n2_DownlinkNASTransport(
                            PX_AMF_UE_NGAP_ID,
                            PX_RAN_UE_NGAP_ID,
                            ?//template (present) NAS_PDU p_nasPdu := ?
                    ))
                );

                f_NASPDU_Get(vc_recvNGAP_PDU);
                if (f_Check_5GAKA_NAS_DL_Message(vc_recvNAS_PDU, 
                                                 mw_NG_DEREGISTRATION_REQUEST_MT(
                                                    crs_DeregisterType ('0'B,//B1_Type p_SwitchOff,
                                                                        '0'B,//B1_Type p_ReReg,
                                                                        '01'B//B2_Type p_Access := '01'B),//in template (value) DeregisterType p_DeregisterType,
                                                    )//template (present) DeregisterType p_Type := ?,
                                                    //template GMM_GSM_Cause p_Cause := *,
                                                    //template GPRS_Timer2 p_T3346 := *,
                                                    //template RejectedNSSAI p_RejectedNSSAI := *,
                                                    //template CAGInfoList p_CAGInfoList := *,
                                                    //template ExtdRejectedNSSAI p_ExtdRejectedNSSAI := *,
                                                    //template RegistrationWaitRange p_DisasterReturnWaitRange := *,
                                                    //template ExtdCAGInfoList p_ExtdCAGInfoList := *,
                                                    //template GPRS_Timer3 p_LowerBoundTimerValue := *,
                                                    //template NG_TrackingAreaIdList p_ForbidTAIList_Roaming := *,
                                                    //template NG_TrackingAreaIdList p_ForbidTAIList_RegProvService := *
                                                 )) == false) {

                    log("*** " & __SCOPE__ & ": FAIL: NG_DEREGISTRATION_REQUEST_MT mismatch. ***");
                    f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
                }
                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
                log("*** " & __SCOPE__ & ": INFO: Testbody done. ***");

@@ -1112,6 +1224,66 @@ module NG_NAS_TCFunctions {
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");

                // Body
                f_recv_NGAP_PDU(
                    mw_ngap_initMsg(
                        mw_n2_DownlinkNASTransport(
                            PX_AMF_UE_NGAP_ID,
                            PX_RAN_UE_NGAP_ID,
                            ?//template (present) NAS_PDU p_nasPdu := ?
                    ))
                );

                f_NASPDU_Get(vc_recvNGAP_PDU);
                if (f_Check_5GAKA_NAS_DL_Message(vc_recvNAS_PDU, 
                                                 mw_NG_DEREGISTRATION_REQUEST_MT(
                                                    //template (present) DeregisterType p_Type := ?,
                                                    //template GMM_GSM_Cause p_Cause := *,
                                                    //template GPRS_Timer2 p_T3346 := *,
                                                    //template RejectedNSSAI p_RejectedNSSAI := *,
                                                    //template CAGInfoList p_CAGInfoList := *,
                                                    //template ExtdRejectedNSSAI p_ExtdRejectedNSSAI := *,
                                                    //template RegistrationWaitRange p_DisasterReturnWaitRange := *,
                                                    //template ExtdCAGInfoList p_ExtdCAGInfoList := *,
                                                    //template GPRS_Timer3 p_LowerBoundTimerValue := *,
                                                    //template NG_TrackingAreaIdList p_ForbidTAIList_Roaming := *,
                                                    //template NG_TrackingAreaIdList p_ForbidTAIList_RegProvService := *
                                                 )) == false) {

                    log("*** " & __SCOPE__ & ": FAIL: NG_DEREGISTRATION_REQUEST_MT mismatch. ***");
                    f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
                }
                //Not sent sesponse and again wait for deregistration_request
                f_recv_NGAP_PDU(
                    mw_ngap_initMsg(
                        mw_n2_DownlinkNASTransport(
                            PX_AMF_UE_NGAP_ID,
                            PX_RAN_UE_NGAP_ID,
                            ?//template (present) NAS_PDU p_nasPdu := ?
                    ))
                );

                f_NASPDU_Get(vc_recvNGAP_PDU);
                if (f_Check_5GAKA_NAS_DL_Message(vc_recvNAS_PDU, 
                                                 mw_NG_DEREGISTRATION_REQUEST_MT(
                                                    crs_DeregisterType ('0'B,//B1_Type p_SwitchOff,
                                                                        '0'B,//B1_Type p_ReReg,
                                                                        '01'B//B2_Type p_Access := '01'B),//in template (value) DeregisterType p_DeregisterType,
                                                    )//template (present) DeregisterType p_Type := ?,
                                                    //template GMM_GSM_Cause p_Cause := *,
                                                    //template GPRS_Timer2 p_T3346 := *,
                                                    //template RejectedNSSAI p_RejectedNSSAI := *,
                                                    //template CAGInfoList p_CAGInfoList := *,
                                                    //template ExtdRejectedNSSAI p_ExtdRejectedNSSAI := *,
                                                    //template RegistrationWaitRange p_DisasterReturnWaitRange := *,
                                                    //template ExtdCAGInfoList p_ExtdCAGInfoList := *,
                                                    //template GPRS_Timer3 p_LowerBoundTimerValue := *,
                                                    //template NG_TrackingAreaIdList p_ForbidTAIList_Roaming := *,
                                                    //template NG_TrackingAreaIdList p_ForbidTAIList_RegProvService := *
                                                 )) == false) {

                    log("*** " & __SCOPE__ & ": FAIL: NG_DEREGISTRATION_REQUEST_MT mismatch. ***");
                    f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
                }
                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
                log("*** " & __SCOPE__ & ": INFO: Testbody done. ***");

@@ -1134,6 +1306,37 @@ module NG_NAS_TCFunctions {
                log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");

                // Body
                f_recv_NGAP_PDU(
                    mw_ngap_initMsg(
                        mw_n2_DownlinkNASTransport(
                            PX_AMF_UE_NGAP_ID,
                            PX_RAN_UE_NGAP_ID,
                            ?//template (present) NAS_PDU p_nasPdu := ?
                    ))
                );

                f_NASPDU_Get(vc_recvNGAP_PDU);
                if (f_Check_5GAKA_NAS_DL_Message(vc_recvNAS_PDU, 
                                                 mw_NG_DEREGISTRATION_REQUEST_MT(
                                                    crs_DeregisterType ('0'B,//B1_Type p_SwitchOff,
                                                                        '1'B,//B1_Type p_ReReg,
                                                                        '01'B//B2_Type p_Access := '01'B),//in template (value) DeregisterType p_DeregisterType,
                                                    )//template (present) DeregisterType p_Type := ?,
                                                    //template GMM_GSM_Cause p_Cause := *,
                                                    //template GPRS_Timer2 p_T3346 := *,
                                                    //template RejectedNSSAI p_RejectedNSSAI := *,
                                                    //template CAGInfoList p_CAGInfoList := *,
                                                    //template ExtdRejectedNSSAI p_ExtdRejectedNSSAI := *,
                                                    //template RegistrationWaitRange p_DisasterReturnWaitRange := *,
                                                    //template ExtdCAGInfoList p_ExtdCAGInfoList := *,
                                                    //template GPRS_Timer3 p_LowerBoundTimerValue := *,
                                                    //template NG_TrackingAreaIdList p_ForbidTAIList_Roaming := *,
                                                    //template NG_TrackingAreaIdList p_ForbidTAIList_RegProvService := *
                                                 )) == false) {

                    log("*** " & __SCOPE__ & ": FAIL: NG_DEREGISTRATION_REQUEST_MT mismatch. ***");
                    f_selfOrClientSyncAndVerdict(c_tbDone, e_error);
                }
                f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());
                log("*** " & __SCOPE__ & ": INFO: Testbody done. ***");