<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11103">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: Account for elapsed time in paging timer<br><br>Previous implementation always waited for "interval" time until sending<br>next paging cmd, and didn't finish the test until all expected paging<br>cmds were sent. As a result, each time it triggered it accumulated some<br>delay which could go from 2 seconds to 12 seconds depending on machine<br>load.<br>As a consequence, the expected number of paging cmd messages to be sent<br>in 20 seconds was being sent in 22-32 seconds, hence changing the load<br>on osmo-bts and as a result changing the test results.<br><br>Low threshold needs to be adapted since now they are sent in exactly 20<br>seconds max and the load handled by osmo-bts is bigger.<br><br>Fixes: OS#3025<br>Change-Id: I9651136d6810420e0a4d887bfb11c913a24f0457<br>---<br>M bts/BTS_Tests.ttcn<br>1 file changed, 44 insertions(+), 21 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 aa402d1..809a403 100644</span><br><span>--- a/bts/BTS_Tests.ttcn</span><br><span>+++ b/bts/BTS_Tests.ttcn</span><br><span>@@ -1687,26 +1687,16 @@</span><br><span> }</span><br><span> var float pch_blocks_per_sec := max_pch_imsi_per_sec * cfg.load_factor;</span><br><span> var float interval := 1.0 / pch_blocks_per_sec;</span><br><span style="color: hsl(0, 100%, 40%);">- log("pch_blocks_per_sec=", pch_blocks_per_sec, " interval=", interval);</span><br><span style="color: hsl(120, 100%, 40%);">+ var float time_total := 20.0;</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer pkt_total := float2int(time_total * pch_blocks_per_sec);</span><br><span style="color: hsl(120, 100%, 40%);">+ log("pch_blocks_total=", pkt_total," pch_blocks_per_sec=", pch_blocks_per_sec, " interval=", interval);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for (var integer i := 0; i < float2int(20.0/interval); i := i+1) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* build mobile Identity */</span><br><span style="color: hsl(0, 100%, 40%);">- var MobileL3_CommonIE_Types.MobileIdentityLV mi;</span><br><span style="color: hsl(0, 100%, 40%);">- if (cfg.use_tmsi) {</span><br><span style="color: hsl(0, 100%, 40%);">- mi := valueof(ts_MI_TMSI_LV(f_rnd_octstring(4)));</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- mi := valueof(ts_MI_IMSI_LV(f_gen_imsi(i)));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- var octetstring mi_enc_lv := enc_MobileIdentityLV(mi);</span><br><span style="color: hsl(0, 100%, 40%);">- var octetstring mi_enc := substr(mi_enc_lv, 1, lengthof(mi_enc_lv)-1);</span><br><span style="color: hsl(120, 100%, 40%);">+ timer T_total := 300.0; /* big value (far bigger than time_total), used to count elapsed time */</span><br><span style="color: hsl(120, 100%, 40%);">+ T_total.start;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Send RSL PAGING COMMAND */</span><br><span style="color: hsl(0, 100%, 40%);">- RSL_CCHAN.send(ts_RSL_UD(ts_RSL_PAGING_CMD(mi_enc, i mod 4)));</span><br><span style="color: hsl(0, 100%, 40%);">- st.num_paging_sent := st.num_paging_sent + 1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Wait for interval to next PAGING COMMAND */</span><br><span style="color: hsl(0, 100%, 40%);">- timer T_itv := interval;</span><br><span style="color: hsl(0, 100%, 40%);">- T_itv.start;</span><br><span style="color: hsl(120, 100%, 40%);">+ timer T_itv := 0.0;</span><br><span style="color: hsl(120, 100%, 40%);">+ T_itv.start;</span><br><span style="color: hsl(120, 100%, 40%);">+ while (st.num_paging_sent < pkt_total) {</span><br><span> alt {</span><br><span> /* check for presence of CCCH LOAD IND (paging load) */</span><br><span> [cfg.exp_overload] RSL_CCHAN.receive(tr_RSL_UD(tr_RSL_PAGING_LOAD_IND(0))) {</span><br><span>@@ -1725,7 +1715,40 @@</span><br><span> /* check if paging requests arrive on Um side */</span><br><span> [] as_l1_count_paging(st.num_paging_rcv_msgs, st.num_paging_rcv_ids, cfg);</span><br><span> [] L1CTL.receive { repeat; }</span><br><span style="color: hsl(0, 100%, 40%);">- [] T_itv.timeout { }</span><br><span style="color: hsl(120, 100%, 40%);">+ [] T_itv.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Send paging cmds based on elapsed time */</span><br><span style="color: hsl(120, 100%, 40%);">+ var integer new_sent := f_min(pkt_total, float2int(T_total.read * pch_blocks_per_sec) + 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ while (st.num_paging_sent < new_sent) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* build mobile Identity */</span><br><span style="color: hsl(120, 100%, 40%);">+ var MobileL3_CommonIE_Types.MobileIdentityLV mi;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cfg.use_tmsi) {</span><br><span style="color: hsl(120, 100%, 40%);">+ mi := valueof(ts_MI_TMSI_LV(f_rnd_octstring(4)));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ mi := valueof(ts_MI_IMSI_LV(f_gen_imsi(st.num_paging_sent)));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ var octetstring mi_enc_lv := enc_MobileIdentityLV(mi);</span><br><span style="color: hsl(120, 100%, 40%);">+ var octetstring mi_enc := substr(mi_enc_lv, 1, lengthof(mi_enc_lv)-1);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Send RSL PAGING COMMAND */</span><br><span style="color: hsl(120, 100%, 40%);">+ RSL_CCHAN.send(ts_RSL_UD(ts_RSL_PAGING_CMD(mi_enc, st.num_paging_sent mod 4)));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ st.num_paging_sent := st.num_paging_sent + 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (st.num_paging_sent < pkt_total) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Wait for interval to next PAGING COMMAND */</span><br><span style="color: hsl(120, 100%, 40%);">+ var float time_now := T_total.read;</span><br><span style="color: hsl(120, 100%, 40%);">+ var float next_sched := int2float(st.num_paging_sent)*interval;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (next_sched > time_now) {</span><br><span style="color: hsl(120, 100%, 40%);">+ T_itv.start(next_sched - time_now);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ T_itv.start(0.0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* We are done, no need to keep counting */</span><br><span style="color: hsl(120, 100%, 40%);">+ T_total.stop;</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%);">+ [] T_total.timeout { }</span><br><span> [] as_rsl_res_ind();</span><br><span> }</span><br><span> }</span><br><span>@@ -1816,7 +1839,7 @@</span><br><span> var PagingTestState st := f_TC_paging(cfg);</span><br><span> /* We expect about 80-85% to pass, given that we can fill the paging buffer of 200</span><br><span> * slots and will fully drain that buffer before returning */</span><br><span style="color: hsl(0, 100%, 40%);">- var template integer tpl := (st.num_paging_sent*80/100 .. st.num_paging_sent *85/100);</span><br><span style="color: hsl(120, 100%, 40%);">+ var template integer tpl := (st.num_paging_sent*78/100 .. st.num_paging_sent *85/100);</span><br><span> if (not match(st.num_paging_rcv_ids, tpl)) {</span><br><span> setverdict(fail, "Expected ", tpl, " pagings but have ", st.num_paging_rcv_ids);</span><br><span> } else {</span><br><span>@@ -1842,7 +1865,7 @@</span><br><span> var PagingTestState st := f_TC_paging(cfg);</span><br><span> /* We expect about 70% to pass, given that we can fill the paging buffer of 200</span><br><span> * slots and will fully drain that buffer before returning */</span><br><span style="color: hsl(0, 100%, 40%);">- var template integer tpl := (st.num_paging_sent*66/100 .. st.num_paging_sent *72/100);</span><br><span style="color: hsl(120, 100%, 40%);">+ var template integer tpl := (st.num_paging_sent*64/100 .. st.num_paging_sent *72/100);</span><br><span> if (not match(st.num_paging_rcv_ids, tpl)) {</span><br><span> setverdict(fail, "Expected ", tpl, " pagings but have ", st.num_paging_rcv_ids);</span><br><span> } else {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11103">change 11103</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/11103"/><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: I9651136d6810420e0a4d887bfb11c913a24f0457 </div>
<div style="display:none"> Gerrit-Change-Number: 11103 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>