<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14413">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bscnat: Add function to run actions on test per BSC component<br><br>Will be useful to test stuff on IPA layer BSC<->BSC-NAT.<br><br>Change-Id: I97e743c79e5e9e7613ab91a1aa9ce2377a237fd5<br>---<br>M bsc-nat/BSCNAT_Tests.ttcn<br>M bsc-nat/BSC_MS_Simulation.ttcn<br>2 files changed, 12 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/13/14413/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc-nat/BSCNAT_Tests.ttcn b/bsc-nat/BSCNAT_Tests.ttcn</span><br><span>index 47d894b..81afcfa 100644</span><br><span>--- a/bsc-nat/BSCNAT_Tests.ttcn</span><br><span>+++ b/bsc-nat/BSCNAT_Tests.ttcn</span><br><span>@@ -138,7 +138,7 @@</span><br><span> f_vty_transceive(BSCNATVTY, "enable");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_init(void_fn_bsc_ms fn_bsc_ms, BssmapCreateCallback cb_msc, boolean use_osmux) runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+function f_init(void_fn_bsc_ms fn_bsc_ms, void_fn_bsc fn_bsc, BssmapCreateCallback cb_msc, boolean use_osmux) runs on test_CT {</span><br><span> var integer i;</span><br><span> var charstring id;</span><br><span> </span><br><span>@@ -166,7 +166,7 @@</span><br><span> pars.sccp_addr_remote := bsc[i].sccp_addr_peer;</span><br><span> pars.use_osmux := use_osmux;</span><br><span> bsc[i].BSC.start(BSC_MS_Simulation.main(mp_nat_ip, mp_nat_port, mp_bsc_ip, mp_bsc_port+i,</span><br><span style="color: hsl(0, 100%, 40%);">- bsc[i].sccp_pars, pars, fn_bsc_ms, id));</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc[i].sccp_pars, pars, fn_bsc_ms, fn_bsc, id));</span><br><span> }</span><br><span> </span><br><span> }</span><br><span>@@ -191,6 +191,7 @@</span><br><span> timer T := 30.0;</span><br><span> </span><br><span> f_init(refers(bsc_ms_establish_fully),</span><br><span style="color: hsl(120, 100%, 40%);">+ refers(bsc_do_nothing),</span><br><span> refers(CreateCallback_establish_fully),</span><br><span> use_osmux);</span><br><span> </span><br><span>diff --git a/bsc-nat/BSC_MS_Simulation.ttcn b/bsc-nat/BSC_MS_Simulation.ttcn</span><br><span>index 5feaf0e..fe12305 100644</span><br><span>--- a/bsc-nat/BSC_MS_Simulation.ttcn</span><br><span>+++ b/bsc-nat/BSC_MS_Simulation.ttcn</span><br><span>@@ -23,6 +23,8 @@</span><br><span> </span><br><span> import from BSC_MS_ConnectionHandler all;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+type function void_fn_bsc(charstring id) runs on BSC_CT;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> type component BSC_CT {</span><br><span> /* component references */</span><br><span> var IPA_Emulation_CT vc_IPA;</span><br><span>@@ -64,11 +66,15 @@</span><br><span> fn.apply(id);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+function bsc_do_nothing(charstring id)</span><br><span style="color: hsl(120, 100%, 40%);">+runs on BSC_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> function main(charstring remote_ip, PortNumber remote_port,</span><br><span> charstring local_ip, PortNumber local_port,</span><br><span> MSC_SCCP_MTP3_parameters sccp_pars,</span><br><span> BSC_MS_TestHdlrParams pars,</span><br><span style="color: hsl(0, 100%, 40%);">- void_fn_bsc_ms fn, charstring id) runs on BSC_CT</span><br><span style="color: hsl(120, 100%, 40%);">+ void_fn_bsc_ms fn_bsc_ms, void_fn_bsc fn_bsc, charstring id) runs on BSC_CT</span><br><span> {</span><br><span> var integer i := 0;</span><br><span> timer T := 1.0;</span><br><span>@@ -102,8 +108,9 @@</span><br><span> T.timeout;</span><br><span> </span><br><span> for (i := 0; i < mp_num_iterations; i := i+1) {</span><br><span style="color: hsl(0, 100%, 40%);">- f_start_BSC_MS(fn, id & "-MS-" & int2str(i));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_start_BSC_MS(fn_bsc_ms, id & "-MS-" & int2str(i));</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ fn_bsc.apply(id);</span><br><span> </span><br><span> /* explicitly stop all components that we started above */</span><br><span> vc_IPA.stop;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14413">change 14413</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/+/14413"/><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: I97e743c79e5e9e7613ab91a1aa9ce2377a237fd5 </div>
<div style="display:none"> Gerrit-Change-Number: 14413 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>