upf/PFCP: do not imply f_inet_addr()
PFCP_Templates.ttcn is not the place to do the conversion between string
and OCT4.
When I wanted to use an OCT4 address in some ts_PFCP_* template, it
dawned on me that it is stupid to convert the OCT4 to a string, just so
that the ts_PFCP_* template converts it back to OCT4.
Related: SYS#6192 SYS#5599
Change-Id: Ib068831787f4256f70a2189a5f36ca1ea1f40c9e
diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn
index d77a18f..d76ff9d 100644
--- a/hnbgw/HNBGW_Tests.ttcn
+++ b/hnbgw/HNBGW_Tests.ttcn
@@ -18,6 +18,7 @@
import from GSM_Types all;
import from Osmocom_Types all;
import from IPL4asp_Types all;
+import from Native_Functions all;
import from Osmocom_CTRL_Functions all;
import from Osmocom_CTRL_Types all;
@@ -1314,7 +1315,7 @@
/* 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("127.0.0.1", '1111111111111111'O));
+ 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,
@@ -1322,10 +1323,10 @@
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,
- gtp_pars.core.local.addr)),
+ 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,
- gtp_pars.access.local.addr))
+ f_inet_addr(gtp_pars.access.local.addr)))
},
load_control_information := omit,
overload_control_information := omit,