pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43435?usp=email )

Change subject: PFCP: Allow template SessionModReq without Update FAR IE ......................................................................

PFCP: Allow template SessionModReq without Update FAR IE

A newer PFCP dependency version is picked, which adds the Update_FAR_list type.

Change-Id: I9067a0525af111db0b4fc2bab86b650254d922fb --- M deps/Makefile M library/PFCP_Templates.ttcn M s1gw/S1GW_ConnHdlr.ttcn M upf/UPF_Tests.ttcn 4 files changed, 8 insertions(+), 7 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/35/43435/1

diff --git a/deps/Makefile b/deps/Makefile index 7dda98c..521c0ea 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -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= 32e7ceb4a451b25c6de627b7f64c4464a2407010 +titan.ProtocolModules.PFCP_v15.1.0_commit= 38b209571697a0ae659609fa8b629edacd7dde9f 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 5c4b43b..b59ce7b 100644 --- a/library/PFCP_Templates.ttcn +++ b/library/PFCP_Templates.ttcn @@ -1084,7 +1084,7 @@ /* 7.5.4 PFCP Session Modification Request */ template (value) PDU_PFCP ts_PFCP_Session_Mod_Req(template (value) OCT8 seid, - template (value) Update_FAR update_far) + template (omit) Update_FAR_list update_far_list := omit) modifies ts_PDU_PFCP_ := { seid := seid, message_body := { @@ -1103,7 +1103,7 @@ create_BAR := omit, create_traffic_endpoint := omit, update_PDR_list := omit, - update_FAR_list := { update_far }, + update_FAR_list := update_far_list, update_URR_list := omit, update_QER_list := omit, update_BAR := omit, @@ -1118,7 +1118,7 @@ } template (present) PDU_PFCP tr_PFCP_Session_Mod_Req(template (present) OCT8 seid := ?, - template (present) Update_FAR update_far := ?) + template Update_FAR_list update_far_list := *) modifies tr_PDU_PFCP_ := { seid := seid, message_body := { @@ -1137,7 +1137,7 @@ create_BAR := *, create_traffic_endpoint := *, update_PDR_list := *, - update_FAR_list := { update_far }, + update_FAR_list := update_far_list, update_URR_list := *, update_QER_list := *, update_BAR := *, diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn index 63e828b..e02d6c6 100644 --- a/s1gw/S1GW_ConnHdlr.ttcn +++ b/s1gw/S1GW_ConnHdlr.ttcn @@ -1176,7 +1176,7 @@ /* The final Session Modification Request PDU */ var template (present) PDU_PFCP tr_pdu; tr_pdu := tr_PFCP_Session_Mod_Req(seid := seid, - update_far := far); + update_far_list := { far }); return f_ConnHdlr_pfcp_expect(tr_pdu); }

diff --git a/upf/UPF_Tests.ttcn b/upf/UPF_Tests.ttcn index f9c0186..3c85fae 100644 --- a/upf/UPF_Tests.ttcn +++ b/upf/UPF_Tests.ttcn @@ -899,7 +899,8 @@ /* Run a PFCP Session Modification procedure */ private function f_session_mod(inout PFCP_session s) runs on CPF_ConnHdlr { - PFCP.send(ts_PFCP_Session_Mod_Req(s.up_seid, f_tunmap_upd_far_to_core(s.gtp))); + PFCP.send(ts_PFCP_Session_Mod_Req(s.up_seid, + update_far_list := { f_tunmap_upd_far_to_core(s.gtp) })); PFCP.receive(tr_PFCP_Session_Mod_Resp(s.cp_seid)); log("modified PFCP session: ", s); }