<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13435">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty_test_runner: Handle MGCP message recv len dynamically<br><br>Change-Id: I536d78a2a1962240e5e369cda9927d8c9955ab86<br>---<br>M openbsc/tests/vty_test_runner.py<br>1 file changed, 12 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/35/13435/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/openbsc/tests/vty_test_runner.py b/openbsc/tests/vty_test_runner.py</span><br><span>index ca0b879..44ccdd8 100644</span><br><span>--- a/openbsc/tests/vty_test_runner.py</span><br><span>+++ b/openbsc/tests/vty_test_runner.py</span><br><span>@@ -20,6 +20,7 @@</span><br><span> import unittest</span><br><span> import socket</span><br><span> import subprocess</span><br><span style="color: hsl(120, 100%, 40%);">+import struct</span><br><span> </span><br><span> import osmopy.obscvty as obscvty</span><br><span> import osmopy.osmoutil as osmoutil</span><br><span>@@ -1089,6 +1090,16 @@</span><br><span>         if (verbose):</span><br><span>             print "\tBSC <- NAT: ", s</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+def ipa_handle_mgcp(x, verbose = False):</span><br><span style="color: hsl(120, 100%, 40%);">+    data = x.recv(3)</span><br><span style="color: hsl(120, 100%, 40%);">+    s = data2str(data)</span><br><span style="color: hsl(120, 100%, 40%);">+    if s[4:] != "fc":</span><br><span style="color: hsl(120, 100%, 40%);">+        print "expected IPA(MGCP) but received %r instead" % (s[4:])</span><br><span style="color: hsl(120, 100%, 40%);">+    ipa_len, = struct.unpack('>H', data[:2])</span><br><span style="color: hsl(120, 100%, 40%);">+    mgcp_msg = x.recv(ipa_len) # MGCP msg</span><br><span style="color: hsl(120, 100%, 40%);">+    if (verbose):</span><br><span style="color: hsl(120, 100%, 40%);">+        print "\tBSC <- NAT (MGCP[%d]): %s" % (ipa_len, mgcp_msg)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def nat_bsc_num_con(x):</span><br><span>     return len(x.vty.command("show bsc connections").split('\n'))</span><br><span> </span><br><span>@@ -1106,7 +1117,7 @@</span><br><span>     ipa_handle_resp(bsc, tk, verbose, proc=proc)</span><br><span>     if proc:</span><br><span>       print "\tproc.poll() = %r" % proc.poll()</span><br><span style="color: hsl(0, 100%, 40%);">-    bsc.recv(27) # MGCP msg</span><br><span style="color: hsl(120, 100%, 40%);">+    ipa_handle_mgcp(bsc, verbose)</span><br><span>     if proc:</span><br><span>       print "\tproc.poll() = %r" % proc.poll()</span><br><span>     ipa_handle_small(bsc, verbose)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13435">change 13435</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/13435"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: openbsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I536d78a2a1962240e5e369cda9927d8c9955ab86 </div>
<div style="display:none"> Gerrit-Change-Number: 13435 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>