<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26422">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  fixeria: 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;">bsc: properly test assignment counters<br><br>Verify the BTS level assignment:attempted_speech / _sign as well as<br>assignment:completed_speech / _sign counters, in four selected<br>assignment tests (fr, hr, amr_f, amr_h).<br><br>Shows a bug where we counted a speech assignment as<br>assignment:completed_sign.<br><br>Related: SYS#4878<br>Depends: Ie9fcd1e86f27ecb2f11e2e8813faac365cb470b8 (osmo-bsc)<br>Change-Id: Icb1386ec2ccd70eb3c026301b9b08ad7177278f7<br>---<br>M bsc/BSC_Tests.ttcn<br>1 file changed, 63 insertions(+), 0 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 0c03bde..22df0cb 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -4153,16 +4153,57 @@</span><br><span>    f_establish_fully(ass_cmd, exp_fail);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+const CounterNameVals counternames_bsc_bts_assignment := {</span><br><span style="color: hsl(120, 100%, 40%);">+    { "assignment:attempted", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+      { "assignment:completed", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+      { "assignment:stopped", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+        { "assignment:no_channel", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+     { "assignment:timeout", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+        { "assignment:failed", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "assignment:error", 0 }</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%);">+const CounterNameVals counternames_bts_assignment := {</span><br><span style="color: hsl(120, 100%, 40%);">+     { "assignment:attempted_sign", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "assignment:attempted_speech", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+       { "assignment:completed_sign", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "assignment:completed_speech", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+       { "assignment:stopped_sign", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+   { "assignment:stopped_speech", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "assignment:no_channel_sign", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+        { "assignment:no_channel_speech", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+      { "assignment:timeout_sign", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+   { "assignment:timeout_speech", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "assignment:failed_sign", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+    { "assignment:failed_speech", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+  { "assignment:error_sign", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+     { "assignment:error_speech", 0 }</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%);">+function f_ctrs_bsc_and_bts_assignment_init(integer bts_count := NUM_BTS) runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var CounterNameVals bts_names := counternames_bsc_bts_assignment & counternames_bts_assignment;</span><br><span style="color: hsl(120, 100%, 40%);">+   f_ctrs_bts_init(bts_count, bts_names);</span><br><span style="color: hsl(120, 100%, 40%);">+        f_ctrs_bsc_init(counternames_bsc_bts_assignment);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> testcase TC_assignment_codec_fr() runs on test_CT {</span><br><span>        var TestHdlrParams pars := f_gen_test_hdlr_pars();</span><br><span>   var MSC_ConnHdlr vc_conn;</span><br><span> </span><br><span>        f_init(1, true);</span><br><span>     f_sleep(1.0);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_and_bts_assignment_init(1);</span><br><span> </span><br><span>   pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR}));</span><br><span>        vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars);</span><br><span>     vc_conn.done;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+       f_ctrs_bsc_and_bts_add(0, "assignment:attempted", 1);</span><br><span style="color: hsl(120, 100%, 40%);">+       f_ctrs_bts_add(0, "assignment:attempted_speech", 1);</span><br><span style="color: hsl(120, 100%, 40%);">+        f_ctrs_bsc_and_bts_add(0, "assignment:completed", 1);</span><br><span style="color: hsl(120, 100%, 40%);">+       f_ctrs_bts_add(0, "assignment:completed_speech", 1);</span><br><span style="color: hsl(120, 100%, 40%);">+        f_ctrs_bts_verify();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>       f_shutdown_helper();</span><br><span> }</span><br><span> </span><br><span>@@ -4172,10 +4213,18 @@</span><br><span> </span><br><span>  f_init(1, true);</span><br><span>     f_sleep(1.0);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_and_bts_assignment_init(1);</span><br><span> </span><br><span>   pars.ass_codec_list := valueof(ts_BSSMAP_IE_CodecList({ts_CodecHR}));</span><br><span>        vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars);</span><br><span>     vc_conn.done;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+       f_ctrs_bsc_and_bts_add(0, "assignment:attempted", 1);</span><br><span style="color: hsl(120, 100%, 40%);">+       f_ctrs_bts_add(0, "assignment:attempted_speech", 1);</span><br><span style="color: hsl(120, 100%, 40%);">+        f_ctrs_bsc_and_bts_add(0, "assignment:completed", 1);</span><br><span style="color: hsl(120, 100%, 40%);">+       f_ctrs_bts_add(0, "assignment:completed_speech", 1);</span><br><span style="color: hsl(120, 100%, 40%);">+        f_ctrs_bts_verify();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>       f_shutdown_helper();</span><br><span> }</span><br><span> </span><br><span>@@ -4258,10 +4307,17 @@</span><br><span>      f_init(1, true);</span><br><span>     f_sleep(1.0);</span><br><span>        f_vty_amr_start_mode_set(true, "1");</span><br><span style="color: hsl(120, 100%, 40%);">+        f_ctrs_bsc_and_bts_assignment_init(1);</span><br><span> </span><br><span>   vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars);</span><br><span>     vc_conn.done;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+     f_ctrs_bsc_and_bts_add(0, "assignment:attempted", 1);</span><br><span style="color: hsl(120, 100%, 40%);">+       f_ctrs_bts_add(0, "assignment:attempted_speech", 1);</span><br><span style="color: hsl(120, 100%, 40%);">+        f_ctrs_bsc_and_bts_add(0, "assignment:completed", 1);</span><br><span style="color: hsl(120, 100%, 40%);">+       f_ctrs_bts_add(0, "assignment:completed_speech", 1);</span><br><span style="color: hsl(120, 100%, 40%);">+        f_ctrs_bts_verify();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>       f_vty_amr_start_mode_restore(true);</span><br><span>  f_shutdown_helper();</span><br><span> }</span><br><span>@@ -4286,10 +4342,17 @@</span><br><span>  f_init(1, true);</span><br><span>     f_sleep(1.0);</span><br><span>        f_vty_amr_start_mode_set(false, "1");</span><br><span style="color: hsl(120, 100%, 40%);">+       f_ctrs_bsc_and_bts_assignment_init(1);</span><br><span> </span><br><span>   vc_conn := f_start_handler(refers(f_TC_assignment_codec), pars);</span><br><span>     vc_conn.done;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+     f_ctrs_bsc_and_bts_add(0, "assignment:attempted", 1);</span><br><span style="color: hsl(120, 100%, 40%);">+       f_ctrs_bts_add(0, "assignment:attempted_speech", 1);</span><br><span style="color: hsl(120, 100%, 40%);">+        f_ctrs_bsc_and_bts_add(0, "assignment:completed", 1);</span><br><span style="color: hsl(120, 100%, 40%);">+       f_ctrs_bts_add(0, "assignment:completed_speech", 1);</span><br><span style="color: hsl(120, 100%, 40%);">+        f_ctrs_bts_verify();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>       f_vty_amr_start_mode_restore(false);</span><br><span>         f_shutdown_helper();</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26422">change 26422</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/+/26422"/><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: Icb1386ec2ccd70eb3c026301b9b08ad7177278f7 </div>
<div style="display:none"> Gerrit-Change-Number: 26422 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@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: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>