<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14343">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts: Also test SACCH in TC_segm_concat<br><br>Change-Id: If9b51b4d6c357aa015f31e1e6851d4d1bb71a58f<br>---<br>M bts/BTS_Tests_LAPDm.ttcn<br>1 file changed, 46 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bts/BTS_Tests_LAPDm.ttcn b/bts/BTS_Tests_LAPDm.ttcn</span><br><span>index 2738477..07b785e 100644</span><br><span>--- a/bts/BTS_Tests_LAPDm.ttcn</span><br><span>+++ b/bts/BTS_Tests_LAPDm.ttcn</span><br><span>@@ -503,9 +503,13 @@</span><br><span> private altstep as_lapdm_acch() runs on ConnHdlr {</span><br><span> [] LAPDM.receive(t_PH_DATA(0, true, ?)) { repeat; }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+/* ignore all DCCH frames */</span><br><span style="color: hsl(120, 100%, 40%);">+private altstep as_lapdm_dcch() runs on ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] LAPDM.receive(t_PH_DATA(0, false, ?)) { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> /* ignore all LAPDm idle frames (UI) */</span><br><span> private altstep as_lapdm_idle() runs on ConnHdlr {</span><br><span style="color: hsl(0, 100%, 40%);">- [] LAPDM.receive(t_PH_DATA(0, false, tr_LAPDm_UI(0, ?, ''O))) { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] LAPDM.receive(t_PH_DATA(0, ?, tr_LAPDm_UI(?, ?, ''O))) { repeat; }</span><br><span> }</span><br><span> /* ignore all measurement reports */</span><br><span> private altstep as_rsl_meas_rep() runs on ConnHdlr {</span><br><span>@@ -519,8 +523,9 @@</span><br><span> }</span><br><span> }</span><br><span> /* all of the above */</span><br><span style="color: hsl(0, 100%, 40%);">-private altstep as_ignore_background() runs on ConnHdlr {</span><br><span style="color: hsl(0, 100%, 40%);">- [] as_lapdm_acch();</span><br><span style="color: hsl(120, 100%, 40%);">+private altstep as_ignore_background(boolean want_dcch := true) runs on ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ [want_dcch] as_lapdm_acch();</span><br><span style="color: hsl(120, 100%, 40%);">+ [not want_dcch] as_lapdm_dcch();</span><br><span> [] as_lapdm_idle();</span><br><span> [] as_rsl_meas_rep();</span><br><span> [] as_rsl_fail_err();</span><br><span>@@ -751,7 +756,7 @@</span><br><span> alt {</span><br><span> [] LAPDM.receive(t_PH_DATA(0, is_sacch, tr_LAPDm_RR(link_id.sapi, c_r:=cr_MT_RSP,</span><br><span> p:=false, nr:=(dls.v_s) mod 8)));</span><br><span style="color: hsl(0, 100%, 40%);">- [] as_ignore_background();</span><br><span style="color: hsl(120, 100%, 40%);">+ [] as_ignore_background(not is_sacch);</span><br><span> [] LAPDM.receive(t_PH_DATA(0, is_sacch, ?)) -> value pd {</span><br><span> setverdict(fail, "received unexpected LAPDm ", pd);</span><br><span> repeat;</span><br><span>@@ -781,28 +786,38 @@</span><br><span> /* Section 5.8.5 of TS 04.06 */</span><br><span> const integer c_TS0406_MAX_L3_OCTETS := 251;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private function f_TC_segm_concat(charstring id) runs on ConnHdlr {</span><br><span style="color: hsl(0, 100%, 40%);">- const integer sapi := 0;</span><br><span style="color: hsl(0, 100%, 40%);">- var RslLinkId link_id := valueof(ts_RslLinkID_DCCH(sapi));</span><br><span style="color: hsl(120, 100%, 40%);">+/* test segmentation and de-segmentation (concatenation) of a large message in uplink</span><br><span style="color: hsl(120, 100%, 40%);">+ * on specified SAPI/channel */</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_TC_segm_concat(charstring id, RslLinkId link_id) runs on ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer sapi := link_id.sapi;</span><br><span style="color: hsl(120, 100%, 40%);">+ var boolean is_sacch := false;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (link_id.c == SACCH) {</span><br><span style="color: hsl(120, 100%, 40%);">+ is_sacch := true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> var default d;</span><br><span> timer T := 3.0;</span><br><span> </span><br><span> fp_common_init();</span><br><span> </span><br><span> /* some common altstep for meas res and other background noise */</span><br><span style="color: hsl(0, 100%, 40%);">- d := activate(as_ignore_background());</span><br><span style="color: hsl(120, 100%, 40%);">+ d := activate(as_ignore_background(not is_sacch));</span><br><span> RSL.clear;</span><br><span> LAPDM.clear;</span><br><span> </span><br><span> var octetstring l3_mo := f_rnd_octstring(5);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* 1) The BTS is brought into the multiple frame established state */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* MO Establish Request via LADPm: SAPI = 0, C = 0, P = 1, M = 0, 0 ≤ L ≤ N201.. */</span><br><span style="color: hsl(0, 100%, 40%);">- LAPDM.send(t_PH_DATA(0, false, ts_LAPDm_SABM(sapi, c_r:=cr_MO_CMD, p:=true, l3:=l3_mo)));</span><br><span style="color: hsl(0, 100%, 40%);">- RSL.receive(tr_RSL_EST_IND(g_chan_nr, link_id, l3_mo));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (is_sacch) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* no payload permitted, as this is not contention resolution */</span><br><span style="color: hsl(120, 100%, 40%);">+ l3_mo := ''O;</span><br><span style="color: hsl(120, 100%, 40%);">+ LAPDM.send(t_PH_DATA(0, is_sacch, ts_LAPDm_SABM(sapi, c_r:=cr_MO_CMD, p:=true, l3:=l3_mo)));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL.receive(tr_RSL_EST_IND_NOL3(g_chan_nr, link_id));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ LAPDM.send(t_PH_DATA(0, is_sacch, ts_LAPDm_SABM(sapi, c_r:=cr_MO_CMD, p:=true, l3:=l3_mo)));</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL.receive(tr_RSL_EST_IND(g_chan_nr, link_id, l3_mo));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> /* UA: SAPI = 0, R = 0, F = 1, M = 0, L = L of SABM. */</span><br><span style="color: hsl(0, 100%, 40%);">- LAPDM.receive(t_PH_DATA(0, false, tr_LAPDm_UA(sapi, cr_MT_RSP, f:=true, l3:=l3_mo)));</span><br><span style="color: hsl(120, 100%, 40%);">+ LAPDM.receive(t_PH_DATA(0, is_sacch, tr_LAPDm_UA(sapi, cr_MT_RSP, f:=true, l3:=l3_mo)));</span><br><span> </span><br><span> l3_mo := f_rnd_octstring(c_TS0406_MAX_L3_OCTETS);</span><br><span> </span><br><span>@@ -813,10 +828,23 @@</span><br><span> </span><br><span> fp_common_fini();</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-testcase TC_segm_concat() runs on test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1), ts_RSL_ChanMode_SIGN));</span><br><span style="color: hsl(0, 100%, 40%);">- f_testmatrix_each_chan(pars, refers(f_TC_segm_concat));</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_TC_segm_concat_dcch(charstring id) runs on ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_TC_segm_concat(id, valueof(ts_RslLinkID_DCCH(0)));</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_TC_segm_concat_sacch(charstring id) runs on ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_TC_segm_concat(id, link_id :=valueof(ts_RslLinkID_SACCH(0)));</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+/* test mobile-originated segmentation/de-segmentation on DCCH */</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_segm_concat_dcch() runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1), ts_RSL_ChanMode_SIGN));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_testmatrix_each_chan(pars, refers(f_TC_segm_concat_dcch));</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+/* test mobile-originated segmentation/de-segmentation on SACCH */</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_segm_concat_sacch() runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var ConnHdlrPars pars := valueof(t_Pars(t_RslChanNr_Bm(1), ts_RSL_ChanMode_SIGN));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_testmatrix_each_chan(pars, refers(f_TC_segm_concat_sacch));</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> </span><br><span> </span><br><span> control {</span><br><span>@@ -833,7 +861,8 @@</span><br><span> execute(TC_establish_ign_first_sabm());</span><br><span> execute(TC_iframe_seq_and_ack());</span><br><span> execute(TC_iframe_timer_recovery());</span><br><span style="color: hsl(0, 100%, 40%);">- execute(TC_segm_concat());</span><br><span style="color: hsl(120, 100%, 40%);">+ execute(TC_segm_concat_dcch());</span><br><span style="color: hsl(120, 100%, 40%);">+ execute(TC_segm_concat_sacch());</span><br><span> }</span><br><span> </span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14343">change 14343</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/+/14343"/><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: If9b51b4d6c357aa015f31e1e6851d4d1bb71a58f </div>
<div style="display:none"> Gerrit-Change-Number: 14343 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-MessageType: merged </div>