<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24479">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">HACK: allow running parallel BTS_Tests.ConnHdlr components<br><br>Unfortunately, trxcon does not support handling more than one<br>connection in parallel. If there is already one connection<br>established, it would reject all other connection attempts.<br><br>This causes an error in f_handler_init(). As a quick hack,<br>let's allow running BTS_Tests.ConnHdlr components without<br>establishing L1CTL connections at all.<br><br>Change-Id: I72bcaed6c3803a0e18c9b787036a441e30c220cc<br>Related: SYS#4895, OS#4941<br>---<br>M bts/BTS_Tests.ttcn<br>1 file changed, 8 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn</span><br><span>index d00c40e..8b10d0e 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -639,7 +639,8 @@</span><br><span> /* create a new test component */</span><br><span> friend function f_start_handler(void_fn fn, ConnHdlrPars pars,</span><br><span> boolean pcu_comp := false,</span><br><span style="color: hsl(0, 100%, 40%);">- boolean trxc_comp := false)</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean trxc_comp := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ boolean l1ctl := true)</span><br><span> runs on test_CT return ConnHdlr {</span><br><span> var charstring id := testcasename();</span><br><span> var ConnHdlr vc_conn;</span><br><span>@@ -660,6 +661,9 @@</span><br><span> unmap(self:BTS_TRXC, system:BTS_TRXC);</span><br><span> map(vc_conn:BTS_TRXC, system:BTS_TRXC);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (l1ctl) {</span><br><span style="color: hsl(120, 100%, 40%);">+ map(vc_conn:L1CTL, system:L1CTL);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* Obtain frequency hopping parameters for a given timeslot */</span><br><span> if (mp_freq_hop_enabled and mp_transceiver_num > 1) {</span><br><span>@@ -697,8 +701,9 @@</span><br><span> g_pars := pars;</span><br><span> g_chan_nr := pars.chan_nr;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- map(self:L1CTL, system:L1CTL);</span><br><span style="color: hsl(0, 100%, 40%);">- f_connect_reset(L1CTL);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (L1CTL.checkstate("Mapped")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_connect_reset(L1CTL);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> if (mp_bts_trxc_port != -1 and BTS_TRXC.checkstate("Mapped")) {</span><br><span> f_init_trxc(BTS_TRXC, id, g_bts_trxc_conn_id);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24479">change 24479</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/+/24479"/><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: I72bcaed6c3803a0e18c9b787036a441e30c220cc </div>
<div style="display:none"> Gerrit-Change-Number: 24479 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>