pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42425?usp=email )
Change subject: 5gc: f_pdu_sess_establish(): Pass pdu sess type as param ......................................................................
5gc: f_pdu_sess_establish(): Pass pdu sess type as param
Change-Id: I86680b0a2f5ddb27ecbebd5639199d2f77d397f6 --- M 5gc/C5G_Tests.ttcn M 5gc/ConnHdlr.ttcn M library/NG_NAS_Osmo_Types.ttcn 3 files changed, 11 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/25/42425/1
diff --git a/5gc/C5G_Tests.ttcn b/5gc/C5G_Tests.ttcn index 018f3a2..ea31ff4 100644 --- a/5gc/C5G_Tests.ttcn +++ b/5gc/C5G_Tests.ttcn @@ -395,7 +395,7 @@
private function f_TC_register_ping4() runs on ConnHdlr { f_register(); - f_pdu_sess_establish(); + f_pdu_sess_establish(pdu_sess_type := c_PDU_SessionType_IPv4); f_sleep(1.0); f_ping4(g_pars.ue_pars.sess_pars.run_prog_pars.ping_hostname); f_pdu_sess_release(); diff --git a/5gc/ConnHdlr.ttcn b/5gc/ConnHdlr.ttcn index 37450bf..8937465 100644 --- a/5gc/ConnHdlr.ttcn +++ b/5gc/ConnHdlr.ttcn @@ -527,6 +527,7 @@
/* 3GPP TS 23.502 4.3.2.2 UE Requested PDU Session Establishment */ function f_pdu_sess_establish(BIT3 request_type := c_RequestType_initial_request, + BIT3 pdu_sess_type := c_PDU_SessionType_IPv4, boolean configure_userplane := true) runs on ConnHdlr { var template (value) NG_NAS_UL_Message_Type nas_ul_msg; var NAS_PDU nas_pdu; @@ -536,7 +537,7 @@
nas_ul_msg := cs_NG_PDU_SESSION_ESTABLISHMENT_REQUEST(cs_NG_PDU_SessionIdV(pdu_sess_id), pti, p_IntegrityProtMaxDataRate := cs_IntegrityProtMaxDataRateV('FF'O, 'FF'O), - p_PDU_SessionType := cs_PDU_SessionTypeTV('001'B), /* IPv4 */ + p_PDU_SessionType := cs_PDU_SessionTypeTV(pdu_sess_type), p_SSC_Mode := cs_SSC_ModeTV('001'B)); nas_pdu := enc_NG_NAS_UL_Message_Type(valueof(nas_ul_msg)); nas_ul_msg := cs_NG_UL_NAS_TRANSPORT(cs_PayloadContainerType(tsc_PayloadContainerESMMsg), diff --git a/library/NG_NAS_Osmo_Types.ttcn b/library/NG_NAS_Osmo_Types.ttcn index f897246..00447c0 100644 --- a/library/NG_NAS_Osmo_Types.ttcn +++ b/library/NG_NAS_Osmo_Types.ttcn @@ -58,6 +58,14 @@ const BIT4 c_ServiceType_elevated_signalling := '0110'B;
+const B3_Type c_PDU_SessionType_IPv4 := '001'B; +const B3_Type c_PDU_SessionType_IPv6 := '010'B; +const B3_Type c_PDU_SessionType_IPv4v6 := '011'B; +const B3_Type c_PDU_SessionType_Unstructured := '100'B; +const B3_Type c_PDU_SessionType_Ethernet := '101'B; +const B3_Type c_PDU_SessionType_reserved := '111'B; + + /* This is a subset of the msgs in NG_NAS_DL_Message_Type. The subset is formed * by Session Management messages, see 3GPP TS 24.501 clause 6 and clause 8.3. * This is needed to properly decode 3GPP TS 24.501 9.11.3.39 Payload container,