pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43884?usp=email ) Change subject: PFCP_Templates: Avoid int2oct() conversion in PFCP_Create_PDR ...................................................................... PFCP_Templates: Avoid int2oct() conversion in PFCP_Create_PDR The type uses a OCT2, so better use integer too, otherwise the tr_ template cannot be passed wildcards due to the int2oct() call. Change-Id: Ie4eeb8df5a55dc0b47ebdff0a256d57031eb35df --- M library/PFCP_Templates.ttcn M s1gw/S1GW_ConnHdlr.ttcn M smf/SMF_Session_CT.ttcn M upf/UPF_Tests.ttcn 4 files changed, 25 insertions(+), 24 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/library/PFCP_Templates.ttcn b/library/PFCP_Templates.ttcn index bf48224..c02ec10 100644 --- a/library/PFCP_Templates.ttcn +++ b/library/PFCP_Templates.ttcn @@ -1280,17 +1280,18 @@ } } +/* 8.2.36 PDR ID */ template (value) PDR_ID ts_PFCP_PDR_ID(template (value) OCT2 pdr_id) := { - elementIdentifier := 56, - lengthIndicator := 0, - rule_id := pdr_id + elementIdentifier := 56, + lengthIndicator := 0, + rule_id := pdr_id } template (present) PDR_ID -tr_PFCP_PDR_ID(template (present) OCT2 pdr_id) := { - elementIdentifier := 56, - lengthIndicator := ?, - rule_id := pdr_id +tr_PFCP_PDR_ID(template (present) OCT2 pdr_id := ?) := { + elementIdentifier := 56, + lengthIndicator := ?, + rule_id := pdr_id } template (value) Precedence @@ -1307,14 +1308,14 @@ } template (value) Create_PDR -ts_PFCP_Create_PDR(integer pdr_id, +ts_PFCP_Create_PDR(template (value) OCT2 pdr_id, template (value) PDI_IE pdi, template (omit) Outer_Header_Removal ohr := omit, template (value) LIN4_BO_LAST far_id) := { - elementIdentifier := 1, - lengthIndicator := 0, + elementIdentifier := 1, + lengthIndicator := 0, grouped_ie := { - pdr_id := ts_PFCP_PDR_ID(int2oct(pdr_id, 2)), + pdr_id := ts_PFCP_PDR_ID(pdr_id), precedence := ts_PFCP_Precedence(0), pdi := pdi, outer_header_removal := ohr, @@ -1325,14 +1326,14 @@ } } template (present) Create_PDR -tr_PFCP_Create_PDR(integer pdr_id, +tr_PFCP_Create_PDR(template (present) OCT2 pdr_id := ?, template (present) PDI_IE pdi := ?, template Outer_Header_Removal ohr := *, template (present) LIN4_BO_LAST far_id := ?) := { - elementIdentifier := 1, - lengthIndicator := ?, + elementIdentifier := 1, + lengthIndicator := ?, grouped_ie := { - pdr_id := tr_PFCP_PDR_ID(int2oct(pdr_id, 2)), + pdr_id := tr_PFCP_PDR_ID(pdr_id), precedence := tr_PFCP_Precedence(?), pdi := pdi, outer_header_removal := ohr, diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index 24dacce..9a045b2 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -1093,11 +1093,11 @@ var template (present) Create_PDR pdr2; ohr := tr_PFCP_Outer_Header_Removal(PFCP_OHR_GTP_U_UDP_IPV4); - pdr1 := tr_PFCP_Create_PDR(pdr_id := 1, /* -- for Core -> Access */ + pdr1 := tr_PFCP_Create_PDR(pdr_id := int2oct(1, 2), /* -- for Core -> Access */ pdi := tr_PFCP_PDI(PFCP_Src_Iface_CORE), ohr := ohr, far_id := c_PFCP_FAR_ID_C2A); - pdr2 := tr_PFCP_Create_PDR(pdr_id := 2, /* -- for Access -> Core */ + pdr2 := tr_PFCP_Create_PDR(pdr_id := int2oct(2, 2), /* -- for Access -> Core */ pdi := tr_PFCP_PDI(PFCP_Src_Iface_ACCESS), ohr := ohr, far_id := c_PFCP_FAR_ID_A2C); diff --git a/smf/SMF_Session_CT.ttcn b/smf/SMF_Session_CT.ttcn index 9120c55..e89fd0c 100644 --- a/smf/SMF_Session_CT.ttcn +++ b/smf/SMF_Session_CT.ttcn @@ -404,7 +404,7 @@ var template octetstring flow_description := '7065726D6974206F75742035382066726F6D20666630323A3A*2F31323820746F2061737369676E6564'O; // ("permit out 58 from ff02::*/128 to assigned"); create_pdr := { *, - tr_PFCP_Create_PDR(pdr_id := 4, + tr_PFCP_Create_PDR(pdr_id := int2oct(4, 2), pdi := tr_PFCP_PDI(src_iface := PFCP_Src_Iface_ACCESS, local_F_TEID := tr_PFCP_F_TEID(?, ?, '1'B, '1'B, omit, omit, omit, ?), network_instance := tr_PFCP_Network_Instance(g_pars.apn), diff --git a/upf/UPF_Tests.ttcn b/upf/UPF_Tests.ttcn index c26925d..a5c7cc9 100644 --- a/upf/UPF_Tests.ttcn +++ b/upf/UPF_Tests.ttcn @@ -599,7 +599,7 @@ r.pdr := r.pdr & { valueof( ts_PFCP_Create_PDR( - pdr_id, + int2oct(pdr_id, 2), ts_PFCP_PDI( PFCP_Src_Iface_ACCESS, local_F_TEID := ts_PFCP_F_TEID_choose_v4(), @@ -630,7 +630,7 @@ r.pdr := r.pdr & { valueof( ts_PFCP_Create_PDR( - pdr_id, + int2oct(pdr_id, 2), ts_PFCP_PDI( PFCP_Src_Iface_CORE, ue_addr_v4 := ts_PFCP_UE_IP_Address_v4(f_inet_addr(ue_addr_v4), is_destination := true) @@ -666,7 +666,7 @@ r.pdr := r.pdr & { valueof( ts_PFCP_Create_PDR( - pdr_id, + int2oct(pdr_id, 2), ts_PFCP_PDI( src_iface, local_F_TEID := ts_PFCP_F_TEID_choose_v4(), @@ -699,7 +699,7 @@ r.pdr := r.pdr & { valueof( ts_PFCP_Create_PDR( - pdr_id, + int2oct(pdr_id, 2), ts_PFCP_PDI( src_iface, local_F_TEID := ts_PFCP_F_TEID_choose_v4(), @@ -748,7 +748,7 @@ r.pdr := r.pdr & { valueof( ts_PFCP_Create_PDR( - pdr_id, + int2oct(pdr_id, 2), ts_PFCP_PDI( PFCP_Src_Iface_CP_FUNCTION, local_F_TEID := ts_PFCP_F_TEID_choose_v4('17'O)), @@ -774,7 +774,7 @@ r.pdr := r.pdr & { valueof( ts_PFCP_Create_PDR( - pdr_id, + int2oct(pdr_id, 2), ts_PFCP_PDI( PFCP_Src_Iface_CP_FUNCTION, local_F_TEID := ts_PFCP_F_TEID_choose_v4('2a'O)), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43884?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie4eeb8df5a55dc0b47ebdff0a256d57031eb35df Gerrit-Change-Number: 43884 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: osmith <osmith@sysmocom.de> Gerrit-Reviewer: pespin <pespin@sysmocom.de>