X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Futil.py;h=d6aa9a426771314905c077de31b67d3a0da7fb73;hb=6f9f6f3f2827e2b957c5f69e1d3ff0cb375034e6;hp=ae887a5454375f3b8f6f417e53eb1c9eaccae4bb;hpb=d81da8c0b5094de6635ad9575a2a2bb6f44070dc;p=vpp.git

diff --git a/test/util.py b/test/util.py
index ae887a54543..d6aa9a42677 100644
--- a/test/util.py
+++ b/test/util.py
@@ -1,7 +1,10 @@
+""" test framework utilities """
+
 import socket
 import sys
 from abc import abstractmethod, ABCMeta
 from cStringIO import StringIO
+from scapy.layers.inet6 import in6_mactoifaceid
 
 
 def ppp(headline, packet):
@@ -41,7 +44,19 @@ def ip4_range(ip4, s, e):
 
 def ip4n_range(ip4n, s, e):
     ip4 = socket.inet_ntop(socket.AF_INET, ip4n)
-    return (socket.inet_pton(socket.AF_INET, ip) for ip in ip4_range(ip4, s, e))
+    return (socket.inet_pton(socket.AF_INET, ip)
+            for ip in ip4_range(ip4, s, e))
+
+
+def mactobinary(mac):
+    """ Convert the : separated format into binary packet data for the API """
+    return mac.replace(':', '').decode('hex')
+
+
+def mk_ll_addr(mac):
+    euid = in6_mactoifaceid(mac)
+    addr = "fe80::" + euid
+    return addr
 
 
 class NumericConstant(object):
@@ -73,22 +88,78 @@ class Host(object):
         """ MAC address """
         return self._mac
 
+    @property
+    def bin_mac(self):
+        """ MAC address """
+        return mactobinary(self._mac)
+
     @property
     def ip4(self):
-        """ IPv4 address """
+        """ IPv4 address - string """
         return self._ip4
 
     @property
     def ip4n(self):
-        """ IPv4 address """
+        """ IPv4 address of remote host - raw, suitable as API parameter."""
         return socket.inet_pton(socket.AF_INET, self._ip4)
 
     @property
     def ip6(self):
-        """ IPv6 address """
+        """ IPv6 address - string """
         return self._ip6
 
-    def __init__(self, mac=None, ip4=None, ip6=None):
+    @property
+    def ip6n(self):
+        """ IPv6 address of remote host - raw, suitable as API parameter."""
+        return socket.inet_pton(socket.AF_INET6, self._ip6)
+
+    @property
+    def ip6_ll(self):
+        """ IPv6 link-local address - string """
+        return self._ip6_ll
+
+    @property
+    def ip6n_ll(self):
+        """ IPv6 link-local address of remote host -
+        raw, suitable as API parameter."""
+        return socket.inet_pton(socket.AF_INET6, self._ip6_ll)
+
+    def __eq__(self, other):
+        if isinstance(other, Host):
+            return (self.mac == other.mac and
+                    self.ip4 == other.ip4 and
+                    self.ip6 == other.ip6 and
+                    self.ip6_ll == other.ip6_ll)
+        else:
+            return False
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
+    def __repr__(self):
+        return "Host { mac:%s ip4:%s ip6:%s ip6_ll:%s }" % (self.mac,
+                                                            self.ip4,
+                                                            self.ip6,
+                                                            self.ip6_ll)
+
+    def __hash__(self):
+        return hash(self.__repr__())
+
+    def __init__(self, mac=None, ip4=None, ip6=None, ip6_ll=None):
         self._mac = mac
         self._ip4 = ip4
         self._ip6 = ip6
+        self._ip6_ll = ip6_ll
+
+
+class ForeignAddressFactory(object):
+    count = 0
+    prefix_len = 24
+    net_template = '10.10.10.{}'
+    net = net_template.format(0) + '/' + str(prefix_len)
+
+    def get_ip4(self):
+        if self.count > 255:
+            raise Exception("Network host address exhaustion")
+        self.count += 1
+        return self.net_template.format(self.count)