X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Futil.py;h=24e9af44b7d5b248ff4e84ce554b462d2ccd377d;hb=9bea8fb0b0b6377fbead21f4ff6bceb50080329e;hp=ae887a5454375f3b8f6f417e53eb1c9eaccae4bb;hpb=d81da8c0b5094de6635ad9575a2a2bb6f44070dc;p=vpp.git diff --git a/test/util.py b/test/util.py index ae887a54543..24e9af44b7d 100644 --- a/test/util.py +++ b/test/util.py @@ -41,7 +41,8 @@ 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)) class NumericConstant(object): @@ -75,19 +76,24 @@ class Host(object): @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 + @property + def ip6n(self): + """ IPv6 address of remote host - raw, suitable as API parameter.""" + return socket.inet_pton(socket.AF_INET6, self._ip6) + def __init__(self, mac=None, ip4=None, ip6=None): self._mac = mac self._ip4 = ip4