<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20884">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BTS_Tests/DTX: get rid of f_g_chan_is_{tchf,tchh,sdcch4,sdcch8}<br><br>TTCN-3 offers templates and pattern matching, so no need to match<br>against all possible variants of the RSL channel number.<br><br>Change-Id: I104595c4a96617f8000f803d19a890cff0b02744<br>Related: OS#4801<br>---<br>M bts/BTS_Tests.ttcn<br>1 file changed, 14 insertions(+), 44 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 9935014..fa6ca0c 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -6705,35 +6705,6 @@</span><br><span> /***********************************************************************</span><br><span> * DTX Related (see GSM 05.08, section 8.3)</span><br><span> ***********************************************************************/</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* XXX These functions must be kept in sync with g_AllChannels defined on test_CT. */</span><br><span style="color: hsl(0, 100%, 40%);">-private function f_g_chan_is_tchf() runs on ConnHdlr return boolean {</span><br><span style="color: hsl(0, 100%, 40%);">- return (g_chan_nr == valueof(ts_RslChanNr_Bm(1)) or</span><br><span style="color: hsl(0, 100%, 40%);">- g_chan_nr == valueof(ts_RslChanNr_Bm(2)) or</span><br><span style="color: hsl(0, 100%, 40%);">- g_chan_nr == valueof(ts_RslChanNr_Bm(3)) or</span><br><span style="color: hsl(0, 100%, 40%);">- g_chan_nr == valueof(ts_RslChanNr_Bm(4)));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-private function f_g_chan_is_tchh() runs on ConnHdlr return boolean {</span><br><span style="color: hsl(0, 100%, 40%);">- return (g_chan_nr == valueof(ts_RslChanNr_Lm(5,0)) or</span><br><span style="color: hsl(0, 100%, 40%);">- g_chan_nr == valueof(ts_RslChanNr_Lm(5,1)));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-private function f_g_chan_is_sdcch4() runs on ConnHdlr return boolean {</span><br><span style="color: hsl(0, 100%, 40%);">- return (g_chan_nr == valueof(ts_RslChanNr_SDCCH4(0,0)) or</span><br><span style="color: hsl(0, 100%, 40%);">- g_chan_nr == valueof(ts_RslChanNr_SDCCH4(0,1)) or</span><br><span style="color: hsl(0, 100%, 40%);">- g_chan_nr == valueof(ts_RslChanNr_SDCCH4(0,2)) or</span><br><span style="color: hsl(0, 100%, 40%);">- g_chan_nr == valueof(ts_RslChanNr_SDCCH4(0,3)));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-private function f_g_chan_is_sdcch8() runs on ConnHdlr return boolean {</span><br><span style="color: hsl(0, 100%, 40%);">- return (g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,0)) or</span><br><span style="color: hsl(0, 100%, 40%);">- g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,1)) or</span><br><span style="color: hsl(0, 100%, 40%);">- g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,2)) or</span><br><span style="color: hsl(0, 100%, 40%);">- g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,3)) or</span><br><span style="color: hsl(0, 100%, 40%);">- g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,4)) or</span><br><span style="color: hsl(0, 100%, 40%);">- g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,5)) or</span><br><span style="color: hsl(0, 100%, 40%);">- g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,6)) or</span><br><span style="color: hsl(0, 100%, 40%);">- g_chan_nr == valueof(ts_RslChanNr_SDCCH8(6,7)));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> private function f_test_l2_fill_frames(boolean dtxd) runs on ConnHdlr {</span><br><span> var L1ctlDlMessage dl;</span><br><span> var octetstring l2_fill_frame := '0303012B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B'O;</span><br><span>@@ -6780,7 +6751,7 @@</span><br><span> }</span><br><span> </span><br><span> if (dtxd) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (not f_g_chan_is_tchf()) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not match(g_chan_nr, t_RslChanNr_Bm(?))) {</span><br><span> T.stop;</span><br><span> f_rsl_chan_deact();</span><br><span> f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr);</span><br><span>@@ -6832,20 +6803,19 @@</span><br><span> }</span><br><span> if (fn > first_fn + frame_dtx_tchf_mod) {</span><br><span> T.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- if (f_g_chan_is_tchf()) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Without DTX we can expect 25 fill frames for every 104 frames.</span><br><span style="color: hsl(0, 100%, 40%);">- * (24 FACCH + 1 SACCH filling) */</span><br><span style="color: hsl(0, 100%, 40%);">- expected_fill_frames := 25;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (f_g_chan_is_tchh()) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* We can expect 2 fill frames for every 104 frames. */</span><br><span style="color: hsl(0, 100%, 40%);">- expected_fill_frames := 2;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (f_g_chan_is_sdcch4() or f_g_chan_is_sdcch8()) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* We can expect 5 fill frames for every 104 frames. */</span><br><span style="color: hsl(0, 100%, 40%);">- expected_fill_frames := 5;</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- f_rsl_chan_deact();</span><br><span style="color: hsl(0, 100%, 40%);">- f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr);</span><br><span style="color: hsl(0, 100%, 40%);">- Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unknown channel type");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ select (g_chan_nr) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TCH/F: we expect 25 fill frames (24 FACCH + 1 SACCH) for every 104 frames. */</span><br><span style="color: hsl(120, 100%, 40%);">+ case (t_RslChanNr_Bm(?)) { expected_fill_frames := 25; }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TCH/H: we expect 2 fill frames for every 104 frames. */</span><br><span style="color: hsl(120, 100%, 40%);">+ case (t_RslChanNr_Lm(?, ?)) { expected_fill_frames := 2; }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* SDCCH: we expect 5 fill frames for every 104 frames. */</span><br><span style="color: hsl(120, 100%, 40%);">+ case (t_RslChanNr_SDCCH4(?, ?)) { expected_fill_frames := 5; }</span><br><span style="color: hsl(120, 100%, 40%);">+ case (t_RslChanNr_SDCCH8(?, ?)) { expected_fill_frames := 5; }</span><br><span style="color: hsl(120, 100%, 40%);">+ case else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* This shall not happen, just to be sure */</span><br><span style="color: hsl(120, 100%, 40%);">+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> f_rsl_chan_deact();</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/20884">change 20884</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/+/20884"/><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: I104595c4a96617f8000f803d19a890cff0b02744 </div>
<div style="display:none"> Gerrit-Change-Number: 20884 </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>