Commit 53dc4375 authored by Bostjan Pintar's avatar Bostjan Pintar
Browse files

Minor update for ACC_06* tests

parent 8b834b94
Loading
Loading
Loading
Loading
+1 −0
Changes for test_purposes/NGNAS_Common.tdltx: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -234,5 +234,6 @@ Package NGNAS_Common {
	PIXIT NgapMessage PX_DRG_TWAIT
	PIXIT NgapMessage PX_T3522
	PIXIT NgapMessage PX_T3550
	PIXIT NgapMessage PX_SCHEME_OUTPUT
   
}
 No newline at end of file
+19 −19
Changes for test_purposes/TP_AMF_NGNAS.tdltx: 19 added lines, 19 removed lines.
Original line number Diff line number Diff line
@@ -1020,7 +1020,7 @@ Package TP_AMF_NGNAS {
 
        Objective: "Verify that, during the initial registration procedure, when the REGISTRATION_REQUEST message contains a Requested NSSAI IE with one S-NSSAI that is allowed by the IUT, then the IUT sends a REGISTRATION_ACCEPT message containing an Allowed NSSAI IE with the requested S-NSSAI."

        Reference: "ETSI TS 124 501 [1], Clauses 4.4.6, 5.4.2.4, 5.5.1.2.4, 8.2.7 and 8.2.26"
        Reference: "ETSI TS 124 501 [1], Clauses 4.4.6, 5.4.2.4, 5.5.1.2.4, 8.2.6, 8.2.7 and 8.2.26"

        Configuration: CF_AMF_N2N1
 
@@ -1031,13 +1031,13 @@ Package TP_AMF_NGNAS {
            the UE entity isNotRegisteredToAMF and
            the UE entity hasNoValidNasSecurityContext and
            the IUT entity receives an INITIAL_UE_MESSAGE containing {
                UE_Context_Request_IE set to "requested", //!reference ts_138413v171500p, clause 8.6.1.2: presence of this IE obliges the AMF to trigger the Initial Context Setup procedure
                UE_Context_Request_IE set to "requested", //!TS 138 413, clause 8.6.1.2: presence of this IE obliges the AMF to trigger the Initial Context Setup procedure
                NAS_PDU containing {
                    extended_protocol_discriminator set to 5GS_MOBILITY_MANAGEMENT_MESSAGES,
                    security_header_type set to NOT_SECURITY_PROTECTED,
                    message_type set to REGISTRATION_REQUEST,
                    5GS_registration_type containing {
                        5GS_registration_type_value set to INITIAL_REGISTRATION}, //Follow-On Request Indicator not asserted: this TP verifies Allowed NSSAI only and is independent of connection-release behaviour (TS 123 502 [2], clause 4.2.2.2.2/22), which is covered by a separate TP
                        5GS_registration_type_value set to INITIAL_REGISTRATION}, //!Follow-On Request Indicator not asserted: this TP verifies Allowed NSSAI only and is independent of connection-release behaviour (TS 123 502 [2], clause 4.2.2.2.2/22), which is covered by a separate TP
                    ngKSI containing {
                        nas_key_set_identifier set to "111"}, //!cleartext IE (ref. clause 4.4.6 cleartext IE list); value "111" = "no key is available" (TS 124 501 [1], clause 9.11.3.32), consistent with hasNoValidNasSecurityContext
                    5GS_mobile_identity containing {
@@ -1047,7 +1047,7 @@ Package TP_AMF_NGNAS {
                        MNC set to PX_MNC,
                        Routing_indicator set to PX_ROUTING_INDICATOR,
                        Protection_scheme_id set to PX_PROTECTION_SCHEME_ID, //!null scheme, ECIES profile A or ECIES profile B (TS 124 501 [1], clause 9.11.3.4)
                        Home_network_public_key_identifier set to PX_HOME_NETWORK_PUBLIC_KEY_IDENTIFIER, //!'00000000' for null scheme (TS 124 501 [1], clause 9.11.3.4)
                        Home_network_public_key_identifier set to PX_HOME_NETWORK_PUBLIC_KEY_IDENTIFIER,
                        Scheme_output set to PX_SCHEME_OUTPUT}}} //!cleartext IEs only; Requested NSSAI is a non-cleartext IE and is therefore not present here (see TS 124 501 [1], clause 4.4.6)
            from the GNB entity and
            event SECURITY_MODE_COMMAND occurs
@@ -1087,7 +1087,7 @@ Package TP_AMF_NGNAS {
                }
                then {
                    // not PICS_NGAP_A4_5_2_1: REGISTRATION_ACCEPT conveyed in the NAS_PDU IE of INITIAL_CONTEXT_SETUP_REQUEST
                    the IUT entity sends a INITIAL_CONTEXT_SETUP_REQUEST containing {
                    the IUT entity sends an INITIAL_CONTEXT_SETUP_REQUEST containing {
                        NAS_PDU containing {
                            extended_protocol_discriminator set to 5GS_MOBILITY_MANAGEMENT_MESSAGES,
                            security_header_type set to INTEGRITY_PROTECTED_AND_CIPHERED,
@@ -1106,7 +1106,7 @@ Package TP_AMF_NGNAS {
                                    SD set to PX_SD_1}}}}
                    to the GNB entity
                    or
                    // PICS_NGAP_A4_5_2_1 INITIAL_CONTEXT_SETUP_REQUEST without NAS_PDU IE; REGISTRATION_ACCEPT conveyed in DOWNLINK_NAS_TRANSPORT
                    // PICS_NGAP_A4_5_2_1: INITIAL_CONTEXT_SETUP_REQUEST without NAS_PDU IE; REGISTRATION_ACCEPT conveyed in DOWNLINK_NAS_TRANSPORT
                    the IUT entity sends a DOWNLINK_NAS_TRANSPORT containing {
                        NAS_PDU containing {
                            extended_protocol_discriminator set to 5GS_MOBILITY_MANAGEMENT_MESSAGES,
@@ -1156,7 +1156,7 @@ Package TP_AMF_NGNAS {
            ensure that {
                when {
                    the IUT entity receives an INITIAL_UE_MESSAGE containing {
                        UE_Context_Request_IE set to "requested", //!reference ts_138413v171500p, clause 8.6.1.2: presence of this IE obliges the AMF to trigger the Initial Context Setup procedure
                        UE_Context_Request_IE set to "requested", //!TS 138 413, clause 8.6.1.2: presence of this IE obliges the AMF to trigger the Initial Context Setup procedure
                        NAS_PDU containing {
                            extended_protocol_discriminator set to 5GS_MOBILITY_MANAGEMENT_MESSAGES,
                            security_header_type set to INTEGRITY_PROTECTED, //!ref. TS 124 501 [1], clause 4.4.6: "the UE shall set the security header type of the initial NAS message to 'integrity protected'" when a NAS message container IE is included
@@ -1173,7 +1173,7 @@ Package TP_AMF_NGNAS {
                                AMF_Set_ID set to PX_AMF_SET_ID,
                                AMF_Pointer set to PX_AMF_POINTER,
                                5G_TMSI set to RV_5G_TMSI_OLD}, //!existing/native 5G-TMSI presented by the UE, distinct from the newly assigned value in REGISTRATION_ACCEPT below
                            NAS_message_container containing { //!ciphered non-cleartext IEs, included in the same REGISTRATION_REQUEST message (ref. clause 4.4.6 b)1), no SECURITY_MODE_COMMAND/COMPLETE exchange needed
                            NAS_message_container containing { //!ciphered non-cleartext IEs, included in the same REGISTRATION_REQUEST message (ref. clause 4.4.6 b)1)
                                NAS_PDU containing {
                                    extended_protocol_discriminator set to 5GS_MOBILITY_MANAGEMENT_MESSAGES,
                                    security_header_type set to NOT_SECURITY_PROTECTED,
@@ -1199,7 +1199,7 @@ Package TP_AMF_NGNAS {
                then {
                    //(Note 1: "The IUT may initiate 5GMM common procedures (identification, authentication, security mode control) before sending the REGISTRATION_ACCEPT message (TS 124 501 [1], clause 5.5.1.2.3).")
                    // not PICS_NGAP_A4_5_2_1: REGISTRATION_ACCEPT conveyed in the NAS_PDU IE of INITIAL_CONTEXT_SETUP_REQUEST
                    the IUT entity sends a INITIAL_CONTEXT_SETUP_REQUEST containing {
                    the IUT entity sends an INITIAL_CONTEXT_SETUP_REQUEST containing {
                        NAS_PDU containing {
                            extended_protocol_discriminator set to 5GS_MOBILITY_MANAGEMENT_MESSAGES,
                            security_header_type set to INTEGRITY_PROTECTED_AND_CIPHERED,
@@ -1218,7 +1218,7 @@ Package TP_AMF_NGNAS {
                                    SD set to PX_SD_1}}}}
                    to the GNB entity
                    or
                    // PICS_NGAP_A4_5_2_1 INITIAL_CONTEXT_SETUP_REQUEST without NAS_PDU IE; REGISTRATION_ACCEPT conveyed in DOWNLINK_NAS_TRANSPORT
                    // PICS_NGAP_A4_5_2_1: INITIAL_CONTEXT_SETUP_REQUEST without NAS_PDU IE; REGISTRATION_ACCEPT conveyed in DOWNLINK_NAS_TRANSPORT
                    the IUT entity sends a DOWNLINK_NAS_TRANSPORT containing {
                        NAS_PDU containing {
                            extended_protocol_discriminator set to 5GS_MOBILITY_MANAGEMENT_MESSAGES,
@@ -1252,7 +1252,7 @@ Package TP_AMF_NGNAS {

        Objective: "Verify that, during the initial registration procedure, when the REGISTRATION_REQUEST message contains a Requested NSSAI IE with one S-NSSAI that is allowed by the IUT, then the IUT sends a REGISTRATION_ACCEPT message containing an Allowed NSSAI IE with the requested S-NSSAI."

        Reference: "ETSI TS 124 501 [1], Clauses 4.4.6, 5.4.2.4, 5.5.1.2.4, 8.2.7 and 8.2.26"
        Reference: "ETSI TS 124 501 [1], Clauses 4.4.6, 5.4.2.4, 5.5.1.2.4, 8.2.6, 8.2.7 and 8.2.26"

        Configuration: CF_AMF_N2N1

@@ -1279,7 +1279,7 @@ Package TP_AMF_NGNAS {
                        MNC set to PX_MNC,
                        Routing_indicator set to PX_ROUTING_INDICATOR,
                        Protection_scheme_id set to PX_PROTECTION_SCHEME_ID, //!null scheme, ECIES profile A or ECIES profile B (TS 124 501 [1], clause 9.11.3.4)
                        Home_network_public_key_identifier set to PX_HOME_NETWORK_PUBLIC_KEY_IDENTIFIER, //!'00000000' for null scheme (TS 124 501 [1], clause 9.11.3.4)
                        Home_network_public_key_identifier set to PX_HOME_NETWORK_PUBLIC_KEY_IDENTIFIER,
                        Scheme_output set to PX_SCHEME_OUTPUT}}} //!cleartext IEs only; Requested NSSAI is a non-cleartext IE and is therefore not present here (see TS 124 501 [1], clause 4.4.6)
            from the GNB entity and
            event SECURITY_MODE_COMMAND occurs
@@ -1313,13 +1313,13 @@ Package TP_AMF_NGNAS {
                                        Scheme_output set to PX_SCHEME_OUTPUT},
                                    Requested_NSSAI containing {
                                        S_NSSAI_1 containing {
                                            SST set to PX_SST_1, //!PX_SST_1/PX_SD_1 identify an S-NSSAI that must be provisioned as allowed in the UE's subscription data at the AMF/UDM (IXIT precondition, not modelled as an Event)
                                            SST set to PX_SST_1, //!PX_SST_1/PX_SD_1 identify an S-NSSAI that must be provisioned as allowed in the UE's subscription data at the AMF/UDM (PIXIT precondition, not modelled as an Event)
                                            SD set to PX_SD_1}}}}}}
                    from the GNB entity
                }
                then {
                    // PICS_NGAP_A4_2_1_1 REGISTRATION_ACCEPT conveyed in the NAS_PDU IE of INITIAL_CONTEXT_SETUP_REQUEST
                    the IUT entity sends a INITIAL_CONTEXT_SETUP_REQUEST containing {
                    // PICS_NGAP_A4_2_1_1: REGISTRATION_ACCEPT conveyed in the NAS_PDU IE of INITIAL_CONTEXT_SETUP_REQUEST
                    the IUT entity sends an INITIAL_CONTEXT_SETUP_REQUEST containing {
                        NAS_PDU containing {
                            extended_protocol_discriminator set to 5GS_MOBILITY_MANAGEMENT_MESSAGES,
                            security_header_type set to INTEGRITY_PROTECTED_AND_CIPHERED,
@@ -1430,8 +1430,8 @@ Package TP_AMF_NGNAS {
                }
                then {
                    //(Note 1: "The IUT may initiate 5GMM common procedures (identification, authentication, security mode control) before sending the REGISTRATION_ACCEPT message (TS 124 501 [1], clause 5.5.1.2.3).")
                    // PICS_NGAP_A4_2_1_1 REGISTRATION_ACCEPT conveyed in the NAS_PDU IE of INITIAL_CONTEXT_SETUP_REQUEST
                    the IUT entity sends a INITIAL_CONTEXT_SETUP_REQUEST containing {
                    // PICS_NGAP_A4_2_1_1: REGISTRATION_ACCEPT conveyed in the NAS_PDU IE of INITIAL_CONTEXT_SETUP_REQUEST
                    the IUT entity sends an INITIAL_CONTEXT_SETUP_REQUEST containing {
                        NAS_PDU containing {
                            extended_protocol_discriminator set to 5GS_MOBILITY_MANAGEMENT_MESSAGES,
                            security_header_type set to INTEGRITY_PROTECTED_AND_CIPHERED,
@@ -1517,7 +1517,7 @@ Package TP_AMF_NGNAS {
                                AMF_Set_ID set to PX_AMF_SET_ID,
                                AMF_Pointer set to PX_AMF_POINTER,
                                5G_TMSI set to RV_5G_TMSI_OLD}, //!existing/native 5G-TMSI presented by the UE, distinct from the newly assigned value in REGISTRATION_ACCEPT below
                            NAS_message_container containing { //!ciphered non-cleartext IEs, included in the same REGISTRATION_REQUEST message (ref. clause 4.4.6 b)1), no SECURITY_MODE_COMMAND/COMPLETE exchange needed
                            NAS_message_container containing { //!ciphered non-cleartext IEs, included in the same REGISTRATION_REQUEST message (ref. clause 4.4.6 b)1)
                                NAS_PDU containing {
                                    extended_protocol_discriminator set to 5GS_MOBILITY_MANAGEMENT_MESSAGES,
                                    security_header_type set to NOT_SECURITY_PROTECTED,
@@ -1620,7 +1620,7 @@ Package TP_AMF_NGNAS {
                                AMF_Set_ID set to PX_AMF_SET_ID,
                                AMF_Pointer set to PX_AMF_POINTER,
                                5G_TMSI set to RV_5G_TMSI_OLD}, //!existing/native 5G-TMSI presented by the UE, distinct from the newly assigned value in REGISTRATION_ACCEPT below
                            NAS_message_container containing { //!ciphered non-cleartext IEs, included in the same REGISTRATION_REQUEST message (ref. clause 4.4.6 b)1), no SECURITY_MODE_COMMAND/COMPLETE exchange needed
                            NAS_message_container containing { //!ciphered non-cleartext IEs, included in the same REGISTRATION_REQUEST message (ref. clause 4.4.6 b)1)
                                NAS_PDU containing {
                                    extended_protocol_discriminator set to 5GS_MOBILITY_MANAGEMENT_MESSAGES,
                                    security_header_type set to NOT_SECURITY_PROTECTED,