<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26194">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/RSL_Types: fix CHAN ACT templates for dynamic timeslots<br><br>* t_RSL_IE_ActType_PDCH is actually a constant, not a template.<br>* tr_RSL_CHAN_ACT_PDCH makes no use of parameter 'mode'.<br>* Accomplish tr_RSL_CHAN_ACT_PDCH with a send template.<br>* Use 'present' qualifier for receive template parameters.<br><br>Change-Id: Ie62a92daaacf4de5f05dd1f3f5b4a2a5e4ee6dd6<br>---<br>M bsc/BSC_Tests.ttcn<br>M library/RSL_Types.ttcn<br>2 files changed, 31 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn</span><br><span>index 0c71581..5276ed9 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -7374,7 +7374,7 @@</span><br><span> log("TCH/F_TCH/H_PDCH pchan starts out in disabled mode:");</span><br><span> f_ts_dyn_mode_assert(0, 0, chan_nr.tn, NONE_MODE);</span><br><span> /* The BSC will activate the dynamic PDCH by default, so confirm that */</span><br><span style="color: hsl(0, 100%, 40%);">- rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr, ?));</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr));</span><br><span> </span><br><span> f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, 2342));</span><br><span> f_sleep(1.0);</span><br><span>@@ -7403,7 +7403,7 @@</span><br><span> </span><br><span> f_ts_dyn_mode_assert(0, 0, chan_nr.tn, NONE_MODE);</span><br><span> /* The BSC will activate the dynamic PDCH by default, so confirm that */</span><br><span style="color: hsl(0, 100%, 40%);">- rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr, ?));</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr));</span><br><span> </span><br><span> /* NACK this activation and expect the "show timeslot" mode still to be NONE */</span><br><span> f_ipa_tx(0, ts_RSL_CHAN_ACT_NACK(chan_nr, RSL_ERR_EQUIPMENT_FAIL));</span><br><span>@@ -7435,7 +7435,7 @@</span><br><span> log("TCH/F_TCH/H_SDCCH8_PDCH pchan starts out in disabled mode:");</span><br><span> f_ts_dyn_mode_assert(0, 0, pdch_chan_nr.tn, NONE_MODE);</span><br><span> /* The BSC will activate the dynamic PDCH by default, so confirm that */</span><br><span style="color: hsl(0, 100%, 40%);">- rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr, ?));</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr));</span><br><span> </span><br><span> f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(pdch_chan_nr, 2342));</span><br><span> f_sleep(1.0);</span><br><span>@@ -7473,7 +7473,7 @@</span><br><span> f_exp_chan_rel_and_clear(dt, 0);</span><br><span> </span><br><span> /* The BSC will switch the TS back to PDCH once the only lchan using it is released: */</span><br><span style="color: hsl(0, 100%, 40%);">- rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr, ?));</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr));</span><br><span> f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(pdch_chan_nr, 2342));</span><br><span> f_sleep(1.0);</span><br><span> f_ts_dyn_mode_assert(0, 0, pdch_chan_nr.tn, PDCH_MODE);</span><br><span>@@ -7505,7 +7505,7 @@</span><br><span> /* The dyn TS want to activate PDCH mode, ACK that. */</span><br><span> var RslChannelNr chan_nr;</span><br><span> chan_nr := valueof(t_RslChanNr_PDCH(2));</span><br><span style="color: hsl(0, 100%, 40%);">- f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr, ?));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr));</span><br><span> f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, 2342));</span><br><span> </span><br><span> f_sleep(1.0);</span><br><span>@@ -7559,7 +7559,7 @@</span><br><span> log("TCH/F_TCH/H_SDCCH8_PDCH pchan starts out in disabled mode:");</span><br><span> f_ts_dyn_mode_assert(0, 0, pdch_chan_nr.tn, NONE_MODE);</span><br><span> /* The BSC will activate the dynamic PDCH by default, so confirm that */</span><br><span style="color: hsl(0, 100%, 40%);">- rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr, ?));</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr));</span><br><span> </span><br><span> f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(pdch_chan_nr, 2342));</span><br><span> f_sleep(1.0);</span><br><span>@@ -7597,7 +7597,7 @@</span><br><span> f_exp_chan_rel_and_clear(dt, 0);</span><br><span> </span><br><span> /* The BSC will switch the TS back to PDCH once the only lchan using it is released: */</span><br><span style="color: hsl(0, 100%, 40%);">- rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr, ?));</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr));</span><br><span> f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(pdch_chan_nr, 2342));</span><br><span> f_sleep(1.0);</span><br><span> f_ts_dyn_mode_assert(0, 0, pdch_chan_nr.tn, PDCH_MODE);</span><br><span>@@ -7629,7 +7629,7 @@</span><br><span> log("TCH/F_TCH/H_SDCCH8_PDCH pchan starts out in disabled mode:");</span><br><span> f_ts_dyn_mode_assert(0, 0, pdch_chan_nr.tn, NONE_MODE);</span><br><span> /* The BSC will activate the dynamic PDCH by default, so confirm that */</span><br><span style="color: hsl(0, 100%, 40%);">- rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr, ?));</span><br><span style="color: hsl(120, 100%, 40%);">+ rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr));</span><br><span> </span><br><span> f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(pdch_chan_nr, 2342));</span><br><span> f_sleep(1.0);</span><br><span>@@ -7662,7 +7662,7 @@</span><br><span> /* FIXME? Currently the TS stays in state BORKEN: */</span><br><span> </span><br><span> /* The BSC will switch the TS back to PDCH once the only lchan using it is released: */</span><br><span style="color: hsl(0, 100%, 40%);">- /* rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr, ?));</span><br><span style="color: hsl(120, 100%, 40%);">+ /* rsl_unused := f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(pdch_chan_nr));</span><br><span> * f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(pdch_chan_nr, 2342));</span><br><span> * f_sleep(1.0);</span><br><span> * f_ts_dyn_mode_assert(0, 0, pdch_chan_nr.tn, PDCH_MODE)</span><br><span>@@ -10319,7 +10319,7 @@</span><br><span> </span><br><span> var RslChannelNr chan_nr := valueof(t_RslChanNr_PDCH(6));</span><br><span> /* The BSC will activate the dynamic PDCH by default, so confirm that */</span><br><span style="color: hsl(0, 100%, 40%);">- f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr, ?));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr));</span><br><span> f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, 2323));</span><br><span> </span><br><span> /* clean up timeslot 6 config, will only take effect when the OML drops the next time */</span><br><span>@@ -10391,7 +10391,7 @@</span><br><span> </span><br><span> var RslChannelNr chan_nr := valueof(t_RslChanNr_PDCH(6));</span><br><span> /* The BSC will activate the dynamic PDCH by default, so confirm that */</span><br><span style="color: hsl(0, 100%, 40%);">- f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr, ?));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr));</span><br><span> f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, 2323));</span><br><span> </span><br><span> /* clean up timeslot 6 config, will only take effect when the OML drops the next time */</span><br><span>@@ -10723,7 +10723,7 @@</span><br><span> /* The dyn TS wants to activate PDCH mode, ACK that. */</span><br><span> var RslChannelNr chan_nr;</span><br><span> chan_nr := valueof(t_RslChanNr_PDCH(2));</span><br><span style="color: hsl(0, 100%, 40%);">- f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr, ?));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr));</span><br><span> f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, 2342));</span><br><span> </span><br><span> /* Exhaust all dedicated SDCCH lchans.</span><br><span>@@ -10781,7 +10781,7 @@</span><br><span> </span><br><span> /* All SDCCH on the dyn TS are released, the dyn TS wants to activate PDCH again */</span><br><span> chan_nr := valueof(t_RslChanNr_PDCH(2));</span><br><span style="color: hsl(0, 100%, 40%);">- f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr, ?));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_exp_ipa_rx(0, tr_RSL_CHAN_ACT_PDCH(chan_nr));</span><br><span> f_ipa_tx(0, ts_RSL_CHAN_ACT_ACK(chan_nr, 2342));</span><br><span> </span><br><span> /* Now all channels are occupied except the dyn TS, so expecting only the static counters to increment */</span><br><span>diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn</span><br><span>index 70fb398..ccd43e6 100644</span><br><span>--- a/library/RSL_Types.ttcn</span><br><span>+++ b/library/RSL_Types.ttcn</span><br><span>@@ -318,7 +318,7 @@</span><br><span> }</span><br><span> </span><br><span> /* osmocom-style dynamic PDCH */</span><br><span style="color: hsl(0, 100%, 40%);">- const RSL_IE_ActivationType t_RSL_IE_ActType_PDCH := {</span><br><span style="color: hsl(120, 100%, 40%);">+ const RSL_IE_ActivationType c_RSL_IE_ActType_PDCH := {</span><br><span> reactivation := false,</span><br><span> reserved := 1,</span><br><span> a_bits := ACT_REL_TO_OSMO_PDCH</span><br><span>@@ -1400,13 +1400,23 @@</span><br><span> *</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- template RSL_Message tr_RSL_CHAN_ACT_PDCH(template RslChannelNr chan_nr,</span><br><span style="color: hsl(0, 100%, 40%);">- template RSL_IE_ChannelMode mode) := {</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) RSL_Message</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_RSL_CHAN_ACT_PDCH(template (value) RslChannelNr chan_nr) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_disc := ts_RSL_MsgDisc(RSL_MDISC_DCHAN, false),</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_type := RSL_MT_CHAN_ACTIV,</span><br><span style="color: hsl(120, 100%, 40%);">+ ies :={</span><br><span style="color: hsl(120, 100%, 40%);">+ t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr}),</span><br><span style="color: hsl(120, 100%, 40%);">+ t_RSL_IE(RSL_IE_ACT_TYPE, RSL_IE_Body:{act_type := c_RSL_IE_ActType_PDCH})</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%);">+ template RSL_Message</span><br><span style="color: hsl(120, 100%, 40%);">+ tr_RSL_CHAN_ACT_PDCH(template (present) RslChannelNr chan_nr) := {</span><br><span> msg_disc := tr_RSL_MsgDisc(RSL_MDISC_DCHAN, false),</span><br><span> msg_type := RSL_MT_CHAN_ACTIV,</span><br><span> ies :={</span><br><span> tr_RSL_IE(RSL_IE_Body:{chan_nr := chan_nr}),</span><br><span style="color: hsl(0, 100%, 40%);">- tr_RSL_IE(RSL_IE_Body:{act_type := t_RSL_IE_ActType_PDCH}),</span><br><span style="color: hsl(120, 100%, 40%);">+ tr_RSL_IE(RSL_IE_Body:{act_type := c_RSL_IE_ActType_PDCH}),</span><br><span> /* lots of optional IEs */</span><br><span> *</span><br><span> }</span><br><span>@@ -2320,14 +2330,16 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- template (value) RSL_Message ts_RSL_IPA_PDCH_ACT(RslChannelNr chan_nr) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) RSL_Message</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_RSL_IPA_PDCH_ACT(template (value) RslChannelNr chan_nr) := {</span><br><span> msg_disc := ts_RSL_MsgDisc(RSL_MDISC_DCHAN, false),</span><br><span> msg_type := RSL_MT_IPAC_PDCH_ACT,</span><br><span> ies := {</span><br><span> t_RSL_IE(RSL_IE_CHAN_NR, RSL_IE_Body:{chan_nr := chan_nr})</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- template RSL_Message tr_RSL_IPA_PDCH_ACT(template RslChannelNr chan_nr) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ template RSL_Message</span><br><span style="color: hsl(120, 100%, 40%);">+ tr_RSL_IPA_PDCH_ACT(template (present) RslChannelNr chan_nr) := {</span><br><span> msg_disc := ts_RSL_MsgDisc(RSL_MDISC_DCHAN, false),</span><br><span> msg_type := RSL_MT_IPAC_PDCH_ACT,</span><br><span> ies := {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26194">change 26194</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/+/26194"/><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: Ie62a92daaacf4de5f05dd1f3f5b4a2a5e4ee6dd6 </div>
<div style="display:none"> Gerrit-Change-Number: 26194 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>