<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9526">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bts: More complete AGCH / IMM.ASS testing<br><br>The existing test simply sent 1000 messages via RSL without checking<br>what actually arrived on the radio interface, or without<br>expecting/counting any RSL DELETE IND.<br><br>Let's fix this by introducing test sending IMM.ASS at three different<br>rates, with related expectations in terms of nubmer of IMM.ASS arriving<br>on Um vs. RSL DELETE IND arriving at BSC.<br><br>Change-Id: Ib6043b76ba1d7aaff107bb612f63b5a747d8720c<br>Related: OS#2990<br>Related: SYS#2695<br>---<br>M bts/BTS_Tests.ttcn<br>M library/GSM_RR_Types.ttcn<br>M library/RSL_Types.ttcn<br>3 files changed, 144 insertions(+), 8 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 25ee3a2..5f71538 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -1769,20 +1769,102 @@</span><br><span> /***********************************************************************</span><br><span> * Immediate Assignment / AGCH</span><br><span> ***********************************************************************/</span><br><span style="color: hsl(120, 100%, 40%);">+const MobileAllocation c_MA_null := {</span><br><span style="color: hsl(120, 100%, 40%);">+ len := 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ ma := ''B</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-testcase TC_imm_ass() runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) ChannelDescription ts_ChanDesc(template (value) RslChannelNr chan_nr, uint3_t tsc := 7,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint12_t arfcn := 871) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ chan_nr := chan_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ tsc := tsc,</span><br><span style="color: hsl(120, 100%, 40%);">+ h := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ arfcn := arfcn,</span><br><span style="color: hsl(120, 100%, 40%);">+ maio_hsn := omit</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%);">+private function f_fmt_ia_stats(integer num_tx, integer num_rx, integer num_del) return charstring {</span><br><span style="color: hsl(120, 100%, 40%);">+ return int2str(num_tx) & " sent, "</span><br><span style="color: hsl(120, 100%, 40%);">+ & int2str(num_rx) & " received, "</span><br><span style="color: hsl(120, 100%, 40%);">+ & int2str(num_del) & " deleted";</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%);">+private function f_TC_imm_ass(integer num_total, float sleep_s, float exp_pass) runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var L1ctlDlMessage l1_dl;</span><br><span style="color: hsl(120, 100%, 40%);">+ timer T := 10.0;</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer num_tx := 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer num_rx := 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer num_del := 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ var charstring res_str;</span><br><span style="color: hsl(120, 100%, 40%);">+ var float rx_ratio;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> f_init(testcasename());</span><br><span style="color: hsl(0, 100%, 40%);">- for (var integer i := 0; i < 1000; i := i+1) {</span><br><span style="color: hsl(0, 100%, 40%);">- var octetstring ia_enc := f_rnd_octstring(8);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init_l1ctl();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_l1_tune(L1CTL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (var integer i := 0; i < num_total; i := i+1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ var ChannelDescription ch_desc := valueof(ts_ChanDesc(valueof(t_RslChanNr_SDCCH4(0, 0))));</span><br><span style="color: hsl(120, 100%, 40%);">+ var GsmRrMessage ia := valueof(ts_IMM_ASS(42, i, 5, ch_desc, c_MA_null));</span><br><span style="color: hsl(120, 100%, 40%);">+ var octetstring ia_enc := enc_GsmRrMessage(ia);</span><br><span> RSL_CCHAN.send(ts_RSL_UD(ts_RSL_IMM_ASSIGN(ia_enc, 0)));</span><br><span style="color: hsl(0, 100%, 40%);">- f_sleep(0.02);</span><br><span style="color: hsl(120, 100%, 40%);">+ num_tx := num_tx+1;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sleep(sleep_s);</span><br><span> }</span><br><span> /* FIXME: check if imm.ass arrive on Um side */</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: check for DELETE INDICATION */</span><br><span style="color: hsl(0, 100%, 40%);">- f_sleep(100.0);</span><br><span style="color: hsl(0, 100%, 40%);">- f_shutdown();</span><br><span style="color: hsl(120, 100%, 40%);">+ T.start;</span><br><span style="color: hsl(120, 100%, 40%);">+ alt {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_DELETE_IND(?, 0))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ num_del := num_del+1;</span><br><span style="color: hsl(120, 100%, 40%);">+ repeat;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL_CCHAN.receive {</span><br><span style="color: hsl(120, 100%, 40%);">+ repeat;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] L1CTL.receive(tr_L1CTL_DATA_IND(t_RslChanNr_PCH_AGCH(0), ?)) -> value l1_dl {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* somehow dec_SystemInformation will try to decode even non-RR as SI */</span><br><span style="color: hsl(120, 100%, 40%);">+ var GsmRrMessage rr := dec_GsmRrMessage(l1_dl.payload.data_ind.payload);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (not match(rr, tr_IMM_ASS(42, ?, 5, ?, ?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: Why are we seeing paging requests on PCH/AGCH? */</span><br><span style="color: hsl(120, 100%, 40%);">+ //setverdict(fail, "Unexpected IMM-ASS values on AGCH: ", rr);</span><br><span style="color: hsl(120, 100%, 40%);">+ //self.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ num_rx := num_rx+1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ repeat;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] L1CTL.receive { repeat; }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] T.timeout { }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ res_str := f_fmt_ia_stats(num_tx, num_rx, num_del);</span><br><span style="color: hsl(120, 100%, 40%);">+ log("AGCH test: " & res_str);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (num_rx + num_del != num_tx) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "RX + DEL != TX ?!?: " & res_str);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ rx_ratio := int2float(num_rx) / int2float(num_tx);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rx_ratio < exp_pass*0.8 or rx_ratio > exp_pass*1.2) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "RX ratio ("&float2str(rx_ratio)&") far from expected ("&float2str(exp_pass)&") " & res_str);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(pass);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* send a long burst of 1000 IMM.ASS with 20ms spacing (50 per s); expect 75% of them to be deleted */</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_imm_ass_1000_20ms() runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_TC_imm_ass(1000, 0.02, 0.25);</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%);">+/* send a short burst of 200 IMM.ASS without any spacing; expect 95% of them to be deleted */</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_imm_ass_200_0ms() runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_TC_imm_ass(200, 0.0, 0.05);</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%);">+/* send 150 IMM.ASS at rate of 13/s; expect none of them to be deleted */</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_imm_ass_200_76ms() runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_TC_imm_ass(150, 0.076, 1.00);</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 style="color: hsl(120, 100%, 40%);">+</span><br><span> /***********************************************************************</span><br><span> * BCCH</span><br><span> ***********************************************************************/</span><br><span>diff --git a/library/GSM_RR_Types.ttcn b/library/GSM_RR_Types.ttcn</span><br><span>index 2ceb1f8..ef209e4 100644</span><br><span>--- a/library/GSM_RR_Types.ttcn</span><br><span>+++ b/library/GSM_RR_Types.ttcn</span><br><span>@@ -357,6 +357,26 @@</span><br><span> req_ref.t3 := fn mod 51;</span><br><span> return req_ref</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ function tr_compute_ReqRef(template uint8_t ra, template GsmFrameNumber fn)</span><br><span style="color: hsl(120, 100%, 40%);">+ return template RequestReference {</span><br><span style="color: hsl(120, 100%, 40%);">+ var template RequestReference req_ref;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (istemplatekind(ra, "?")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ req_ref.ra := ?;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ req_ref.ra := int2bit(valueof(ra), 8);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (istemplatekind(fn, "?")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ req_ref.t1p := ?;</span><br><span style="color: hsl(120, 100%, 40%);">+ req_ref.t2 := ?;</span><br><span style="color: hsl(120, 100%, 40%);">+ req_ref.t3 := ?;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ var GsmFrameNumber fn_v := valueof(fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ req_ref.t1p := (fn_v / 1326) mod 32;</span><br><span style="color: hsl(120, 100%, 40%);">+ req_ref.t2 := fn_v mod 26;</span><br><span style="color: hsl(120, 100%, 40%);">+ req_ref.t3 := fn_v mod 51;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return req_ref;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* 10.5.2.40 */</span><br><span> type integer TimingAdvance (0..219);</span><br><span>@@ -674,7 +694,7 @@</span><br><span> with { extension "prototype(convert) decode(RAW)" };</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- template GsmRrMessage ts_IMM_ASS(uint8_t ra, GsmFrameNumber fn, TimingAdvance ta,</span><br><span style="color: hsl(120, 100%, 40%);">+ template (value) GsmRrMessage ts_IMM_ASS(uint8_t ra, GsmFrameNumber fn, TimingAdvance ta,</span><br><span> ChannelDescription ch_desc, MobileAllocation ma) := {</span><br><span> header := t_RrHeader(IMMEDIATE_ASSIGNMENT, 0),</span><br><span> payload := {</span><br><span>@@ -696,6 +716,31 @@</span><br><span> }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ template GsmRrMessage tr_IMM_ASS(template uint8_t ra := ?, template GsmFrameNumber fn := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template TimingAdvance ta := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template ChannelDescription ch_desc := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+ template MobileAllocation ma := ?) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ header := t_RrHeader(IMMEDIATE_ASSIGNMENT, 0),</span><br><span style="color: hsl(120, 100%, 40%);">+ payload := {</span><br><span style="color: hsl(120, 100%, 40%);">+ imm_ass := {</span><br><span style="color: hsl(120, 100%, 40%);">+ ded_or_tbf := {</span><br><span style="color: hsl(120, 100%, 40%);">+ spare := '0'B,</span><br><span style="color: hsl(120, 100%, 40%);">+ tma := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ downlink := false,</span><br><span style="color: hsl(120, 100%, 40%);">+ tbf := false</span><br><span style="color: hsl(120, 100%, 40%);">+ },</span><br><span style="color: hsl(120, 100%, 40%);">+ page_mode := PAGE_MODE_NORMAL,</span><br><span style="color: hsl(120, 100%, 40%);">+ chan_desc := ch_desc,</span><br><span style="color: hsl(120, 100%, 40%);">+ pkt_chan_desc := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ req_ref := tr_compute_ReqRef(ra, fn),</span><br><span style="color: hsl(120, 100%, 40%);">+ timing_advance := ta,</span><br><span style="color: hsl(120, 100%, 40%);">+ mobile_allocation := ma,</span><br><span style="color: hsl(120, 100%, 40%);">+ rest_octets := *</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 style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> template (value) GsmRrL3Message ts_MEAS_REP(boolean valid, uint6_t rxl_f, uint6_t rxl_s,</span><br><span> uint3_t rxq_f, uint3_t rxq_s,</span><br><span> template (omit) NcellReports reps) := {</span><br><span>diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn</span><br><span>index b81bbbd..3804d40 100644</span><br><span>--- a/library/RSL_Types.ttcn</span><br><span>+++ b/library/RSL_Types.ttcn</span><br><span>@@ -1394,6 +1394,15 @@</span><br><span> t_RSL_IE(RSL_IE_FULL_IMM_ASS_INFO, RSL_IE_Body:{full_imm_ass_info := ts_RSL_LV(imm_ass)})</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ template RSL_Message tr_RSL_DELETE_IND(template octetstring imm_ass := ?, template uint3_t tn) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_disc := tr_RSL_MsgDisc(RSL_MDISC_CCHAN, false),</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_type := RSL_MT_DELETE_IND,</span><br><span style="color: hsl(120, 100%, 40%);">+ ies := {</span><br><span style="color: hsl(120, 100%, 40%);">+ tr_RSL_IE(RSL_IE_Body:{chan_nr := t_RslChanNr_PCH_AGCH(tn)}),</span><br><span style="color: hsl(120, 100%, 40%);">+ tr_RSL_IE(RSL_IE_Body:{full_imm_ass_info := tr_RSL_LV(imm_ass)}),</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> </span><br><span> /* 8.5.5 BSC -> BTS */</span><br><span> template RSL_Message tr_RSL_PAGING_CMD(template octetstring identity, template uint3_t tn := ?) := {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9526">change 9526</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/9526"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib6043b76ba1d7aaff107bb612f63b5a747d8720c </div>
<div style="display:none"> Gerrit-Change-Number: 9526 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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>