<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19555">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">f_vty_transceive: allow to ignore unknown vty commands<br><br>When a new test uses a VTY configuration that may not yet be available in the<br>'latest' build, it can be useful to ignore the "Unknown VTY Command" error.<br><br>To be used by f_init() for multiple MSCs, setting a default 'allow-attach' flag<br>per MSC implicitly -- such vty config is not yet supported in the latest build.<br><br>Change-Id: I284c42e10c0cb282c8410db87959b471867edef6<br>---<br>M library/Osmocom_VTY_Functions.ttcn<br>1 file changed, 10 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/55/19555/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/Osmocom_VTY_Functions.ttcn b/library/Osmocom_VTY_Functions.ttcn</span><br><span>index 823d79f..4cf37c4 100644</span><br><span>--- a/library/Osmocom_VTY_Functions.ttcn</span><br><span>+++ b/library/Osmocom_VTY_Functions.ttcn</span><br><span>@@ -56,7 +56,7 @@</span><br><span>    }</span><br><span> </span><br><span>        /* wait for any of the permitted prompts; buffer + return all intermediate output */</span><br><span style="color: hsl(0, 100%, 40%);">-    function f_vty_wait_for_prompt(TELNETasp_PT pt) return charstring {</span><br><span style="color: hsl(120, 100%, 40%);">+   function f_vty_wait_for_prompt(TELNETasp_PT pt, boolean strict := true) return charstring {</span><br><span>          var charstring rx, buf := "";</span><br><span>              var integer fd;</span><br><span>              timer T := 2.0;</span><br><span>@@ -67,7 +67,11 @@</span><br><span>                         [] pt.receive(pattern "[\w-]+\# ") { };</span><br><span>                    [] pt.receive(pattern "[\w-]+\(*\)\# ") { };</span><br><span>                       [] pt.receive(t_vty_unknown) {</span><br><span style="color: hsl(0, 100%, 40%);">-                          testcase.stop(fail, "VTY: Unknown Command");</span><br><span style="color: hsl(120, 100%, 40%);">+                                if (strict) {</span><br><span style="color: hsl(120, 100%, 40%);">+                                 testcase.stop(fail, "VTY: Unknown Command");</span><br><span style="color: hsl(120, 100%, 40%);">+                                } else {</span><br><span style="color: hsl(120, 100%, 40%);">+                                      log("VTY: Unknown Command (ignored)");</span><br><span style="color: hsl(120, 100%, 40%);">+                              }</span><br><span>                            };</span><br><span>                   [] pt.receive(charstring:?) -> value rx { buf := buf & rx; repeat };</span><br><span>                  [] pt.receive(integer:?) -> value fd {</span><br><span>@@ -88,14 +92,14 @@</span><br><span>      }</span><br><span> </span><br><span>        /* send a VTY command and obtain response until prompt is received */</span><br><span style="color: hsl(0, 100%, 40%);">-   function f_vty_transceive_ret(TELNETasp_PT pt, charstring tx) return charstring {</span><br><span style="color: hsl(120, 100%, 40%);">+     function f_vty_transceive_ret(TELNETasp_PT pt, charstring tx, boolean strict := true) return charstring {</span><br><span>            pt.send(tx);</span><br><span style="color: hsl(0, 100%, 40%);">-            return f_vty_wait_for_prompt(pt);</span><br><span style="color: hsl(120, 100%, 40%);">+             return f_vty_wait_for_prompt(pt, strict);</span><br><span>    }</span><br><span> </span><br><span>        /* send a VTY command and obtain response until prompt is received */</span><br><span style="color: hsl(0, 100%, 40%);">-   function f_vty_transceive(TELNETasp_PT pt, charstring tx) {</span><br><span style="color: hsl(0, 100%, 40%);">-             var charstring unused := f_vty_transceive_ret(pt, tx);</span><br><span style="color: hsl(120, 100%, 40%);">+        function f_vty_transceive(TELNETasp_PT pt, charstring tx, boolean strict := true) {</span><br><span style="color: hsl(120, 100%, 40%);">+           var charstring unused := f_vty_transceive_ret(pt, tx, strict);</span><br><span>       }</span><br><span> </span><br><span>        type integer BtsNr (0..255);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/19555">change 19555</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/+/19555"/><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: I284c42e10c0cb282c8410db87959b471867edef6 </div>
<div style="display:none"> Gerrit-Change-Number: 19555 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>