Merge branch 'TTF_T048' of https://forge.etsi.org/rep/int/5g-core/nas into TTF_T048 (c9b10b91) · Commits · INT - Core Network and Interoperability Testing / 5G Core / NAS

ttcn/Ats_NG_NAS/NG_NAS_TCFunctions.ttcn

+25 −21

Original line number	Diff line number	Diff line
		@@ -74,7 +74,7 @@ module NG_NAS_TCFunctions {
		f_recv_NGAP_PDU(
		mw_ngap_initMsg(
		mw_n2_DownlinkNASTransport(
		?,//PX_AMF_UE_NGAP_ID,
		?,//?,//PX_AMF_UE_NGAP_ID,
		PX_RAN_UE_NGAP_ID,
		? // AuthorizationRequest
		)));
		@@ -125,7 +125,11 @@ module NG_NAS_TCFunctions {
		f_recv_NGAP_PDU(
		mw_ngap_initMsg(
		mw_n2_DownlinkNASTransport(
		<<<<<<< HEAD
		?,//PX_AMF_UE_NGAP_ID,
		=======
		?,// Set by AMF - PX_AMF_UE_NGAP_ID,
		>>>>>>> 193733e96cd3ad358ad0bfedd48d1fd1936893e0
		PX_RAN_UE_NGAP_ID,
		? // SecurityModeCommand
		)));
		@@ -187,7 +191,7 @@ module NG_NAS_TCFunctions {
		[] N2_gNBaMF_P.receive(
		mw_ngap_initMsg(
		mw_n2_DownlinkNASTransport(
		PX_AMF_UE_NGAP_ID,
		?,//PX_AMF_UE_NGAP_ID,
		PX_RAN_UE_NGAP_ID,
		? // AuthorizationRequest
		))) -> value v_PDU {
		@@ -249,7 +253,7 @@ module NG_NAS_TCFunctions {
		f_recv_NGAP_PDU(
		mw_ngap_initMsg(
		mw_n2_DownlinkNASTransport(
		PX_AMF_UE_NGAP_ID,
		?,//PX_AMF_UE_NGAP_ID,
		PX_RAN_UE_NGAP_ID,
		? // IdentityRequest
		)));
		@@ -319,7 +323,7 @@ module NG_NAS_TCFunctions {
		f_recv_NGAP_PDU(
		mw_ngap_initMsg(
		mw_n2_DownlinkNASTransport(
		PX_AMF_UE_NGAP_ID,
		?,//PX_AMF_UE_NGAP_ID,
		PX_RAN_UE_NGAP_ID,
		?
		)));
		@@ -384,7 +388,7 @@ module NG_NAS_TCFunctions {
		f_recv_NGAP_PDU(
		mw_ngap_initMsg(
		mw_n2_DownlinkNASTransport(
		PX_AMF_UE_NGAP_ID,
		?,//PX_AMF_UE_NGAP_ID,
		PX_RAN_UE_NGAP_ID,
		? // IdentityRequest
		)));
		@@ -436,7 +440,7 @@ module NG_NAS_TCFunctions {
		f_recv_NGAP_PDU(
		mw_ngap_initMsg(
		mw_n2_DownlinkNASTransport(
		PX_AMF_UE_NGAP_ID,
		?,//PX_AMF_UE_NGAP_ID,
		PX_RAN_UE_NGAP_ID,
		? // Security mode command
		)));
		@@ -484,7 +488,7 @@ module NG_NAS_TCFunctions {
		f_recv_NGAP_PDU(
		mw_ngap_initMsg(
		mw_n2_InitialContextSetupRequest_withPDUSessionList(
		PX_AMF_UE_NGAP_ID,
		?,//PX_AMF_UE_NGAP_ID,
		PX_RAN_UE_NGAP_ID,
		? // Security mode command
		)));
		@@ -595,7 +599,7 @@ module NG_NAS_TCFunctions {
		f_recv_NGAP_PDU(
		mw_ngap_initMsg(
		mw_n2_DownlinkNASTransport(
		PX_AMF_UE_NGAP_ID,
		?,//PX_AMF_UE_NGAP_ID,
		PX_RAN_UE_NGAP_ID,
		? // PDU SESSION ESTABLISHMENT ACCEPT
		)));
		@@ -708,7 +712,7 @@ module NG_NAS_TCFunctions {
		f_recv_NGAP_PDU(
		mw_ngap_initMsg(
		mw_n2_DownlinkNASTransport(
		PX_AMF_UE_NGAP_ID,
		?,//PX_AMF_UE_NGAP_ID,
		PX_RAN_UE_NGAP_ID,
		? // AuthorizationRequest
		)));
		@@ -825,7 +829,7 @@ module NG_NAS_TCFunctions {
		f_recv_NGAP_PDU(
		mw_ngap_initMsg(
		mw_n2_DownlinkNASTransport(
		PX_AMF_UE_NGAP_ID,
		?,//PX_AMF_UE_NGAP_ID,
		PX_RAN_UE_NGAP_ID,
		? // AuthorizationRequest
		)));
		@@ -949,7 +953,7 @@ module NG_NAS_TCFunctions {
		f_recv_NGAP_PDU(
		mw_ngap_initMsg(
		mw_n2_DownlinkNASTransport(
		PX_AMF_UE_NGAP_ID,
		?,//PX_AMF_UE_NGAP_ID,
		PX_RAN_UE_NGAP_ID,
		? // AuthorizationRequest
		)));
		@@ -1073,7 +1077,7 @@ module NG_NAS_TCFunctions {
		f_recv_NGAP_PDU(
		mw_ngap_initMsg(
		mw_n2_DownlinkNASTransport(
		PX_AMF_UE_NGAP_ID,
		?,//PX_AMF_UE_NGAP_ID,
		PX_RAN_UE_NGAP_ID,
		? // AuthorizationRequest
		)));
		@@ -1193,7 +1197,7 @@ module NG_NAS_TCFunctions {
		f_recv_NGAP_PDU(
		mw_ngap_initMsg(
		mw_n2_DownlinkNASTransport(
		PX_AMF_UE_NGAP_ID,
		?,//PX_AMF_UE_NGAP_ID,
		PX_RAN_UE_NGAP_ID,
		? // AuthorizationRequest
		)));
		@@ -1319,7 +1323,7 @@ module NG_NAS_TCFunctions {
		f_recv_NGAP_PDU(
		mw_ngap_initMsg(
		mw_n2_DownlinkNASTransport(
		PX_AMF_UE_NGAP_ID,
		?,//PX_AMF_UE_NGAP_ID,
		PX_RAN_UE_NGAP_ID,
		?//template (present) NAS_PDU p_nasPdu := ?
		))
		@@ -1475,7 +1479,7 @@ module NG_NAS_TCFunctions {
		f_recv_NGAP_PDU(
		mw_ngap_initMsg(
		mw_n2_DownlinkNASTransport(
		PX_AMF_UE_NGAP_ID,
		?,//PX_AMF_UE_NGAP_ID,
		PX_RAN_UE_NGAP_ID,
		?//template (present) NAS_PDU p_nasPdu := ?
		))
		@@ -1556,7 +1560,7 @@ module NG_NAS_TCFunctions {
		f_recv_NGAP_PDU(
		mw_ngap_initMsg(
		mw_n2_DownlinkNASTransport(
		PX_AMF_UE_NGAP_ID,
		?,//PX_AMF_UE_NGAP_ID,
		PX_RAN_UE_NGAP_ID,
		?//template (present) NAS_PDU p_nasPdu := ?
		))
		@@ -1621,7 +1625,7 @@ module NG_NAS_TCFunctions {
		f_recv_NGAP_PDU(
		mw_ngap_initMsg(
		mw_n2_DownlinkNASTransport(
		PX_AMF_UE_NGAP_ID,
		?,//PX_AMF_UE_NGAP_ID,
		PX_RAN_UE_NGAP_ID,
		?//template (present) NAS_PDU p_nasPdu := ?
		))
		@@ -1669,7 +1673,7 @@ module NG_NAS_TCFunctions {
		f_recv_NGAP_PDU(
		mw_ngap_initMsg(
		mw_n2_DownlinkNASTransport(
		PX_AMF_UE_NGAP_ID,
		?,//PX_AMF_UE_NGAP_ID,
		PX_RAN_UE_NGAP_ID,
		?//template (present) NAS_PDU p_nasPdu := ?
		))
		@@ -1726,7 +1730,7 @@ module NG_NAS_TCFunctions {
		f_recv_NGAP_PDU(
		mw_ngap_initMsg(
		mw_n2_DownlinkNASTransport(
		PX_AMF_UE_NGAP_ID,
		?,//PX_AMF_UE_NGAP_ID,
		PX_RAN_UE_NGAP_ID,
		?//template (present) NAS_PDU p_nasPdu := ?
		))
		@@ -1758,7 +1762,7 @@ module NG_NAS_TCFunctions {
		f_recv_NGAP_PDU(
		mw_ngap_initMsg(
		mw_n2_DownlinkNASTransport(
		PX_AMF_UE_NGAP_ID,
		?,//PX_AMF_UE_NGAP_ID,
		PX_RAN_UE_NGAP_ID,
		?//template (present) NAS_PDU p_nasPdu := ?
		))
		@@ -1814,7 +1818,7 @@ module NG_NAS_TCFunctions {
		f_recv_NGAP_PDU(
		mw_ngap_initMsg(
		mw_n2_DownlinkNASTransport(
		PX_AMF_UE_NGAP_ID,
		?,//PX_AMF_UE_NGAP_ID,
		PX_RAN_UE_NGAP_ID,
		?//template (present) NAS_PDU p_nasPdu := ?
		))

ttcn/Lib3GPP/NG_NAS/NG_NAS_SecurityFunctions.ttcn

+2 −1

Original line number	Diff line number	Diff line
		@@ -428,6 +428,7 @@ module NG_NAS_SecurityFunctions {
		// Generation of String
		v_S := const_S6B_FC;
		//FC = 0x6B
		log("f_NG_Authentication_A4 (0): p_NID=", p_NID);
		v_P0 := fl_GetServingNetworkName(p_PLMN, p_NID); // @sic R5s220753 sic@
		log("f_NG_Authentication_A4 (1): v_P0=", v_P0);
		v_S := (v_S & v_P0);

ttcn/LibNGAP/lib_system/LibNGAP_Functions.ttcn

+5 −1

Original line number	Diff line number	Diff line
		@@ -279,7 +279,7 @@ module LibNGAP_Functions {
		if (f_Check_5GAKA_NAS_DL_Message(
		vc_recvNAS_PDU,
		mw_NG_AUTHENTICATION_REQUEST(
		'100'B,
		?,//'100'B,
		-,
		mw_GMM_AuthRAND,
		mw_GSM_AUTN
		@@ -332,7 +332,11 @@ module LibNGAP_Functions {
		if (f_Check_5GAKA_NAS_DL_Message(
		vc_recvNAS_PDU,
		mw_NG_AUTHENTICATION_REQUEST(
		<<<<<<< HEAD
		?,//'00?'B,
		=======
		-, //'00?'B,
		>>>>>>> 193733e96cd3ad358ad0bfedd48d1fd1936893e0
		-,
		mw_GMM_AuthRAND,
		mw_GSM_AUTN

ttcn/Lib_NG_NAS/lib/Lib_NG_NAS_Security_Functions.ttcn

+4 −0

Original line number	Diff line number	Diff line
		@@ -200,7 +200,11 @@ module Lib_NG_NAS_Security_Functions {
		inout NG_NAS_SecurityParams_Type p_ng_nas_security_params_type
		) return boolean {
		log(">>> f_5g_aka_compute_res_xres: ", p_ng_nas_security_params_type);
		<<<<<<< HEAD
		log(">>> f_5g_aka_compute_res_xres: p_NID = ", p_NID);
		=======
		log(">>> f_5g_aka_compute_res_xres: p_NID: ", p_NID);
		>>>>>>> 193733e96cd3ad358ad0bfedd48d1fd1936893e0

		p_ng_nas_security_params_type := valueof(cs_NG_NAS_SecurityParamsInit);
		log("f_5g_aka_compute_res_xres: KDF=", p_ng_nas_security_params_type.KDF);

ttcn/Lib_NG_NAS/lib_system/Lib_NG_NAS_Functions.ttcn

+2 −2

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ module Lib_NG_NAS_Functions {
		f_recv_NGAP_PDU(
		mw_ngap_initMsg(
		mw_n2_DownlinkNASTransport(
		PX_AMF_UE_NGAP_ID,
		?,//PX_AMF_UE_NGAP_ID,
		PX_RAN_UE_NGAP_ID,
		? // AuthenticationRequest
		)));
		@@ -124,7 +124,7 @@ module Lib_NG_NAS_Functions {
		if (f_Check_5GAKA_NAS_DL_Message(
		vc_recvNAS_PDU,
		mw_NG_AUTHENTICATION_REQUEST(
		'100'B,
		?,//'100'B,
		-,
		mw_GMM_AuthRAND,
		mw_GSM_AUTN