fixeria has uploaded this change for review.
library/PFCP_Templates: fix missing fields in {ts,tr}_PFCP_Session_Est_Resp
Change-Id: Ib0887f1150f87746f9048f2944cd18c65224a4c7
---
M hnbgw/HNBGW_Tests.ttcn
M library/PFCP_Templates.ttcn
2 files changed, 34 insertions(+), 25 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/38101/1
diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn
index 5204f38..86a4f3f 100644
--- a/hnbgw/HNBGW_Tests.ttcn
+++ b/hnbgw/HNBGW_Tests.ttcn
@@ -1969,30 +1969,25 @@
/* Expect PFCP Session Establishment Request. */
m := f_pfcp_expect(tr_PFCP_Session_Est_Req());
- var F_SEID hnbgw_f_seid := m.message_body.pfcp_session_establishment_request.CP_F_SEID;
var PFCP_Session_Establishment_Request serq := m.message_body.pfcp_session_establishment_request;
+ var F_SEID hnbgw_f_seid := serq.CP_F_SEID;
/* Acting as UPF, invent a new PFCP SEID to send to HNBGW. Respond to the Session Establishment.
* The PFCP response must have the same sequence_number as the request. */
- var F_SEID up_f_seid := valueof(ts_PFCP_F_SEID_ipv4(f_inet_addr("127.0.0.1"), '1111111111111111'O));
- var template PDU_PFCP r := ts_PFCP_Session_Est_Resp(m.sequence_number, upf_node_id, hnbgw_f_seid.seid);
- r.message_body.pfcp_session_establishment_response := {
- offending_ie := omit,
- UP_F_SEID := up_f_seid,
- created_PDR_list := {
- ts_PFCP_Created_PDR(pdr_id := serq.create_PDR_list[0].grouped_ie.pdr_id,
- local_F_TEID := ts_PFCP_F_TEID_ipv4(gtp_pars.core.local.teid,
- f_inet_addr(gtp_pars.core.local.addr))),
- ts_PFCP_Created_PDR(pdr_id := serq.create_PDR_list[1].grouped_ie.pdr_id,
- local_F_TEID := ts_PFCP_F_TEID_ipv4(gtp_pars.access.local.teid,
- f_inet_addr(gtp_pars.access.local.addr)))
- },
- load_control_information := omit,
- overload_control_information := omit,
- node_list := omit,
- failed_rule_id := omit,
- created_traffic_endpoint_list := omit
- };
+ var template F_SEID up_f_seid := ts_PFCP_F_SEID_ipv4(f_inet_addr("127.0.0.1"), '1111111111111111'O);
+ var template F_TEID f_teid1 := ts_PFCP_F_TEID_ipv4(gtp_pars.core.local.teid,
+ f_inet_addr(gtp_pars.core.local.addr));
+ var template F_TEID f_teid2 := ts_PFCP_F_TEID_ipv4(gtp_pars.access.local.teid,
+ f_inet_addr(gtp_pars.access.local.addr));
+ var template Created_PDR pdr1 := ts_PFCP_Created_PDR(pdr_id := serq.create_PDR_list[0].grouped_ie.pdr_id,
+ local_F_TEID := f_teid1);
+ var template Created_PDR pdr2 := ts_PFCP_Created_PDR(pdr_id := serq.create_PDR_list[1].grouped_ie.pdr_id,
+ local_F_TEID := f_teid2);
+ var template PDU_PFCP r := ts_PFCP_Session_Est_Resp(seq_nr := m.sequence_number,
+ node_id := upf_node_id,
+ seid := hnbgw_f_seid.seid,
+ f_seid := up_f_seid,
+ created_pdr := {pdr1, pdr2});
PFCP.send(r);
/* Expect on Iuh: RAB Assignment Request with IP/port from PFCP Session Est Resp */
diff --git a/library/PFCP_Templates.ttcn b/library/PFCP_Templates.ttcn
index 42fad90..3a49df3 100644
--- a/library/PFCP_Templates.ttcn
+++ b/library/PFCP_Templates.ttcn
@@ -792,29 +792,43 @@
template (value) PDU_PFCP
ts_PFCP_Session_Est_Resp(template (value) LIN3_BO_LAST seq_nr,
template (value) Node_ID node_id,
- template (value) OCT8 seid)
+ template (value) OCT8 seid,
+ template (value) F_SEID f_seid,
+ template (omit) PFCP_Session_Establishment_Response.created_PDR_list created_pdr)
modifies ts_PDU_PFCP_ := {
seid := seid,
sequence_number := seq_nr,
message_body := {
pfcp_session_establishment_response := {
node_id := node_id,
- cause := ts_PFCP_Cause(REQUEST_ACCEPTED)
+ cause := ts_PFCP_Cause(REQUEST_ACCEPTED),
+ offending_ie := omit,
+ UP_F_SEID := f_seid,
+ created_PDR_list := created_pdr,
+ load_control_information := omit,
+ overload_control_information := omit,
+ node_list := omit,
+ failed_rule_id := omit,
+ created_traffic_endpoint_list := omit
}
}
}
template (present) PDU_PFCP
-tr_PFCP_Session_Est_Resp(template (present) OCT8 seid := ?)
+tr_PFCP_Session_Est_Resp(template (present) LIN3_BO_LAST seq_nr := ?,
+ template (present) Node_ID node_id := ?,
+ template (present) OCT8 seid := ?,
+ template (present) F_SEID f_seid := ?,
+ template PFCP_Session_Establishment_Response.created_PDR_list created_pdr := *)
modifies tr_PDU_PFCP_ := {
seid := seid,
sequence_number := ?,
message_body := {
pfcp_session_establishment_response := {
- node_id := ?,
+ node_id := node_id,
cause := tr_PFCP_Cause(REQUEST_ACCEPTED),
offending_ie := *,
UP_F_SEID := ?,
- created_PDR_list := ?,
+ created_PDR_list := created_pdr,
load_control_information := *,
overload_control_information := *,
node_list := *,
To view, visit change 38101. To unsubscribe, or for help writing mail filters, visit settings.