pespin has uploaded this change for review.
PFCP_Templates: Avoid enum2int() conversion in Outer_Header_Removal
The type uses a integer, so better use integer too, otherwise
the tr_ template cannot be passed wildcards due to the enum2int() call.
Change-Id: I17a97301308af0e77e5693e7dba36d0a07504b0e
---
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(+), 25 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/83/43883/1
diff --git a/library/PFCP_Templates.ttcn b/library/PFCP_Templates.ttcn
index 7f3a3b3..bf48224 100644
--- a/library/PFCP_Templates.ttcn
+++ b/library/PFCP_Templates.ttcn
@@ -1098,29 +1098,29 @@
udp_port := *
}
-type enumerated e_PFCP_Outer_Header_Removal {
- GTP_U_UDP_IPV4 (0),
- GTP_U_UDP_IPV6 (1),
- UDP_IPV4 (2),
- UDP_IPV6 (3),
- IPV4 (4),
- IPV6 (5),
- GTP_U_UDP_IP (6),
- VLAN_S_TAG (7),
- S_TAG_AND_C_TAG (8)
-};
+/* 8.2.64 Outer Header Removal */
+const integer PFCP_OHR_GTP_U_UDP_IPV4 := 0;
+const integer PFCP_OHR_GTP_U_UDP_IPV6 := 1;
+const integer PFCP_OHR_UDP_IPV4 := 2;
+const integer PFCP_OHR_UDP_IPV6 := 3;
+const integer PFCP_OHR_IPV4 := 4;
+const integer PFCP_OHR_IPV6 := 5;
+const integer PFCP_OHR_GTP_U_UDP_IP := 6;
+const integer PFCP_OHR_VLAN_S_TAG := 7;
+const integer PFCP_OHR_S_TAG_AND_C_TAG := 8;
template (value) Outer_Header_Removal
-ts_PFCP_Outer_Header_Removal(e_PFCP_Outer_Header_Removal ohr) := {
- elementIdentifier := 95,
- lengthIndicator := 0,
- ohc_description := enum2int(ohr)
+ts_PFCP_Outer_Header_Removal(template (value) integer ohr) := {
+ elementIdentifier := 95,
+ lengthIndicator := 0,
+ ohc_description := ohr
}
+
template (present) Outer_Header_Removal
-tr_PFCP_Outer_Header_Removal(e_PFCP_Outer_Header_Removal ohr) := {
- elementIdentifier := 95,
- lengthIndicator := ?,
- ohc_description := enum2int(ohr)
+tr_PFCP_Outer_Header_Removal(template (present) integer ohr := ?) := {
+ elementIdentifier := 95,
+ lengthIndicator := ?,
+ ohc_description := ohr
}
template (value) Forwarding_Parameters
diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn
index 98ad911..24dacce 100644
--- a/s1gw/S1GW_ConnHdlr.ttcn
+++ b/s1gw/S1GW_ConnHdlr.ttcn
@@ -1092,7 +1092,7 @@
var template (present) Create_PDR pdr1;
var template (present) Create_PDR pdr2;
- ohr := tr_PFCP_Outer_Header_Removal(GTP_U_UDP_IPV4);
+ ohr := tr_PFCP_Outer_Header_Removal(PFCP_OHR_GTP_U_UDP_IPV4);
pdr1 := tr_PFCP_Create_PDR(pdr_id := 1, /* -- for Core -> Access */
pdi := tr_PFCP_PDI(PFCP_Src_Iface_CORE),
ohr := ohr,
diff --git a/smf/SMF_Session_CT.ttcn b/smf/SMF_Session_CT.ttcn
index 162b5f1..9120c55 100644
--- a/smf/SMF_Session_CT.ttcn
+++ b/smf/SMF_Session_CT.ttcn
@@ -411,7 +411,7 @@
sdf_filter_list := { tr_PFCP_SDF_Filter(fd := '1'B,
flow_description := flow_description) },
source_interface_type := tr_PFCP_ThreeGPP_Interface_Type(11 /* N3 3GPP Access */)),
- ohr := tr_PFCP_Outer_Header_Removal(GTP_U_UDP_IP),
+ ohr := tr_PFCP_Outer_Header_Removal(PFCP_OHR_GTP_U_UDP_IP),
far_id := 3)
, *
}
diff --git a/upf/UPF_Tests.ttcn b/upf/UPF_Tests.ttcn
index 0fcef8a..c26925d 100644
--- a/upf/UPF_Tests.ttcn
+++ b/upf/UPF_Tests.ttcn
@@ -604,7 +604,7 @@
PFCP_Src_Iface_ACCESS,
local_F_TEID := ts_PFCP_F_TEID_choose_v4(),
network_instance := ts_PFCP_Network_Instance(src_netinst)),
- ts_PFCP_Outer_Header_Removal(GTP_U_UDP_IPV4),
+ ts_PFCP_Outer_Header_Removal(PFCP_OHR_GTP_U_UDP_IPV4),
far_id
)
)
@@ -671,7 +671,7 @@
src_iface,
local_F_TEID := ts_PFCP_F_TEID_choose_v4(),
network_instance := ts_PFCP_Network_Instance(src_netinst)),
- ts_PFCP_Outer_Header_Removal(GTP_U_UDP_IPV4),
+ ts_PFCP_Outer_Header_Removal(PFCP_OHR_GTP_U_UDP_IPV4),
far_id
)
)
@@ -704,7 +704,7 @@
src_iface,
local_F_TEID := ts_PFCP_F_TEID_choose_v4(),
network_instance := ts_PFCP_Network_Instance(src_netinst)),
- ts_PFCP_Outer_Header_Removal(GTP_U_UDP_IPV4),
+ ts_PFCP_Outer_Header_Removal(PFCP_OHR_GTP_U_UDP_IPV4),
far_id
)
)
@@ -752,7 +752,7 @@
ts_PFCP_PDI(
PFCP_Src_Iface_CP_FUNCTION,
local_F_TEID := ts_PFCP_F_TEID_choose_v4('17'O)),
- ts_PFCP_Outer_Header_Removal(GTP_U_UDP_IPV4),
+ ts_PFCP_Outer_Header_Removal(PFCP_OHR_GTP_U_UDP_IPV4),
far_id
)
)
To view, visit change 43883. To unsubscribe, or for help writing mail filters, visit settings.