pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38618?usp=email )
Change subject: hnbgw: Introduce module parameter mp_pfcp_upf_node_id ......................................................................
hnbgw: Introduce module parameter mp_pfcp_upf_node_id
This will allow using it later in HNBGW_Tests.ttcn file when waiting for PFCP Assoc Req.
Change-Id: I2142289965adba0b457e865e10f0cfc9908b0bb2 --- M hnbgw/ConnHdlr.ttcn M hnbgw/HNBGW_Tests.ttcn 2 files changed, 7 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/18/38618/1
diff --git a/hnbgw/ConnHdlr.ttcn b/hnbgw/ConnHdlr.ttcn index 13c8d4c..44dfbc3 100644 --- a/hnbgw/ConnHdlr.ttcn +++ b/hnbgw/ConnHdlr.ttcn @@ -200,16 +200,17 @@ /* whether we expect HNBGW to manage a UPF through PFCP: */ boolean pfcp_enabled, charstring pfcp_local_addr, - Node_ID upf_node_id, + Node_ID upf_node_id, F_SEID up_f_seid, F_SEID hnbgw_f_seid optional }
template (value) PfcpParameters t_PfcpParams(boolean pfcp_enabled := false, - charstring pfcp_local_addr := "127.0.0.1") := { + charstring pfcp_local_addr := "127.0.0.1", + charstring pfcp_upf_node_id := "\07osmocom\03org") := { pfcp_enabled := pfcp_enabled, pfcp_local_addr := pfcp_local_addr, - upf_node_id := valueof(ts_PFCP_Node_ID_fqdn("\07osmocom\03org")), + upf_node_id := valueof(ts_PFCP_Node_ID_fqdn(pfcp_upf_node_id)), up_f_seid := ts_PFCP_F_SEID_ipv4(f_inet_addr(pfcp_local_addr), c_SEID1), hnbgw_f_seid := omit } diff --git a/hnbgw/HNBGW_Tests.ttcn b/hnbgw/HNBGW_Tests.ttcn index 0e32e63..26d069f 100644 --- a/hnbgw/HNBGW_Tests.ttcn +++ b/hnbgw/HNBGW_Tests.ttcn @@ -211,13 +211,12 @@ };
boolean mp_enable_pfcp_tests := false; - /* IP address at which we listen for PFCP to emulate a UPF in ttcn3 */ charstring mp_pfcp_ip_local := "127.0.0.1"; - /* IP address from which the SUT (osmo-hnbgw) sends PFCP requests, and to which the ttcn3 UPF emulation sends * PFCP responses. */ charstring mp_pfcp_ip_remote := "127.0.0.2"; + charstring mp_pfcp_upf_node_id := "\07osmocom\03org";
boolean mp_validate_talloc_asn1 := true;
@@ -516,7 +515,8 @@ var template (value) PfcpParameters pfcp_pars;
pfcp_pars := t_PfcpParams(pfcp_enabled := mp_enable_pfcp_tests, - pfcp_local_addr := mp_pfcp_ip_local); + pfcp_local_addr := mp_pfcp_ip_local, + pfcp_upf_node_id := mp_pfcp_upf_node_id); pars := t_pars(imsi_suffix, ps_domain := ps_domain, expect_separate_sccp_cr := expect_separate_sccp_cr,