<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21369">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;">add f_vty_cfg_bts(), f_vty_cfg_msc()<br><br>These allow passing N vty configurations on the bts / msc node without<br>requiring subsequent 'exit'.<br><br>As an example, use f_vty_cfg_msc() in BSC_Tests.ttcn AMR config.<br><br>Change-Id: I9f3e485f692acb3d2a7620e9b454b372651be78e<br>---<br>M bsc/BSC_Tests.ttcn<br>M library/Osmocom_VTY_Functions.ttcn<br>2 files changed, 28 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 a63d536..cda0687 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -3611,33 +3611,31 @@</span><br><span> </span><br><span> /* Allow 5,90k only (current default config) */</span><br><span> private function f_allow_amr_rate_5_90k() runs on test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- f_vty_enter_cfg_msc(BSCVTY, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- f_vty_transceive(BSCVTY, "amr-config 12_2k forbidden");</span><br><span style="color: hsl(0, 100%, 40%);">- f_vty_transceive(BSCVTY, "amr-config 10_2k forbidden");</span><br><span style="color: hsl(0, 100%, 40%);">- f_vty_transceive(BSCVTY, "amr-config 7_95k forbidden");</span><br><span style="color: hsl(0, 100%, 40%);">- f_vty_transceive(BSCVTY, "amr-config 7_40k forbidden");</span><br><span style="color: hsl(0, 100%, 40%);">- f_vty_transceive(BSCVTY, "amr-config 6_70k forbidden");</span><br><span style="color: hsl(0, 100%, 40%);">- f_vty_transceive(BSCVTY, "amr-config 5_90k allowed");</span><br><span style="color: hsl(0, 100%, 40%);">- f_vty_transceive(BSCVTY, "amr-config 5_15k forbidden");</span><br><span style="color: hsl(0, 100%, 40%);">- f_vty_transceive(BSCVTY, "amr-config 4_75k forbidden");</span><br><span style="color: hsl(0, 100%, 40%);">- f_vty_transceive(BSCVTY, "exit");</span><br><span style="color: hsl(0, 100%, 40%);">- f_vty_transceive(BSCVTY, "exit");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_cfg_msc(BSCVTY, 0, {</span><br><span style="color: hsl(120, 100%, 40%);">+ "amr-config 12_2k forbidden",</span><br><span style="color: hsl(120, 100%, 40%);">+ "amr-config 10_2k forbidden",</span><br><span style="color: hsl(120, 100%, 40%);">+ "amr-config 7_95k forbidden",</span><br><span style="color: hsl(120, 100%, 40%);">+ "amr-config 7_40k forbidden",</span><br><span style="color: hsl(120, 100%, 40%);">+ "amr-config 6_70k forbidden",</span><br><span style="color: hsl(120, 100%, 40%);">+ "amr-config 5_90k allowed",</span><br><span style="color: hsl(120, 100%, 40%);">+ "amr-config 5_15k forbidden",</span><br><span style="color: hsl(120, 100%, 40%);">+ "amr-config 4_75k forbidden"</span><br><span style="color: hsl(120, 100%, 40%);">+ });</span><br><span> }</span><br><span> </span><br><span> /* Allow 4,75k, 5,90k, 4,70k and 12,2k, which are the most common rates</span><br><span> * ("Config-NB-Code = 1") */</span><br><span> private function f_allow_amr_rate_4_75k_5_90k_7_40k_12_20k() runs on test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">- f_vty_enter_cfg_msc(BSCVTY, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- f_vty_transceive(BSCVTY, "amr-config 12_2k allowed");</span><br><span style="color: hsl(0, 100%, 40%);">- f_vty_transceive(BSCVTY, "amr-config 10_2k forbidden");</span><br><span style="color: hsl(0, 100%, 40%);">- f_vty_transceive(BSCVTY, "amr-config 7_95k forbidden");</span><br><span style="color: hsl(0, 100%, 40%);">- f_vty_transceive(BSCVTY, "amr-config 7_40k allowed");</span><br><span style="color: hsl(0, 100%, 40%);">- f_vty_transceive(BSCVTY, "amr-config 6_70k forbidden");</span><br><span style="color: hsl(0, 100%, 40%);">- f_vty_transceive(BSCVTY, "amr-config 5_90k allowed");</span><br><span style="color: hsl(0, 100%, 40%);">- f_vty_transceive(BSCVTY, "amr-config 5_15k forbidden");</span><br><span style="color: hsl(0, 100%, 40%);">- f_vty_transceive(BSCVTY, "amr-config 4_75k allowed");</span><br><span style="color: hsl(0, 100%, 40%);">- f_vty_transceive(BSCVTY, "exit");</span><br><span style="color: hsl(0, 100%, 40%);">- f_vty_transceive(BSCVTY, "exit");</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_cfg_msc(BSCVTY, 0, {</span><br><span style="color: hsl(120, 100%, 40%);">+ "amr-config 12_2k allowed",</span><br><span style="color: hsl(120, 100%, 40%);">+ "amr-config 10_2k forbidden",</span><br><span style="color: hsl(120, 100%, 40%);">+ "amr-config 7_95k forbidden",</span><br><span style="color: hsl(120, 100%, 40%);">+ "amr-config 7_40k allowed",</span><br><span style="color: hsl(120, 100%, 40%);">+ "amr-config 6_70k forbidden",</span><br><span style="color: hsl(120, 100%, 40%);">+ "amr-config 5_90k allowed",</span><br><span style="color: hsl(120, 100%, 40%);">+ "amr-config 5_15k forbidden",</span><br><span style="color: hsl(120, 100%, 40%);">+ "amr-config 4_75k allowed"</span><br><span style="color: hsl(120, 100%, 40%);">+ });</span><br><span> }</span><br><span> </span><br><span> testcase TC_assignment_codec_amr_f() runs on test_CT {</span><br><span>diff --git a/library/Osmocom_VTY_Functions.ttcn b/library/Osmocom_VTY_Functions.ttcn</span><br><span>index a51794f..b291b03 100644</span><br><span>--- a/library/Osmocom_VTY_Functions.ttcn</span><br><span>+++ b/library/Osmocom_VTY_Functions.ttcn</span><br><span>@@ -174,6 +174,14 @@</span><br><span> f_vty_config2(pt, {config_node}, cmd);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+function f_vty_cfg_bts(TELNETasp_PT pt, BtsNr bts := 0, rof_charstring cmds) {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_config3(pt, {"network", "bts " & int2str(bts)}, cmds);</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_vty_cfg_msc(TELNETasp_PT pt, MscNr msc := 0, rof_charstring cmds) {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_vty_config3(pt, {"msc " & int2str(msc)}, cmds);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> function f_vty_transceive_match(TELNETasp_PT pt, charstring cmd, template charstring exp_ret) {</span><br><span> var charstring ret := f_vty_transceive_ret(pt, cmd);</span><br><span> if (not match(ret, exp_ret)) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/21369">change 21369</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/+/21369"/><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: I9f3e485f692acb3d2a7620e9b454b372651be78e </div>
<div style="display:none"> Gerrit-Change-Number: 21369 </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: 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>