pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43382?usp=email )
Change subject: deps: Switch to osmocom fork of
titan.ProtocolModules.PFCP_v15.1.0
......................................................................
deps: Switch to osmocom fork of titan.ProtocolModules.PFCP_v15.1.0
Our fork contains lots of improvements (currently submitted in several
PRs upstream) which are required to talk against newer releases of PFCP,
ie. what open5gs-smfd is using.
The commit hash in deps/Makefile points to our osmocom/master branch.
PFCP_Templates.ttcn is updated to initialized the new optional fields
appearing in deps/ PFCP_Types.ttcn.
Change-Id: I954c9972124edd349354a4cc76805a4f9a2346c4
---
M deps/Makefile
M library/PFCP_Templates.ttcn
2 files changed, 52 insertions(+), 24 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
diff --git a/deps/Makefile b/deps/Makefile
index 7d3198e..abab58a 100644
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -38,7 +38,6 @@
titan.ProtocolModules.NS_v7.3.0 \
titan.ProtocolModules.SGsAP_13.2.0 \
titan.ProtocolModules.SNDCP_v7.0.0 \
- titan.ProtocolModules.PFCP_v15.1.0 \
titan.TestPorts.Common_Components.Socket-API \
titan.TestPorts.Common_Components.Abstract_Socket \
titan.TestPorts.HTTPmsg \
@@ -61,6 +60,7 @@
OSMOGITEA_REPOS= nas \
titan.ProtocolModules.BSSMAP \
titan.ProtocolModules.MAP \
+ titan.ProtocolModules.PFCP_v15.1.0 \
titan.TestPorts.AF_PACKET \
titan.TestPorts.USB
@@ -107,7 +107,7 @@
titan.ProtocolModules.SUA_commit= R.5.A-5-gcf1137a
titan.ProtocolModules.TCP_commit= R.3.A-5-g39e5f45
titan.ProtocolModules.UDP_commit= R.4.A-5-geea8aa3
-titan.ProtocolModules.PFCP_v15.1.0_commit=
d550ad9ddb6f9c823c9a555254cd76cf0e738d18
+titan.ProtocolModules.PFCP_v15.1.0_commit=
f2fbaf3662519b045077c26e256f32deae4fbf33
titan.TestPorts.AF_PACKET_commit= 0.1-5-g89ebea6
titan.TestPorts.Common_Components.Socket-API_commit= R.6.A-6-gf4380d0
titan.TestPorts.Common_Components.Abstract_Socket_commit= R.9.B-4-gbd41994
diff --git a/library/PFCP_Templates.ttcn b/library/PFCP_Templates.ttcn
index 0726fd2..142ed74 100644
--- a/library/PFCP_Templates.ttcn
+++ b/library/PFCP_Templates.ttcn
@@ -392,7 +392,8 @@
sdf_filter_list := omit,
application_id := omit,
ethernet_packet_filter_list := omit,
- qfi_list := omit
+ qfi_list := omit,
+ source_interface_type := omit
}
}
template (present) PDI_IE
@@ -411,7 +412,8 @@
sdf_filter_list := *,
application_id := *,
ethernet_packet_filter_list := *,
- qfi_list := *
+ qfi_list := *,
+ source_interface_type := *
}
}
@@ -419,27 +421,47 @@
ts_PFCP_Apply_Action(BIT1 forw := '0'B,
BIT1 drop := '0'B,
BIT1 buff := '0'B) := {
- elementIdentifier := 44,
- lengthIndicator := 0,
- drop := drop,
- forw := forw,
- buff := buff,
- nocp := '0'B,
- dupl := '0'B,
- spare := '000'B
+ elementIdentifier := 44,
+ lengthIndicator := 0,
+ /* octet 5: */
+ drop := drop,
+ forw := forw,
+ buff := buff,
+ nocp := '0'B,
+ dupl := '0'B,
+ ipma := '0'B,
+ ipmd := '0'B,
+ dfrt := '0'B,
+ /* octet 6: */
+ edrt := omit,
+ bdpn := omit,
+ ddpn := omit,
+ fssm := omit,
+ mbsu := omit,
+ spare := omit
}
template (present) Apply_Action
tr_PFCP_Apply_Action(template (present) BIT1 forw := '0'B,
template (present) BIT1 drop := '0'B,
template (present) BIT1 buff := '0'B) := {
- elementIdentifier := 44,
- lengthIndicator := ?,
- drop := drop,
- forw := forw,
- buff := buff,
- nocp := ?,
- dupl := ?,
- spare := ?
+ elementIdentifier := 44,
+ lengthIndicator := ?,
+ /* octet 5: */
+ drop := drop,
+ forw := forw,
+ buff := buff,
+ nocp := ?,
+ dupl := ?,
+ ipma := ?,
+ ipmd := ?,
+ dfrt := ?,
+ /* octet 6: */
+ edrt := *,
+ bdpn := *,
+ ddpn := *,
+ fssm := *,
+ mbsu := *,
+ spare := *
}
template (value) Apply_Action ts_PFCP_Apply_Action_FORW :=
ts_PFCP_Apply_Action(forw := '1'B);
@@ -539,7 +561,8 @@
transport_level_marking := omit,
forwarding_policy := omit,
header_enrichment := omit,
- traffic_endpoint_ID := omit
+ traffic_endpoint_ID := omit,
+ destination_interface_type := omit
}
}
template (present) Forwarding_Parameters
@@ -556,7 +579,8 @@
transport_level_marking := *,
forwarding_policy := *,
header_enrichment := *,
- traffic_endpoint_ID := *
+ traffic_endpoint_ID := *,
+ destination_interface_type := *
}
}
@@ -751,7 +775,9 @@
create_traffic_endpoint_list := omit,
pdn_type := omit,
node_list := omit,
- up_inactivity_timer := omit
+ up_inactivity_timer := omit,
+ user_id := omit,
+ apn_dnn := omit
}
}
}
@@ -774,7 +800,9 @@
create_traffic_endpoint_list := *,
pdn_type := *,
node_list := *,
- up_inactivity_timer := *
+ up_inactivity_timer := *,
+ user_id := *,
+ apn_dnn := *
}
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43382?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: I954c9972124edd349354a4cc76805a4f9a2346c4
Gerrit-Change-Number: 43382
Gerrit-PatchSet: 4
Gerrit-Owner: pespin <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
