make test: fix missing log/packet messages

[vpp.git] / test / util.py

diff --git a/test/util.py b/test/util.py
index 8d7c920..643377f 100644 (file)
--- a/test/util.py
+++ b/test/util.py
@@ -1,8 +1,21 @@
-from logging import *
+import socket
+import sys
+from cStringIO import StringIO
 
 
-class TestHost(object):
-    """ Generic test host "connected" to VPP. """
+def ppp(headline, packet):
+    """ Return string containing the output of scapy packet.show() call. """
+    o = StringIO()
+    old_stdout = sys.stdout
+    sys.stdout = o
+    print(headline)
+    packet.show()
+    sys.stdout = old_stdout
+    return o.getvalue()
+
+
+class Host(object):
+    """ Generic test host "connected" to VPPs interface. """
 
     @property
     def mac(self):
@@ -14,6 +27,11 @@ class TestHost(object):
         """ IPv4 address """
         return self._ip4
 
+    @property
+    def ip4n(self):
+        """ IPv4 address """
+        return socket.inet_pton(socket.AF_INET, self._ip4)
+
     @property
     def ip6(self):
         """ IPv6 address """