<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26141">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
neels: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc: add testing of incoming_intra_bsc_ho rate_ctrs<br><br>Related: SYS#4878<br>Related: Id9f2c6e2865ebe680879018fff08d283ce24c983 (osmo-bsc)<br>Change-Id: Iba229313d73fa20266f6d4eac5820579fb14c604<br>---<br>M bsc/BSC_Tests.ttcn<br>1 file changed, 59 insertions(+), 22 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 6040a96..2fde8ae 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -170,6 +170,16 @@</span><br><span> { "interbsc_ho_in:error", 0 }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+const CounterNameVals counternames_bts_handover := {</span><br><span style="color: hsl(120, 100%, 40%);">+ { "incoming_intra_bsc_ho:attempted", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "incoming_intra_bsc_ho:completed", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "incoming_intra_bsc_ho:stopped", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "incoming_intra_bsc_ho:no_channel", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "incoming_intra_bsc_ho:timeout", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "incoming_intra_bsc_ho:failed", 0 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { "incoming_intra_bsc_ho:error", 0 }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Set of all System Information received during one RSL port's startup.</span><br><span> * Note that some System Information may be sent on RSL, but lacking actual SI data, to indicate that the BTS should not</span><br><span> * broadcast that SI type. That will be reflected as 'omit' here.</span><br><span>@@ -762,8 +772,19 @@</span><br><span> f_ctrs_bsc_init(counternames);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-private function f_ctrs_bsc_and_bts_add(integer bts_nr, charstring countername, integer val := 1) runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_ctrs_bsc_and_bts_handover_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_handover & counternames_bts_handover;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_ctr_bts := f_counter_name_vals_get_n(IPA_CTRL, "bts", bts_count, bts_names);</span><br><span style="color: hsl(120, 100%, 40%);">+ log("initial bts rate counters: ", g_ctr_bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_init(counternames_bsc_bts_handover);</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_ctrs_bts_add(integer bts_nr, charstring countername, integer val := 1) runs on test_CT {</span><br><span> f_counter_name_vals_list_add(g_ctr_bts, bts_nr, countername, val);</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_ctrs_bsc_and_bts_add(integer bts_nr, charstring countername, integer val := 1) runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bts_add(bts_nr, countername, val);</span><br><span> f_ctrs_bsc_add(countername, val);</span><br><span> }</span><br><span> </span><br><span>@@ -5156,7 +5177,7 @@</span><br><span> </span><br><span> pars.expect_tsc := BTS_TSC[0];</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_ctrs_bsc_and_bts_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_and_bts_handover_init();</span><br><span> </span><br><span> vc_conn := f_start_handler(refers(f_tc_ho_int), pars);</span><br><span> vc_conn.done;</span><br><span>@@ -5169,6 +5190,8 @@</span><br><span> f_ctrs_bsc_and_bts_add(0, "handover:completed");</span><br><span> f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:attempted");</span><br><span> f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:completed");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bts_add(1, "incoming_intra_bsc_ho:attempted");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bts_add(1, "incoming_intra_bsc_ho:completed");</span><br><span> f_ctrs_bsc_and_bts_verify();</span><br><span> f_shutdown_helper();</span><br><span> }</span><br><span>@@ -5182,7 +5205,7 @@</span><br><span> f_vty_encryption_a5(enc_a5);</span><br><span> f_sleep(1.0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_ctrs_bsc_and_bts_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_and_bts_handover_init();</span><br><span> </span><br><span> vc_conn := f_start_handler(refers(f_tc_ho_int), pars);</span><br><span> vc_conn.done;</span><br><span>@@ -5195,6 +5218,8 @@</span><br><span> f_ctrs_bsc_and_bts_add(0, "handover:completed");</span><br><span> f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:attempted");</span><br><span> f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:completed");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bts_add(1, "incoming_intra_bsc_ho:attempted");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bts_add(1, "incoming_intra_bsc_ho:completed");</span><br><span> f_ctrs_bsc_and_bts_verify();</span><br><span> f_vty_encryption_a5_reset();</span><br><span> f_shutdown_helper();</span><br><span>@@ -5302,7 +5327,7 @@</span><br><span> f_init(2, true);</span><br><span> f_sleep(1.0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_ctrs_bsc_and_bts_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_and_bts_handover_init();</span><br><span> </span><br><span> vc_conn := f_start_handler(refers(f_tc_ho_int_radio_link_failure));</span><br><span> vc_conn.done;</span><br><span>@@ -5315,6 +5340,8 @@</span><br><span> f_ctrs_bsc_and_bts_add(0, "handover:stopped");</span><br><span> f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:attempted");</span><br><span> f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:stopped");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bts_add(1, "incoming_intra_bsc_ho:attempted");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bts_add(1, "incoming_intra_bsc_ho:stopped");</span><br><span> f_ctrs_bsc_and_bts_verify();</span><br><span> f_shutdown_helper();</span><br><span> }</span><br><span>@@ -5422,7 +5449,7 @@</span><br><span> f_init(1, true);</span><br><span> f_sleep(1.0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_ctrs_bsc_and_bts_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_and_bts_handover_init();</span><br><span> </span><br><span> vc_conn := f_start_handler(refers(f_tc_ho_out_of_this_bsc));</span><br><span> vc_conn.done;</span><br><span>@@ -5505,7 +5532,7 @@</span><br><span> f_init(1, true);</span><br><span> f_sleep(1.0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_ctrs_bsc_and_bts_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_and_bts_handover_init();</span><br><span> </span><br><span> vc_conn := f_start_handler(refers(f_tc_ho_out_fail_no_msc_response));</span><br><span> vc_conn.done;</span><br><span>@@ -5586,7 +5613,7 @@</span><br><span> f_init(1, true);</span><br><span> f_sleep(1.0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_ctrs_bsc_and_bts_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_and_bts_handover_init();</span><br><span> </span><br><span> vc_conn := f_start_handler(refers(f_tc_ho_out_fail_rr_ho_failure));</span><br><span> vc_conn.done;</span><br><span>@@ -5686,7 +5713,7 @@</span><br><span> f_init(1, true);</span><br><span> f_sleep(1.0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_ctrs_bsc_and_bts_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_and_bts_handover_init();</span><br><span> </span><br><span> vc_conn := f_start_handler(refers(f_tc_ho_out_fail_no_result_after_ho_cmd));</span><br><span> vc_conn.done;</span><br><span>@@ -5803,7 +5830,7 @@</span><br><span> f_init(1, true);</span><br><span> f_sleep(1.0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_ctrs_bsc_and_bts_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_and_bts_handover_init();</span><br><span> </span><br><span> pars.sccp_addr_msc := g_bssap[0].sccp_addr_own;</span><br><span> pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer;</span><br><span>@@ -5905,7 +5932,7 @@</span><br><span> }</span><br><span> f_sleep(1.0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_ctrs_bsc_and_bts_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_and_bts_handover_init();</span><br><span> </span><br><span> pars.last_used_eutran_plmn := '323454'O;</span><br><span> pars.sccp_addr_msc := g_bssap[0].sccp_addr_own;</span><br><span>@@ -6012,7 +6039,7 @@</span><br><span> f_init(1, true);</span><br><span> f_sleep(1.0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_ctrs_bsc_and_bts_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_and_bts_handover_init();</span><br><span> </span><br><span> pars.sccp_addr_msc := g_bssap[0].sccp_addr_own;</span><br><span> pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer;</span><br><span>@@ -6102,7 +6129,7 @@</span><br><span> f_init(1, true);</span><br><span> f_sleep(1.0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_ctrs_bsc_and_bts_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_and_bts_handover_init();</span><br><span> </span><br><span> pars.sccp_addr_msc := g_bssap[0].sccp_addr_own;</span><br><span> pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer;</span><br><span>@@ -6191,7 +6218,7 @@</span><br><span> f_init(1, true);</span><br><span> f_sleep(1.0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_ctrs_bsc_and_bts_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_and_bts_handover_init();</span><br><span> </span><br><span> pars.sccp_addr_msc := g_bssap[0].sccp_addr_own;</span><br><span> pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer;</span><br><span>@@ -6272,7 +6299,7 @@</span><br><span> f_init(1, true);</span><br><span> f_sleep(1.0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_ctrs_bsc_and_bts_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_and_bts_handover_init();</span><br><span> </span><br><span> pars.sccp_addr_msc := g_bssap[0].sccp_addr_own;</span><br><span> pars.sccp_addr_bsc := g_bssap[0].sccp_addr_peer;</span><br><span>@@ -6482,7 +6509,7 @@</span><br><span> var MSC_ConnHdlr vc_conn;</span><br><span> f_init(3, true, guard_timeout := 60.0);</span><br><span> f_sleep(1.0);</span><br><span style="color: hsl(0, 100%, 40%);">- f_ctrs_bsc_and_bts_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_and_bts_handover_init();</span><br><span> vc_conn := f_start_handler(refers(f_tc_ho_neighbor_config_1));</span><br><span> vc_conn.done;</span><br><span> </span><br><span>@@ -6497,6 +6524,8 @@</span><br><span> f_ctrs_bsc_and_bts_add(0, "handover:failed");</span><br><span> f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:attempted");</span><br><span> f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:failed");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bts_add(1, "incoming_intra_bsc_ho:attempted");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bts_add(1, "incoming_intra_bsc_ho:failed");</span><br><span> </span><br><span> /* 1.b */</span><br><span> f_ctrs_bsc_and_bts_add(0, "handover:attempted");</span><br><span>@@ -6511,6 +6540,8 @@</span><br><span> f_ctrs_bsc_and_bts_add(0, "handover:failed");</span><br><span> f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:attempted");</span><br><span> f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:failed");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bts_add(1, "incoming_intra_bsc_ho:attempted");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bts_add(1, "incoming_intra_bsc_ho:failed");</span><br><span> </span><br><span> f_ctrs_bsc_and_bts_verify();</span><br><span> f_shutdown_helper();</span><br><span>@@ -6542,7 +6573,7 @@</span><br><span> var MSC_ConnHdlr vc_conn;</span><br><span> f_init(3, true, guard_timeout := 50.0);</span><br><span> f_sleep(1.0);</span><br><span style="color: hsl(0, 100%, 40%);">- f_ctrs_bsc_and_bts_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_and_bts_handover_init();</span><br><span> vc_conn := f_start_handler(refers(f_tc_ho_neighbor_config_2));</span><br><span> vc_conn.done;</span><br><span> </span><br><span>@@ -6557,6 +6588,8 @@</span><br><span> f_ctrs_bsc_and_bts_add(0, "handover:failed");</span><br><span> f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:attempted");</span><br><span> f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:failed");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bts_add(1, "incoming_intra_bsc_ho:attempted");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bts_add(1, "incoming_intra_bsc_ho:failed");</span><br><span> </span><br><span> /* 2.b */</span><br><span> f_ctrs_bsc_and_bts_add(0, "handover:attempted");</span><br><span>@@ -6591,7 +6624,7 @@</span><br><span> var MSC_ConnHdlr vc_conn;</span><br><span> f_init(3, true, guard_timeout := 50.0);</span><br><span> f_sleep(1.0);</span><br><span style="color: hsl(0, 100%, 40%);">- f_ctrs_bsc_and_bts_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_and_bts_handover_init();</span><br><span> vc_conn := f_start_handler(refers(f_tc_ho_neighbor_config_3));</span><br><span> vc_conn.done;</span><br><span> </span><br><span>@@ -6610,6 +6643,8 @@</span><br><span> f_ctrs_bsc_and_bts_add(0, "handover:failed");</span><br><span> f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:attempted");</span><br><span> f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:failed");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bts_add(2, "incoming_intra_bsc_ho:attempted");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bts_add(2, "incoming_intra_bsc_ho:failed");</span><br><span> </span><br><span> f_ctrs_bsc_and_bts_verify();</span><br><span> f_shutdown_helper();</span><br><span>@@ -6643,7 +6678,7 @@</span><br><span> var MSC_ConnHdlr vc_conn;</span><br><span> f_init(3, true, guard_timeout := 50.0);</span><br><span> f_sleep(1.0);</span><br><span style="color: hsl(0, 100%, 40%);">- f_ctrs_bsc_and_bts_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_and_bts_handover_init();</span><br><span> vc_conn := f_start_handler(refers(f_tc_ho_neighbor_config_4));</span><br><span> vc_conn.done;</span><br><span> </span><br><span>@@ -6693,7 +6728,7 @@</span><br><span> var MSC_ConnHdlr vc_conn;</span><br><span> f_init(3, true);</span><br><span> f_sleep(1.0);</span><br><span style="color: hsl(0, 100%, 40%);">- f_ctrs_bsc_and_bts_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_and_bts_handover_init();</span><br><span> vc_conn := f_start_handler(refers(f_tc_ho_neighbor_config_5));</span><br><span> vc_conn.done;</span><br><span> </span><br><span>@@ -6736,7 +6771,7 @@</span><br><span> var MSC_ConnHdlr vc_conn;</span><br><span> f_init(3, true);</span><br><span> f_sleep(1.0);</span><br><span style="color: hsl(0, 100%, 40%);">- f_ctrs_bsc_and_bts_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_and_bts_handover_init();</span><br><span> vc_conn := f_start_handler(refers(f_tc_ho_neighbor_config_6));</span><br><span> vc_conn.done;</span><br><span> </span><br><span>@@ -6780,7 +6815,7 @@</span><br><span> var MSC_ConnHdlr vc_conn;</span><br><span> f_init(3, true, guard_timeout := 50.0);</span><br><span> f_sleep(1.0);</span><br><span style="color: hsl(0, 100%, 40%);">- f_ctrs_bsc_and_bts_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_and_bts_handover_init();</span><br><span> vc_conn := f_start_handler(refers(f_tc_ho_neighbor_config_7));</span><br><span> vc_conn.done;</span><br><span> </span><br><span>@@ -6795,6 +6830,8 @@</span><br><span> f_ctrs_bsc_and_bts_add(0, "handover:failed");</span><br><span> f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:attempted");</span><br><span> f_ctrs_bsc_and_bts_add(0, "intra_bsc_ho:failed");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bts_add(2, "incoming_intra_bsc_ho:attempted");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bts_add(2, "incoming_intra_bsc_ho:failed");</span><br><span> </span><br><span> /* 7.b */</span><br><span> /* "timeout" means a handover was triggered and started (which is all this test aims for) and the test ended the</span><br><span>@@ -9752,7 +9789,7 @@</span><br><span> f_init(1, true);</span><br><span> f_sleep(1.0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- f_ctrs_bsc_and_bts_init();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_ctrs_bsc_and_bts_handover_init();</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_reassignment_codec), pars);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26141">change 26141</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/+/26141"/><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: Iba229313d73fa20266f6d4eac5820579fb14c604 </div>
<div style="display:none"> Gerrit-Change-Number: 26141 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>