<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21370">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc: set the AMR start-mode that the tests expect<br><br>osmo-bsc currently has a bug that fails to reflect the correct<br>start-mode in the AMR MultiRate config IE.<br><br>And it went unnoticed that the ttcn tests expect a MultiRate config of<br>ICMI = 1, even though the used configuration should yield ICMI = 0.<br>See mr_conf = '2804'O, where the '8' indicates ICMI = 1.<br><br>As a first fix of the ttcn3-bsc-tests, configure the BSC according to<br>the expected ICMI value and Start Mode, i.e. ICMI = 1 and StartMode = 0,<br>which is configured by 'amr tch-[fh] start-mode 1'. This should make<br>these tests pass as-is for both the current osmo-bsc as well as an<br>osmo-bsc where the bug is fixed, with minimal changes to the current<br>tests. See also OS#4868.<br><br>An upcoming patch will add tests for 'start-mode auto'.<br><br>Related: OS#4868<br>Change-Id: I4cff01c37d5c7e301e9a01f773b7e009a789519b<br>---<br>M bsc/BSC_Tests.ttcn<br>1 file changed, 28 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 cda0687..4cbc256 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -3638,6 +3638,21 @@</span><br><span> });</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+private function f_vty_amr_start_mode_set(boolean fr, charstring startmode) runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var charstring tch;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (fr) {</span><br><span style="color: hsl(120, 100%, 40%);">+ tch := "tch-f";</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ tch := "tch-h";</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_cfg_bts(BSCVTY, 0, { "amr " & tch & " start-mode " & startmode });</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%);">+/* Set the AMR start-mode for this TCH back to the default configuration. */</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_vty_amr_start_mode_restore(boolean fr) runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_amr_start_mode_set(fr, "auto");</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_amr_f() 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>@@ -3659,10 +3674,13 @@</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_vty_amr_start_mode_set(true, "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> f_shutdown_helper();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_amr_start_mode_restore(true);</span><br><span> }</span><br><span> </span><br><span> testcase TC_assignment_codec_amr_h() runs on test_CT {</span><br><span>@@ -3684,10 +3702,13 @@</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_vty_amr_start_mode_set(false, "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> f_shutdown_helper();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_amr_start_mode_restore(false);</span><br><span> }</span><br><span> </span><br><span> function f_TC_assignment_codec_amr(boolean fr, octetstring mrconf, bitstring s8_s0, bitstring exp_s8_s0)</span><br><span>@@ -3716,11 +3737,13 @@</span><br><span> </span><br><span> f_init(1, true);</span><br><span> f_allow_amr_rate_4_75k_5_90k_7_40k_12_20k();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_amr_start_mode_set(fr, "1");</span><br><span> f_sleep(1.0);</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> f_allow_amr_rate_5_90k();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_amr_start_mode_restore(fr);</span><br><span> }</span><br><span> </span><br><span> function f_TC_assignment_codec_amr_fail(boolean fr, bitstring s8_s0)</span><br><span>@@ -3739,11 +3762,13 @@</span><br><span> </span><br><span> f_init(1, true);</span><br><span> f_allow_amr_rate_4_75k_5_90k_7_40k_12_20k();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_amr_start_mode_set(fr, "1");</span><br><span> f_sleep(1.0);</span><br><span> </span><br><span> vc_conn := f_start_handler(refers(f_TC_assignment_codec_fail), pars);</span><br><span> vc_conn.done;</span><br><span> f_allow_amr_rate_5_90k();</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_amr_start_mode_restore(fr);</span><br><span> }</span><br><span> </span><br><span> </span><br><span>@@ -4164,10 +4189,13 @@</span><br><span> </span><br><span> f_init(1, true, true);</span><br><span> f_sleep(1.0);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_amr_start_mode_set(false, "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> f_shutdown_helper();</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_amr_start_mode_restore(false);</span><br><span> }</span><br><span> </span><br><span> /* test the procedure of the MSC requesting a Classmark Update:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21370">change 21370</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/+/21370"/><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: I4cff01c37d5c7e301e9a01f773b7e009a789519b </div>
<div style="display:none"> Gerrit-Change-Number: 21370 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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: laforge <laforge@osmocom.org> </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>