<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19244">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BTS_Tests: introduce and use helper f_l1ctl_est_dchan()<br><br>This is required for the upcoming test cases running on hopping<br>channels. Dealing with module / hopping parameters in every<br>test case is definitely not a good idea, so let's add a function.<br><br>Change-Id: Ia4f078ebbb278246ee117f580ff93f301dc60f7c<br>Related: SYS#4868, OS#4546<br>---<br>M bts/BTS_Tests.ttcn<br>1 file changed, 22 insertions(+), 7 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 1582fae..1cecf4e 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -1149,7 +1149,7 @@</span><br><span> f_rsl_chan_act(g_pars.chan_mode, act_type := t_RSL_IE_ActType_HO_ASYNC);</span><br><span> /* don't perform immediate assignment here, as we're testing non-IA case */</span><br><span> /* enable dedicated mode */</span><br><span style="color: hsl(0, 100%, 40%);">- L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_l1ctl_est_dchan(L1CTL, g_pars);</span><br><span> </span><br><span> /* Verify that no DL SACCH is being received */</span><br><span> f_sacch_missing(?);</span><br><span>@@ -1167,7 +1167,7 @@</span><br><span> f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := t_RSL_IE_ActType_HO_ASYNC);</span><br><span> /* don't perform immediate assignment here, as we're testing non-IA case */</span><br><span> /* enable dedicated mode */</span><br><span style="color: hsl(0, 100%, 40%);">- L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_l1ctl_est_dchan(L1CTL, g_pars);</span><br><span> </span><br><span> /* Verify that DL SACCH is being received */</span><br><span> f_sacch_present(si5);</span><br><span>@@ -1205,7 +1205,7 @@</span><br><span> f_rsl_chan_act(g_pars.chan_mode, act_type := t_RSL_IE_ActType_HO_SYNC);</span><br><span> /* don't perform immediate assignment here, as we're testing non-IA case */</span><br><span> /* enable dedicated mode */</span><br><span style="color: hsl(0, 100%, 40%);">- L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_l1ctl_est_dchan(L1CTL, g_pars);</span><br><span> </span><br><span> /* Verify that no DL SACCH is being received */</span><br><span> f_sacch_missing(?);</span><br><span>@@ -1223,7 +1223,7 @@</span><br><span> f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := t_RSL_IE_ActType_HO_SYNC);</span><br><span> /* don't perform immediate assignment here, as we're testing non-IA case */</span><br><span> /* enable dedicated mode */</span><br><span style="color: hsl(0, 100%, 40%);">- L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_l1ctl_est_dchan(L1CTL, g_pars);</span><br><span> </span><br><span> /* Verify that no DL SACCH is being received */</span><br><span> f_sacch_missing(?);</span><br><span>@@ -1241,7 +1241,7 @@</span><br><span> f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := t_RSL_IE_ActType_HO_SYNC);</span><br><span> /* don't perform immediate assignment here, as we're testing non-IA case */</span><br><span> /* enable dedicated mode */</span><br><span style="color: hsl(0, 100%, 40%);">- L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_l1ctl_est_dchan(L1CTL, g_pars);</span><br><span> </span><br><span> /* Verify that no DL SACCH is being received */</span><br><span> f_sacch_missing(?);</span><br><span>@@ -1260,7 +1260,7 @@</span><br><span> f_rsl_chan_act(g_pars.chan_mode, more_ies := addl_ies, act_type := t_RSL_IE_ActType_HO_SYNC);</span><br><span> /* don't perform immediate assignment here, as we're testing non-IA case */</span><br><span> /* enable dedicated mode */</span><br><span style="color: hsl(0, 100%, 40%);">- L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_l1ctl_est_dchan(L1CTL, g_pars);</span><br><span> </span><br><span> /* Verify that DL SACCH is being received */</span><br><span> f_sacch_present(si5);</span><br><span>@@ -1626,7 +1626,7 @@</span><br><span> </span><br><span> /* Switch the MS side (e.g. trxcon) to a dedicated channel without</span><br><span> * waiting for Immediate Assignment and sending Access Burst */</span><br><span style="color: hsl(0, 100%, 40%);">- L1CTL.send(ts_L1CTL_DM_EST_REQ_H0(g_pars.chan_nr, 7, mp_trx0_arfcn));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_l1ctl_est_dchan(L1CTL, g_pars);</span><br><span> </span><br><span> /* Send handover Access Burst */</span><br><span> fn := f_L1CTL_RACH(L1CTL, ho_ref, chan_nr := g_pars.chan_nr);</span><br><span>@@ -1990,6 +1990,21 @@</span><br><span> return fn;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Tune to a dedicated channel: L1CTL only */</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_l1ctl_est_dchan(L1CTL_PT pt, ConnHdlrPars pars) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not ispresent(pars.maio_hsn)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ pt.send(ts_L1CTL_DM_EST_REQ_H0(pars.chan_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ 7 /* TODO: mp_tsc */,</span><br><span style="color: hsl(120, 100%, 40%);">+ mp_trx0_arfcn));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ pt.send(ts_L1CTL_DM_EST_REQ_H1(pars.chan_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ 7 /* TODO: mp_tsc */,</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.maio_hsn.hsn,</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.maio_hsn.maio,</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.ma));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Establish dedicated channel: L1CTL + RSL side */</span><br><span> private function f_est_dchan(boolean encr_enable := false, RSL_IE_List more_ies := {}) runs on ConnHdlr {</span><br><span> var GsmFrameNumber fn;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19244">change 19244</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/+/19244"/><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: Ia4f078ebbb278246ee117f580ff93f301dc60f7c </div>
<div style="display:none"> Gerrit-Change-Number: 19244 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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>