<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21317">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BTS_Tests: make TRX number configurable for ConnHdlr<br><br>This change allows running test cases against additional transceivers.<br><br>Change-Id: Ifed3891658501e0a04ff89563d0a02f08211eed3<br>Related: SYS#4918<br>---<br>M bts/BTS_Tests.ttcn<br>M bts/BTS_Tests_LAPDm.ttcn<br>2 files changed, 11 insertions(+), 6 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 5757e35..2e35ce9 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -300,6 +300,7 @@</span><br><span> };</span><br><span> </span><br><span> type record ConnHdlrPars {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t trx_nr,</span><br><span> RslChannelNr chan_nr,</span><br><span> RSL_IE_ChannelMode chan_mode,</span><br><span> float t_guard,</span><br><span>@@ -733,7 +734,7 @@</span><br><span> g_Tguard.start(pars.t_guard);</span><br><span> activate(as_Tguard());</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_rslem_register(0, pars.chan_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_rslem_register(pars.trx_nr, pars.chan_nr);</span><br><span> </span><br><span> /* call the user-supplied test case function */</span><br><span> fn.apply(id);</span><br><span>@@ -797,7 +798,8 @@</span><br><span> friend template ConnHdlrPars t_Pars(template RslChannelNr chan_nr,</span><br><span> template RSL_IE_ChannelMode chan_mode,</span><br><span> template (omit) TestSpecUnion spec := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- float t_guard := 20.0) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t trx_nr := 0, float t_guard := 20.0) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_nr := trx_nr,</span><br><span> chan_nr := valueof(chan_nr),</span><br><span> chan_mode := valueof(chan_mode),</span><br><span> t_guard := t_guard,</span><br><span>@@ -2220,8 +2222,9 @@</span><br><span> /* Tune to a dedicated channel: L1CTL only */</span><br><span> private function f_l1ctl_est_dchan(L1CTL_PT pt, ConnHdlrPars pars) {</span><br><span> if (not pars.fhp.enabled) {</span><br><span style="color: hsl(120, 100%, 40%);">+ var TrxParsItem trx_pars := mp_trx_pars[pars.trx_nr];</span><br><span> pt.send(ts_L1CTL_DM_EST_REQ_H0(pars.chan_nr, pars.tsc,</span><br><span style="color: hsl(0, 100%, 40%);">- mp_trx_pars[0].arfcn));</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_pars.arfcn));</span><br><span> } else {</span><br><span> pt.send(ts_L1CTL_DM_EST_REQ_H1(pars.chan_nr, pars.tsc,</span><br><span> pars.fhp.maio_hsn.hsn,</span><br><span>@@ -2241,7 +2244,8 @@</span><br><span> if (g_pars.fhp.enabled) {</span><br><span> ch_desc := valueof(ts_ChanDescH1(g_pars.chan_nr, g_pars.fhp.maio_hsn, g_pars.tsc));</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- ch_desc := valueof(ts_ChanDescH0(g_pars.chan_nr, mp_trx_pars[0].arfcn, g_pars.tsc));</span><br><span style="color: hsl(120, 100%, 40%);">+ var TrxParsItem trx_pars := mp_trx_pars[g_pars.trx_nr];</span><br><span style="color: hsl(120, 100%, 40%);">+ ch_desc := valueof(ts_ChanDescH0(g_pars.chan_nr, trx_pars.arfcn, g_pars.tsc));</span><br><span> }</span><br><span> </span><br><span> /* enable dedicated mode */</span><br><span>diff --git a/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn</span><br><span>index 6d252e0..edd974b 100644</span><br><span>--- a/bts/BTS_Tests_LAPDm.ttcn</span><br><span>+++ b/bts/BTS_Tests_LAPDm.ttcn</span><br><span>@@ -43,7 +43,8 @@</span><br><span> </span><br><span> /* master function switching to a dedicated radio channel */</span><br><span> function f_switch_dcch() runs on ConnHdlr {</span><br><span style="color: hsl(0, 100%, 40%);">- var GsmBandArfcn arfcn := valueof(ts_GsmBandArfcn(mp_trx_pars[0].arfcn));</span><br><span style="color: hsl(120, 100%, 40%);">+ var TrxParsItem trx_pars := mp_trx_pars[g_pars.trx_nr];</span><br><span style="color: hsl(120, 100%, 40%);">+ var GsmBandArfcn arfcn := valueof(ts_GsmBandArfcn(trx_pars.arfcn));</span><br><span> var BCCH_tune_req tune_req := { arfcn := arfcn, combined_ccch := true };</span><br><span> var DCCH_switch_req sw_req;</span><br><span> </span><br><span>@@ -55,7 +56,7 @@</span><br><span> sw_req.ma := g_pars.fhp.ma;</span><br><span> } else {</span><br><span> sw_req.chan_desc := valueof(ts_ChanDescH0(g_pars.chan_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- mp_trx_pars[0].arfcn,</span><br><span style="color: hsl(120, 100%, 40%);">+ trx_pars.arfcn,</span><br><span> g_pars.tsc));</span><br><span> sw_req.ma := omit;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21317">change 21317</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/+/21317"/><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: Ifed3891658501e0a04ff89563d0a02f08211eed3 </div>
<div style="display:none"> Gerrit-Change-Number: 21317 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </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: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>