<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22547">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/Osmocom_VTY_Functions: cosmetic: coding style changes<br><br>Change-Id: Idccdf6fcbda2d020d2263ea1440ea1c5d9ea0e45<br>---<br>M library/Osmocom_VTY_Functions.ttcn<br>1 file changed, 27 insertions(+), 26 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 b291b03..a9f4c24 100644</span><br><span>--- a/library/Osmocom_VTY_Functions.ttcn</span><br><span>+++ b/library/Osmocom_VTY_Functions.ttcn</span><br><span>@@ -56,39 +56,40 @@</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, boolean strict := true, charstring log_label := "(?)") return charstring {</span><br><span style="color: hsl(120, 100%, 40%);">+ function f_vty_wait_for_prompt(TELNETasp_PT pt, boolean strict := true, charstring log_label := "(?)")</span><br><span style="color: hsl(120, 100%, 40%);">+ 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> </span><br><span> T.start;</span><br><span> alt {</span><br><span style="color: hsl(0, 100%, 40%);">- [] pt.receive(pattern "[\w-]+" & VTY_VIEW_SUFFIX) { };</span><br><span style="color: hsl(0, 100%, 40%);">- [] pt.receive(pattern "[\w-]+\# ") { };</span><br><span style="color: hsl(0, 100%, 40%);">- [] pt.receive(pattern "[\w-]+\(*\)\# ") { };</span><br><span style="color: hsl(0, 100%, 40%);">- [] pt.receive(t_vty_unknown) -> value rx {</span><br><span style="color: hsl(0, 100%, 40%);">- if (strict) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "VTY: Unknown Command: " & log_label);</span><br><span style="color: hsl(0, 100%, 40%);">- mtc.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- log("VTY: Unknown Command (ignored): " & log_label);</span><br><span style="color: hsl(0, 100%, 40%);">- buf := buf & rx;</span><br><span style="color: hsl(0, 100%, 40%);">- repeat;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- [] pt.receive(charstring:?) -> value rx { buf := buf & rx; repeat };</span><br><span style="color: hsl(0, 100%, 40%);">- [] pt.receive(integer:?) -> value fd {</span><br><span style="color: hsl(0, 100%, 40%);">- if (fd == -1) {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "VTY Telnet Connection Failure: " & log_label);</span><br><span style="color: hsl(0, 100%, 40%);">- mtc.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- repeat; /* telnet connection succeeded */</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- [] T.timeout {</span><br><span style="color: hsl(0, 100%, 40%);">- setverdict(fail, "VTY Timeout for prompt: " & log_label);</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-]+\(*\)\# ") { };</span><br><span style="color: hsl(120, 100%, 40%);">+ [] pt.receive(t_vty_unknown) -> value rx {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strict) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "VTY: Unknown Command: " & log_label);</span><br><span> mtc.stop;</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ log("VTY: Unknown Command (ignored): " & log_label);</span><br><span style="color: hsl(120, 100%, 40%);">+ buf := buf & rx;</span><br><span style="color: hsl(120, 100%, 40%);">+ repeat;</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%);">+ [] pt.receive(charstring:?) -> value rx { buf := buf & rx; repeat };</span><br><span style="color: hsl(120, 100%, 40%);">+ [] pt.receive(integer:?) -> value fd {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (fd == -1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "VTY Telnet Connection Failure: " & log_label);</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ repeat; /* telnet connection succeeded */</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%);">+ [] T.timeout {</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail, "VTY Timeout for prompt: " & log_label);</span><br><span style="color: hsl(120, 100%, 40%);">+ mtc.stop;</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span> }</span><br><span> T.stop;</span><br><span> return buf;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/22547">change 22547</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/+/22547"/><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: Idccdf6fcbda2d020d2263ea1440ea1c5d9ea0e45 </div>
<div style="display:none"> Gerrit-Change-Number: 22547 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@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-MessageType: merged </div>