<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10978">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Osmocom_VTY_Functions: Generalize to handle multiple VTY ports<br><br>The existing Osmocom_VTY_Functions code was centered around a global<br>module parameter specifying the prompt prefix.  This prevented a<br>single test to use multiple VTY connections to different Osmocom<br>programs.<br><br>This patch generalize the code by widening the prompt matching<br>in f_vty_wait_for_prompt() and by allowing the caller to specify<br>the prompt prefix to override the modulepar.<br><br>Change-Id: I574b56c42fe95540af44a2c43d0fb469938c0e65<br>---<br>M library/Osmocom_VTY_Functions.ttcn<br>1 file changed, 7 insertions(+), 7 deletions(-)<br><br></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 427bd5c..b822645 100644</span><br><span>--- a/library/Osmocom_VTY_Functions.ttcn</span><br><span>+++ b/library/Osmocom_VTY_Functions.ttcn</span><br><span>@@ -12,24 +12,24 @@</span><br><span>      template charstring t_vty_unknown := pattern "*% Unknown command.";</span><br><span> </span><br><span>    /* configure prompts in TELNETasp module */</span><br><span style="color: hsl(0, 100%, 40%);">-     function f_vty_set_prompts(TELNETasp_PT pt) {</span><br><span style="color: hsl(120, 100%, 40%);">+ function f_vty_set_prompts(TELNETasp_PT pt, charstring prompt_prefix := mp_prompt_prefix) {</span><br><span>          var ASP_TelnetDynamicConfig vty_prompt[3] := {</span><br><span>                       {</span><br><span>                            prompt := {</span><br><span>                                  id := 1,</span><br><span style="color: hsl(0, 100%, 40%);">-                                        prompt := mp_prompt_prefix & VTY_VIEW_SUFFIX,</span><br><span style="color: hsl(120, 100%, 40%);">+                                     prompt := prompt_prefix & VTY_VIEW_SUFFIX,</span><br><span>                                       has_wildcards := false</span><br><span>                               }</span><br><span>                    }, {</span><br><span>                                 prompt := {</span><br><span>                                  id := 2,</span><br><span style="color: hsl(0, 100%, 40%);">-                                        prompt := mp_prompt_prefix & VTY_ENABLE_SUFFIX,</span><br><span style="color: hsl(120, 100%, 40%);">+                                   prompt := prompt_prefix & VTY_ENABLE_SUFFIX,</span><br><span>                                     has_wildcards := false</span><br><span>                               }</span><br><span>                    }, {</span><br><span>                                 prompt := {</span><br><span>                                  id := 3,</span><br><span style="color: hsl(0, 100%, 40%);">-                                        prompt := mp_prompt_prefix & VTY_CFG_SUFFIX,</span><br><span style="color: hsl(120, 100%, 40%);">+                                      prompt := prompt_prefix & VTY_CFG_SUFFIX,</span><br><span>                                        has_wildcards := true</span><br><span>                                }</span><br><span>                    }</span><br><span>@@ -51,9 +51,9 @@</span><br><span> </span><br><span>            T.start;</span><br><span>             alt {</span><br><span style="color: hsl(0, 100%, 40%);">-                   [] pt.receive(mp_prompt_prefix & VTY_VIEW_SUFFIX) { };</span><br><span style="color: hsl(0, 100%, 40%);">-                      [] pt.receive(mp_prompt_prefix & VTY_ENABLE_SUFFIX) { };</span><br><span style="color: hsl(0, 100%, 40%);">-                    [] pt.receive(pattern mp_prompt_prefix & VTY_CFG_SUFFIX) { };</span><br><span style="color: hsl(120, 100%, 40%);">+                     [] pt.receive(pattern "\w+" & VTY_VIEW_SUFFIX) { };</span><br><span style="color: hsl(120, 100%, 40%);">+                     [] pt.receive(pattern "\w+\# ") { };</span><br><span style="color: hsl(120, 100%, 40%);">+                        [] pt.receive(pattern "\w+" & VTY_CFG_SUFFIX) { };</span><br><span>                     [] pt.receive(t_vty_unknown) {</span><br><span>                               testcase.stop(fail, "VTY: Unknown Command");</span><br><span>                               };</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10978">change 10978</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/10978"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I574b56c42fe95540af44a2c43d0fb469938c0e65 </div>
<div style="display:none"> Gerrit-Change-Number: 10978 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>