<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20117">View Change</a></p><div style="white-space:pre-wrap">Approvals:
lynxis lazus: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">NS_Emulation: Prepare NSConfiguration for non-IP providers<br><br>NSConfiguration currently contains parameters relevant only for IP<br>based transport. Move IP/UDP parameters into a sub-structure in<br>anticipation of Frame Relay support.<br><br>Change-Id: I6904520d8c2f546327029777d68b1907611a8cf5<br>---<br>M library/NS_Emulation.ttcn<br>M library/NS_Provider_IPL4.ttcn<br>M library/RAW_NS.ttcn<br>M pcu/PCU_Tests.cfg<br>M pcu/PCU_Tests.ttcn<br>M pcu/PCU_Tests_SNS.ttcn<br>M pcu/SGSN_Components.ttcn<br>M sgsn/SGSN_Tests.cfg<br>M sgsn/SGSN_Tests.ttcn<br>9 files changed, 109 insertions(+), 69 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/NS_Emulation.ttcn b/library/NS_Emulation.ttcn</span><br><span>index 97a48e5..a0b24c9 100644</span><br><span>--- a/library/NS_Emulation.ttcn</span><br><span>+++ b/library/NS_Emulation.ttcn</span><br><span>@@ -131,12 +131,18 @@</span><br><span> timer Tns_block := 10.0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- type record NSConfiguration {</span><br><span style="color: hsl(120, 100%, 40%);">+ type record NSConfigurationIP {</span><br><span> AddressFamily address_family,</span><br><span> PortNumber local_udp_port,</span><br><span> charstring local_ip,</span><br><span> PortNumber remote_udp_port,</span><br><span style="color: hsl(0, 100%, 40%);">- charstring remote_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ charstring remote_ip</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ type union NSConfigurationP {</span><br><span style="color: hsl(120, 100%, 40%);">+ NSConfigurationIP ip</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ type record NSConfiguration {</span><br><span style="color: hsl(120, 100%, 40%);">+ NSConfigurationP provider,</span><br><span> Nsvci nsvci,</span><br><span> Nsvci nsei,</span><br><span> boolean role_sgsn,</span><br><span>@@ -216,7 +222,7 @@</span><br><span> /* FIXME */</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- [config.role_sgsn and config.handle_sns] as_sns_sgsn();</span><br><span style="color: hsl(120, 100%, 40%);">+ [config.role_sgsn and config.handle_sns and ischosen(config.provider.ip)] as_sns_sgsn();</span><br><span> </span><br><span> /* default case of handling unknown PDUs */</span><br><span> [] NSCP.receive(PDU_NS: ?) -> value rf {</span><br><span>@@ -238,11 +244,12 @@</span><br><span> self.stop;</span><br><span> }</span><br><span> [] NSCP.receive(tr_SNS_CONFIG(config.nsei, true,</span><br><span style="color: hsl(0, 100%, 40%);">- {tr_SNS_IPv4(config.remote_ip, config.remote_udp_port)})) -> value rf {</span><br><span style="color: hsl(120, 100%, 40%);">+ {tr_SNS_IPv4(config.provider.ip.remote_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ config.provider.ip.remote_udp_port)})) -> value rf {</span><br><span> /* blindly acknowledge whatever the PCU sends */</span><br><span> NSCP.send(ts_SNS_CONFIG_ACK(config.nsei, omit));</span><br><span> /* send a SNS-CONFIG in response and expect a SNS-CONFIG-ACK */</span><br><span style="color: hsl(0, 100%, 40%);">- var IP4_Elements v4 := { valueof(ts_SNS_IPv4(config.local_ip, config.local_udp_port)) };</span><br><span style="color: hsl(120, 100%, 40%);">+ var IP4_Elements v4 := { valueof(ts_SNS_IPv4(config.provider.ip.local_ip, config.provider.ip.local_udp_port)) };</span><br><span> NSCP.send(ts_SNS_CONFIG(config.nsei, true, v4));</span><br><span> alt {</span><br><span> [] NSCP.receive(tr_SNS_CONFIG_ACK(config.nsei, omit)) {</span><br><span>diff --git a/library/NS_Provider_IPL4.ttcn b/library/NS_Provider_IPL4.ttcn</span><br><span>index 8ab8caa..1414935 100644</span><br><span>--- a/library/NS_Provider_IPL4.ttcn</span><br><span>+++ b/library/NS_Provider_IPL4.ttcn</span><br><span>@@ -27,12 +27,12 @@</span><br><span> </span><br><span> /* connect socket */</span><br><span> map(self:IPL4, system:IPL4);</span><br><span style="color: hsl(0, 100%, 40%);">- var Result res := f_IPL4_connect(IPL4, config.remote_ip, config.remote_udp_port, config.local_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- config.local_udp_port, 0, { udp := {}});</span><br><span style="color: hsl(120, 100%, 40%);">+ var Result res := f_IPL4_connect(IPL4, config.provider.ip.remote_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ config.provider.ip.remote_udp_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ config.provider.ip.local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ config.provider.ip.local_udp_port, 0, { udp := {}});</span><br><span> if (not ispresent(res.connId)) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "Could not connect NS UDP socket from " &</span><br><span style="color: hsl(0, 100%, 40%);">- config.local_ip & ":" & int2str(config.local_udp_port) &</span><br><span style="color: hsl(0, 100%, 40%);">- " to " & config.remote_ip & ":" & int2str(config.remote_udp_port));</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "Could not connect NS UDP socket ", config.provider.ip);</span><br><span> mtc.stop;</span><br><span> }</span><br><span> g_conn_id := res.connId;</span><br><span>diff --git a/library/RAW_NS.ttcn b/library/RAW_NS.ttcn</span><br><span>index d02f4ca..dca352f 100644</span><br><span>--- a/library/RAW_NS.ttcn</span><br><span>+++ b/library/RAW_NS.ttcn</span><br><span>@@ -50,14 +50,15 @@</span><br><span> g_nsconfig[idx] := ns_config;</span><br><span> /* adjust those parts different for each NS-VC */</span><br><span> g_nsconfig[idx].nsvci := ns_config.nsvci + idx;</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[idx].local_udp_port := ns_config.local_udp_port + idx + tc_offset;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig[idx].provider.ip.local_udp_port := ns_config.provider.ip.local_udp_port + idx + tc_offset;</span><br><span> }</span><br><span> </span><br><span> map(self:NSCP[idx], system:NSCP);</span><br><span> /* Connect the UDP socket */</span><br><span style="color: hsl(0, 100%, 40%);">- log("connecting NSCP[", idx, "] to ", g_nsconfig[idx]);</span><br><span style="color: hsl(0, 100%, 40%);">- res := f_IPL4_connect(NSCP[idx], g_nsconfig[idx].remote_ip, g_nsconfig[idx].remote_udp_port,</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[idx].local_ip, g_nsconfig[idx].local_udp_port, 0, { udp := {}});</span><br><span style="color: hsl(120, 100%, 40%);">+ var NSConfiguration nscfg := g_nsconfig[idx];</span><br><span style="color: hsl(120, 100%, 40%);">+ log("connecting NSCP[", idx, "] to ", nscfg);</span><br><span style="color: hsl(120, 100%, 40%);">+ res := f_IPL4_connect(NSCP[idx], nscfg.provider.ip.remote_ip, nscfg.provider.ip.remote_udp_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ nscfg.provider.ip.local_ip, nscfg.provider.ip.local_udp_port, 0, { udp := {}});</span><br><span> if (not ispresent(res.connId)) {</span><br><span> setverdict(fail, "Could not connect NS UDP socket, check your configuration ", g_nsconfig[idx]);</span><br><span> mtc.stop;</span><br><span>diff --git a/pcu/PCU_Tests.cfg b/pcu/PCU_Tests.cfg</span><br><span>index 7681544..e7bba18 100644</span><br><span>--- a/pcu/PCU_Tests.cfg</span><br><span>+++ b/pcu/PCU_Tests.cfg</span><br><span>@@ -8,11 +8,15 @@</span><br><span> </span><br><span> [MODULE_PARAMETERS]</span><br><span> SGSN_Components.mp_nsconfig := {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span style="color: hsl(0, 100%, 40%);">- local_ip := "127.0.0.1",</span><br><span style="color: hsl(0, 100%, 40%);">- local_udp_port := 23000,</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "127.0.0.1",</span><br><span style="color: hsl(0, 100%, 40%);">- remote_udp_port := 22000,</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ local_udp_port := 23000,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_udp_port := 22000</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> nsvci := 1234,</span><br><span> nsei := 1234</span><br><span> }</span><br><span>diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn</span><br><span>index 0bd7093..f68485a 100644</span><br><span>--- a/pcu/PCU_Tests.ttcn</span><br><span>+++ b/pcu/PCU_Tests.ttcn</span><br><span>@@ -98,10 +98,10 @@</span><br><span> initial_cs := 2,</span><br><span> initial_mcs := 6,</span><br><span> nsvci := { mp_nsconfig.nsvci, 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- local_port := { mp_nsconfig.remote_udp_port, 0 },</span><br><span style="color: hsl(0, 100%, 40%);">- remote_port := { mp_nsconfig.local_udp_port, 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ local_port := { mp_nsconfig.provider.ip.remote_udp_port, 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_port := { mp_nsconfig.provider.ip.local_udp_port, 0 },</span><br><span> remote_addr := f_PCUIF_ver_INFO_RemoteAddr(</span><br><span style="color: hsl(0, 100%, 40%);">- f_PCUIF_AF2addr_type(mp_nsconfig.address_family), mp_nsconfig.local_ip)</span><br><span style="color: hsl(120, 100%, 40%);">+ f_PCUIF_AF2addr_type(mp_nsconfig.provider.ip.address_family), mp_nsconfig.provider.ip.local_ip)</span><br><span> }</span><br><span> </span><br><span> type record lqual_range {</span><br><span>diff --git a/pcu/PCU_Tests_SNS.ttcn b/pcu/PCU_Tests_SNS.ttcn</span><br><span>index 192890d..524d35c 100644</span><br><span>--- a/pcu/PCU_Tests_SNS.ttcn</span><br><span>+++ b/pcu/PCU_Tests_SNS.ttcn</span><br><span>@@ -50,8 +50,8 @@</span><br><span> runs on RAW_NS_CT {</span><br><span> log("f_incoming_sns_config(idx=", idx, ")");</span><br><span> var PDU_NS rx;</span><br><span style="color: hsl(0, 100%, 40%);">- var template IP4_Elements v4_elem := { tr_SNS_IPv4(mp_nsconfig.remote_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- mp_nsconfig.remote_udp_port) };</span><br><span style="color: hsl(120, 100%, 40%);">+ var template IP4_Elements v4_elem := { tr_SNS_IPv4(mp_nsconfig.provider.ip.remote_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ mp_nsconfig.provider.ip.remote_udp_port) };</span><br><span> rx := f_ns_exp(tr_SNS_CONFIG(g_nsconfig[idx].nsei, end_flag := true, v4 := v4_elem), idx);</span><br><span> NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG_ACK(g_nsconfig[idx].nsei, cause)));</span><br><span> }</span><br><span>@@ -61,8 +61,8 @@</span><br><span> runs on RAW_NS_CT {</span><br><span> log("f_outgoing_sns_config(idx=", idx, ")");</span><br><span> var PDU_NS rx;</span><br><span style="color: hsl(0, 100%, 40%);">- var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx].local_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[idx].local_udp_port) }</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx].provider.ip.local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig[idx].provider.ip.local_udp_port) }</span><br><span> NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG(g_nsconfig[idx].nsei, true, v4)));</span><br><span> rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig[idx].nsei, cause), idx);</span><br><span> }</span><br><span>@@ -72,10 +72,10 @@</span><br><span> runs on RAW_NS_CT {</span><br><span> log("f_outgoing_sns_config_1c1u(idx=", idx, ")");</span><br><span> var PDU_NS rx;</span><br><span style="color: hsl(0, 100%, 40%);">- var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[0].local_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[0].local_udp_port, 1, 0),</span><br><span style="color: hsl(0, 100%, 40%);">- ts_SNS_IPv4(g_nsconfig[1].local_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[1].local_udp_port, 0, 1) };</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[0].provider.ip.local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig[0].provider.ip.local_udp_port, 1, 0),</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_SNS_IPv4(g_nsconfig[1].provider.ip.local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig[1].provider.ip.local_udp_port, 0, 1) };</span><br><span> NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG(g_nsconfig[idx].nsei, true, v4)));</span><br><span> rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig[idx].nsei, cause), idx);</span><br><span> }</span><br><span>@@ -85,10 +85,10 @@</span><br><span> runs on RAW_NS_CT {</span><br><span> log("f_outgoing_sns_config_1c1u_separate(idx=", idx, ")");</span><br><span> var PDU_NS rx;</span><br><span style="color: hsl(0, 100%, 40%);">- var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[1].local_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[1].local_udp_port, 1, 0),</span><br><span style="color: hsl(0, 100%, 40%);">- ts_SNS_IPv4(g_nsconfig[2].local_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[2].local_udp_port, 0, 1) };</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[1].provider.ip.local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig[1].provider.ip.local_udp_port, 1, 0),</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_SNS_IPv4(g_nsconfig[2].provider.ip.local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig[2].provider.ip.local_udp_port, 0, 1) };</span><br><span> NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CONFIG(g_nsconfig[idx].nsei, true, v4)));</span><br><span> rx := f_ns_exp(tr_SNS_CONFIG_ACK(g_nsconfig[idx].nsei, cause), idx);</span><br><span> }</span><br><span>@@ -97,8 +97,8 @@</span><br><span> runs on RAW_NS_CT {</span><br><span> log("f_outgoing_sns_add(idx_add=", idx_add, ")");</span><br><span> var PDU_NS rx;</span><br><span style="color: hsl(0, 100%, 40%);">- var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx_add].local_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[idx_add].local_udp_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx_add].provider.ip.local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig[idx_add].provider.ip.local_udp_port,</span><br><span> w_sig, w_user) };</span><br><span> NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_ADD(g_nsconfig[idx].nsei, 23, v4)));</span><br><span> rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 23, omit, v4));</span><br><span>@@ -108,8 +108,8 @@</span><br><span> runs on RAW_NS_CT {</span><br><span> log("f_outgoing_sns_del(idx_del=", idx_del, ")");</span><br><span> var PDU_NS rx;</span><br><span style="color: hsl(0, 100%, 40%);">- var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx_del].local_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[idx_del].local_udp_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx_del].provider.ip.local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig[idx_del].provider.ip.local_udp_port,</span><br><span> w_sig, w_user) };</span><br><span> NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_DEL(g_nsconfig[idx].nsei, 24, omit, v4)));</span><br><span> rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 24, omit, v4));</span><br><span>@@ -119,8 +119,8 @@</span><br><span> runs on RAW_NS_CT {</span><br><span> log("f_outgoing_sns_chg_weight(idx_chg=", idx_chg, ")");</span><br><span> var PDU_NS rx;</span><br><span style="color: hsl(0, 100%, 40%);">- var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx_chg].local_ip,</span><br><span style="color: hsl(0, 100%, 40%);">- g_nsconfig[idx_chg].local_udp_port,</span><br><span style="color: hsl(120, 100%, 40%);">+ var template (omit) IP4_Elements v4 := { ts_SNS_IPv4(g_nsconfig[idx_chg].provider.ip.local_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_nsconfig[idx_chg].provider.ip.local_udp_port,</span><br><span> w_sig, w_user) };</span><br><span> NSCP[idx].send(t_NS_Send(g_ns_conn_id[idx], ts_SNS_CHG_WEIGHT(g_nsconfig[idx].nsei, 25, v4)));</span><br><span> rx := f_ns_exp(tr_SNS_ACK(g_nsconfig[idx].nsei, 25, omit, v4));</span><br><span>diff --git a/pcu/SGSN_Components.ttcn b/pcu/SGSN_Components.ttcn</span><br><span>index afd4ee9..4a94c03 100644</span><br><span>--- a/pcu/SGSN_Components.ttcn</span><br><span>+++ b/pcu/SGSN_Components.ttcn</span><br><span>@@ -35,11 +35,15 @@</span><br><span> };</span><br><span> </span><br><span> NSConfiguration mp_nsconfig := {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span style="color: hsl(0, 100%, 40%);">- local_udp_port := 23000,</span><br><span style="color: hsl(0, 100%, 40%);">- local_ip := "127.0.0.1",</span><br><span style="color: hsl(0, 100%, 40%);">- remote_udp_port := 21000,</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_udp_port := 23000,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_udp_port := 21000,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "127.0.0.1"</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> nsvci := 0,</span><br><span> nsei := 2342,</span><br><span> role_sgsn := true,</span><br><span>diff --git a/sgsn/SGSN_Tests.cfg b/sgsn/SGSN_Tests.cfg</span><br><span>index d5c3a4c..c4e1a33 100644</span><br><span>--- a/sgsn/SGSN_Tests.cfg</span><br><span>+++ b/sgsn/SGSN_Tests.cfg</span><br><span>@@ -14,19 +14,31 @@</span><br><span> [MODULE_PARAMETERS]</span><br><span> SGSN_Tests.mp_nsconfig := {</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span style="color: hsl(0, 100%, 40%);">- local_ip := "127.0.0.103",</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "127.0.0.10"</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "127.0.0.103",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "127.0.0.10"</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> },</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span style="color: hsl(0, 100%, 40%);">- local_ip := "127.0.0.103",</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "127.0.0.10"</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "127.0.0.103",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "127.0.0.10"</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> },</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span style="color: hsl(0, 100%, 40%);">- local_ip := "127.0.0.103",</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "127.0.0.10"</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "127.0.0.103",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "127.0.0.10"</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> }</span><br><span> SGSN_Tests.mp_ranap_cfg := {</span><br><span>diff --git a/sgsn/SGSN_Tests.ttcn b/sgsn/SGSN_Tests.ttcn</span><br><span>index b42020d..8a87ee2 100644</span><br><span>--- a/sgsn/SGSN_Tests.ttcn</span><br><span>+++ b/sgsn/SGSN_Tests.ttcn</span><br><span>@@ -69,33 +69,45 @@</span><br><span> </span><br><span> NSConfigurations mp_nsconfig := {</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span style="color: hsl(0, 100%, 40%);">- local_udp_port := 21010,</span><br><span style="color: hsl(0, 100%, 40%);">- local_ip := "127.0.0.1",</span><br><span style="color: hsl(0, 100%, 40%);">- remote_udp_port := 23000,</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_udp_port := 21010,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_udp_port := 23000,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "127.0.0.1"</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> nsvci := 97,</span><br><span> nsei := 96,</span><br><span> role_sgsn := false,</span><br><span> handle_sns := false</span><br><span> },</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span style="color: hsl(0, 100%, 40%);">- local_udp_port := 21011,</span><br><span style="color: hsl(0, 100%, 40%);">- local_ip := "127.0.0.1",</span><br><span style="color: hsl(0, 100%, 40%);">- remote_udp_port := 23000,</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_udp_port := 21011,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_udp_port := 23000,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "127.0.0.1"</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> nsvci := 98,</span><br><span> nsei := 97,</span><br><span> role_sgsn := false,</span><br><span> handle_sns := false</span><br><span> },</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- address_family := AF_INET,</span><br><span style="color: hsl(0, 100%, 40%);">- local_udp_port := 21012,</span><br><span style="color: hsl(0, 100%, 40%);">- local_ip := "127.0.0.1",</span><br><span style="color: hsl(0, 100%, 40%);">- remote_udp_port := 23000,</span><br><span style="color: hsl(0, 100%, 40%);">- remote_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ provider := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ip := {</span><br><span style="color: hsl(120, 100%, 40%);">+ address_family := AF_INET,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_udp_port := 21012,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_ip := "127.0.0.1",</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_udp_port := 23000,</span><br><span style="color: hsl(120, 100%, 40%);">+ remote_ip := "127.0.0.1"</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span> nsvci := 99,</span><br><span> nsei := 98,</span><br><span> role_sgsn := false,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20117">change 20117</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20117"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I6904520d8c2f546327029777d68b1907611a8cf5 </div>
<div style="display:none"> Gerrit-Change-Number: 20117 </div>
<div style="display:none"> Gerrit-PatchSet: 9 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>