Commit ba584fa4 authored by Iztok Juvancic's avatar Iztok Juvancic
Browse files

Merge branch 'TTF_T048' of https://forge.etsi.org/rep/int/5g-core/nas into TTF_T048

parents 16cf3afb 26a59b63
Loading
Loading
Loading
Loading
+18 −29
Original line number Diff line number Diff line
@@ -419,8 +419,6 @@ Package TP_AMF {
                                   5G_TMSI indicating value RV_5G_TMSI;,
                               TAI_list containing
                                   Partial_tracking_area_list_1 containing
                                       Type_of_list,
                                       Number_of_elements,
                                       MCC indicating value PX_MCC,
                                       MNC indicating value PX_MNC,
                                       TAC indicating value PX_TAC;;,
@@ -646,7 +644,7 @@ Package TP_AMF {
                                    payload_container_type set to "N1 SM information",
                                    number_of_optional_IEs set to 1,
                                    optional_IE_1 set to PDU_SESSION_ESTABLISHMENT_ACCEPT;,
                                pDU_session_ID;;
                                pDU_session_ID RV_PDU_SESSION_ID;;
                    to the GNB entity
                    }

@@ -718,8 +716,6 @@ Package TP_AMF {
                                5G_TMSI indicating value RV_5G_TMSI;,
                            TAI_list containing
                                Partial_tracking_area_list_1 containing
                                    Type_of_list,
                                    Number_of_elements,
                                    MCC indicating value PX_MCC,
                                    MNC indicating value PX_MNC,
                                    TAC indicating value PX_TAC;;,
@@ -791,8 +787,6 @@ Package TP_AMF {
                                5G_TMSI indicating value RV_5G_TMSI;,
                            TAI_list containing
                                Partial_tracking_area_list_1 containing
                                    Type_of_list,
                                    Number_of_elements,
                                    MCC indicating value PX_MCC,
                                    MNC indicating value PX_MNC,
                                    TAC indicating value PX_TAC;;,
@@ -864,8 +858,6 @@ Package TP_AMF {
                                5G_TMSI indicating value RV_5G_TMSI;,
                            TAI_list containing
                                Partial_tracking_area_list_1 containing
                                    Type_of_list,
                                    Number_of_elements,
                                    MCC indicating value PX_MCC,
                                    MNC indicating value PX_MNC,
                                    TAC indicating value PX_TAC;;,
@@ -932,9 +924,7 @@ Package TP_AMF {
                            Allowed_NSSAI containing
                                S_NSSAI_1 containing
                                    SST set to PX_SST_1,
                                    SD set to PX_SD_1,
                                    Mapped_HPLMN_SST set to PX_MAPPED_HPLMN_SST_1,
                                    Mapped_HPLMN_SD set to PX_MAPPED_HPLMN_SD_1;;;; 
                                    SD set to PX_SD_1;;;; 
                    to the GNB entity       
                }
            }
@@ -995,7 +985,6 @@ Package TP_AMF {
                                5G_TMSI indicating value RV_5G_TMSI;,
                            Rejected_NSSAI containing
                                Rejected_S_NSSAI_1 containing
                                    Cause_value,
                                    SST set to PX_SST_Rejected,
                                    SD set to PX_SD_Rejected;;;; 
                    to the GNB entity       
@@ -1030,7 +1019,7 @@ Package TP_AMF {
                            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,
                                5GS_registration_type set to INITIAL_REGISTRATION,
                                FOR indicating value 1;, //Follow-on request pending
                            5GS_mobile_identity containing
                                SUPI_format indicating value IMSI,
@@ -1126,11 +1115,11 @@ Package TP_AMF {
                    the IUT entity receives an UPLINK_NAS_TRANSPORT containing
                        NAS_PDU containing
                            extended_protocol_discriminator set to 5GS_MOBILITY_MANAGEMENT_MESSAGES, 
                            security_header_type set to NOT_SECURITY_PROTECTED,
                            security_header_type set to INTEGRITY_PROTECTED_AND_CIPHERED,
                            message_type set to DEREGISTRATION_REQUEST,
                            Deregistration_type containing
                                Switch_off_value set to NORMAL_DEREGISTRATION,
                                Reregistration_required_value set to REREGISTRATION_NOT_REQUIRED,
                                Switch_off set to NORMAL_DEREGISTRATION,
                                Reregistration_required set to REREGISTRATION_NOT_REQUIRED,
                                Access_type set to 3GPP_ACCESS;,
                            5GS_mobile_identity containing
                                Type_of_identity set to 5G_GUTI,
@@ -1176,11 +1165,11 @@ Package TP_AMF {
                    the IUT entity receives an UPLINK_NAS_TRANSPORT containing
                        NAS_PDU containing
                            extended_protocol_discriminator set to 5GS_MOBILITY_MANAGEMENT_MESSAGES, 
                            security_header_type set to NOT_SECURITY_PROTECTED,
                            security_header_type set to INTEGRITY_PROTECTED_AND_CIPHERED,
                            message_type set to DEREGISTRATION_REQUEST,
                            Deregistration_type containing
                                Switch_off_value set to SWITCH_OFF,
                                Reregistration_required_value set to REREGISTRATION_NOT_REQUIRED,
                                Switch_off set to SWITCH_OFF,
                                Reregistration_required set to REREGISTRATION_NOT_REQUIRED,
                                Access_type set to 3GPP_ACCESS;,
                            5GS_mobile_identity containing
                                Type_of_identity set to 5G_GUTI,
@@ -1236,11 +1225,11 @@ Package TP_AMF {
                    the IUT entity sends a DOWNLINK_NAS_TRANSPORT containing
                        NAS_PDU containing
                            extended_protocol_discriminator set to 5GS_MOBILITY_MANAGEMENT_MESSAGES, 
                            security_header_type set to NOT_SECURITY_PROTECTED,
                            security_header_type set to INTEGRITY_PROTECTED_AND_CIPHERED,
                            message_type set to DEREGISTRATION_REQUEST,
                            Deregistration_type containing
                                Switch_off_value set to NORMAL_DEREGISTRATION,
                                Reregistration_required_value set to REREGISTRATION_NOT_REQUIRED,
                                Switch_off set to NORMAL_DEREGISTRATION,
                                Reregistration_required set to REREGISTRATION_NOT_REQUIRED,
                                Access_type set to 3GPP_ACCESS;;; 
                    to the GNB entity       
                }
@@ -1281,11 +1270,11 @@ Package TP_AMF {
                    the IUT entity sends a DOWNLINK_NAS_TRANSPORT containing
                        NAS_PDU containing
                            extended_protocol_discriminator set to 5GS_MOBILITY_MANAGEMENT_MESSAGES, 
                            security_header_type set to NOT_SECURITY_PROTECTED,
                            security_header_type set to INTEGRITY_PROTECTED_AND_CIPHERED,
                            message_type set to DEREGISTRATION_REQUEST,
                            Deregistration_type containing
                                Switch_off_value set to NORMAL_DEREGISTRATION,
                                Reregistration_required_value set to REREGISTRATION_NOT_REQUIRED,
                                Switch_off set to NORMAL_DEREGISTRATION,
                                Reregistration_required set to REREGISTRATION_NOT_REQUIRED,
                                Access_type set to 3GPP_ACCESS;;; 
                    to the GNB entity       
                }
@@ -1318,11 +1307,11 @@ Package TP_AMF {
                    the IUT entity sends a DOWNLINK_NAS_TRANSPORT containing
                        NAS_PDU containing
                            extended_protocol_discriminator set to 5GS_MOBILITY_MANAGEMENT_MESSAGES, 
                            security_header_type set to NOT_SECURITY_PROTECTED,
                            security_header_type set to INTEGRITY_PROTECTED_AND_CIPHERED,
                            message_type set to DEREGISTRATION_REQUEST,
                            Deregistration_type containing
                                Switch_off_value set to NORMAL_DEREGISTRATION,
                                Reregistration_required_value set to REREGISTRATION_REQUIRED,
                                Switch_off set to NORMAL_DEREGISTRATION,
                                Reregistration_required set to REREGISTRATION_REQUIRED,
                                Access_type set to 3GPP_ACCESS;;; 
                    to the GNB entity       
                }