<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25088">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">msc: eliminate bssap_idx<br><br>There is a pars.ran_idx, no need for an explicit bssap_idx argument.<br><br>There is only one occurence passing a nonzero bssap_idx, use<br>pars.ran_idx instead.<br><br>Preparation for patch "msc: split f_start_handler_with_pars()"<br>Ic7e9dbb8c9db5948fe35fc3051bb988d65622782<br><br>Related: SYS#5130<br>Change-Id: Ib5c5585f098ff269920cf9d5781c4366234854c5<br>---<br>M msc/MSC_Tests.ttcn<br>1 file changed, 11 insertions(+), 8 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/88/25088/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn</span><br><span>index 0e0d6b6..740d396 100644</span><br><span>--- a/msc/MSC_Tests.ttcn</span><br><span>+++ b/msc/MSC_Tests.ttcn</span><br><span>@@ -412,14 +412,15 @@</span><br><span>         return pars;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_start_handler_with_pars(void_fn fn, BSC_ConnHdlrPars pars, integer bssap_idx := 0) runs on MTC_CT return BSC_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+function f_start_handler_with_pars(void_fn fn, BSC_ConnHdlrPars pars) runs on MTC_CT return BSC_ConnHdlr {</span><br><span>  var BSC_ConnHdlr vc_conn;</span><br><span style="color: hsl(0, 100%, 40%);">-       var charstring id := testcasename() & int2str(bssap_idx);</span><br><span style="color: hsl(120, 100%, 40%);">+ var charstring id := testcasename() & int2str(pars.ran_idx);</span><br><span> </span><br><span>         vc_conn := BSC_ConnHdlr.create(id);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>        /* BSSMAP part / A interface */</span><br><span style="color: hsl(0, 100%, 40%);">- connect(vc_conn:BSSAP, g_bssap[pars.ran_idx + bssap_idx].vc_RAN:CLIENT);</span><br><span style="color: hsl(0, 100%, 40%);">-        connect(vc_conn:BSSAP_PROC, g_bssap[pars.ran_idx + bssap_idx].vc_RAN:PROC);</span><br><span style="color: hsl(120, 100%, 40%);">+   connect(vc_conn:BSSAP, g_bssap[pars.ran_idx].vc_RAN:CLIENT);</span><br><span style="color: hsl(120, 100%, 40%);">+  connect(vc_conn:BSSAP_PROC, g_bssap[pars.ran_idx].vc_RAN:PROC);</span><br><span>      /* MNCC part */</span><br><span>      connect(vc_conn:MNCC, vc_MNCC:MNCC_CLIENT);</span><br><span>  connect(vc_conn:MNCC_PROC, vc_MNCC:MNCC_PROC);</span><br><span>@@ -5912,6 +5913,7 @@</span><br><span>       pars0.use_umts_aka := true;</span><br><span>  pars0.vec := f_gen_auth_vec_3g();</span><br><span>    pars0.vec_keep := true;</span><br><span style="color: hsl(120, 100%, 40%);">+       pars0.ran_idx := 0;</span><br><span> </span><br><span>      var BSC_ConnHdlrPars pars1 := f_init_pars(53);</span><br><span>       pars1.use_ipv6 := use_ipv6;</span><br><span>@@ -5926,14 +5928,15 @@</span><br><span>         * components and then not overwriting it in BSC_ConnectionHandler. */</span><br><span>       pars1.vec := pars0.vec;</span><br><span>      pars1.vec_keep := true;</span><br><span style="color: hsl(120, 100%, 40%);">+       pars1.ran_idx := 1;</span><br><span> </span><br><span>      if (a5_n > 0) {</span><br><span>           f_vty_config(MSCVTY, "network", "authentication required");</span><br><span>      }</span><br><span>    f_vty_config(MSCVTY, "network", "encryption a5 " & int2str(a5_n));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  vc_conn0 := f_start_handler_with_pars(refers(f_tc_ho_inter_bsc0), pars0, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-    vc_conn1 := f_start_handler_with_pars(refers(f_tc_ho_inter_bsc1), pars1, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+  vc_conn0 := f_start_handler_with_pars(refers(f_tc_ho_inter_bsc0), pars0);</span><br><span style="color: hsl(120, 100%, 40%);">+     vc_conn1 := f_start_handler_with_pars(refers(f_tc_ho_inter_bsc1), pars1);</span><br><span>    vc_conn0.done;</span><br><span>       vc_conn1.done;</span><br><span> }</span><br><span>@@ -6252,7 +6255,7 @@</span><br><span>  }</span><br><span>    f_vty_config(MSCVTY, "network", "encryption a5 " & int2str(a5_n));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  vc_conn := f_start_handler_with_pars(refers(f_tc_ho_inter_msc_out), pars, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn := f_start_handler_with_pars(refers(f_tc_ho_inter_msc_out), pars);</span><br><span>   vc_conn.done;</span><br><span> }</span><br><span> testcase TC_ho_inter_msc_out() runs on MTC_CT {</span><br><span>@@ -6274,7 +6277,7 @@</span><br><span>        var BSC_ConnHdlrPars pars := f_init_pars(54);</span><br><span>        pars.use_ipv6 := true;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      vc_conn := f_start_handler_with_pars(refers(f_tc_ho_inter_msc_out), pars, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn := f_start_handler_with_pars(refers(f_tc_ho_inter_msc_out), pars);</span><br><span>   vc_conn.done;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/25088">change 25088</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/+/25088"/><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: Ib5c5585f098ff269920cf9d5781c4366234854c5 </div>
<div style="display:none"> Gerrit-Change-Number: 25088 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>