X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_interface.py;h=1e047f5f700ff803379d0b63f5a205f158b35966;hb=053204ab039d34a990ff0e14c32ce3b294fcce0e;hp=125d8f044b42578cfecdccdb12a5d778871f3812;hpb=39f9d8bd226ab5aa366f181a5cbf7c873f599e06;p=vpp.git diff --git a/test/vpp_interface.py b/test/vpp_interface.py index 125d8f044b4..1e047f5f700 100644 --- a/test/vpp_interface.py +++ b/test/vpp_interface.py @@ -1,13 +1,24 @@ -from abc import abstractmethod, ABCMeta +import binascii import socket +import abc -from util import Host -from vpp_neighbor import VppNeighbor +import six +from six import moves +from util import Host, mk_ll_addr +from vpp_papi import mac_ntop, VppEnum +from vpp_ip import VppIpAddress, VppIpPrefix +from ipaddress import IPv4Network +try: + text_type = unicode +except NameError: + text_type = str + + +@six.add_metaclass(abc.ABCMeta) class VppInterface(object): """Generic VPP interface.""" - __metaclass__ = ABCMeta @property def sw_if_index(self): @@ -24,15 +35,42 @@ class VppInterface(object): """MAC-address of the VPP interface.""" return self._local_mac + @property + def local_addr(self): + return self._local_addr + + @property + def remote_addr(self): + return self._remote_addr + @property def local_ip4(self): """Local IPv4 address on VPP interface (string).""" + return self._local_ip4.address + + @local_ip4.setter + def local_ip4(self, value): + self._local_ip4.address = value + + @property + def local_ip4_prefix_len(self): + """Local IPv4 prefix length """ + return self._local_ip4.len + + @local_ip4_prefix_len.setter + def local_ip4_prefix_len(self, value): + self._local_ip4.len = value + + @property + def local_ip4_prefix(self): + """Local IPv4 prefix """ return self._local_ip4 @property def local_ip4n(self): + """DEPRECATED """ """Local IPv4 address - raw, suitable as API parameter.""" - return socket.inet_pton(socket.AF_INET, self._local_ip4) + return socket.inet_pton(socket.AF_INET, self._local_ip4.address) @property def remote_ip4(self): @@ -41,18 +79,38 @@ class VppInterface(object): @property def remote_ip4n(self): - """IPv4 address of remote peer - raw, suitable as API parameter.""" - return socket.inet_pton(socket.AF_INET, self.remote_ip4) + """DEPRECATED """ + """Local IPv6 address - raw, suitable as API parameter.""" + return socket.inet_pton(socket.AF_INET, self._remote_hosts[0].ip4) @property def local_ip6(self): """Local IPv6 address on VPP interface (string).""" + return self._local_ip6.address + + @local_ip6.setter + def local_ip6(self, value): + self._local_ip6.address = value + + @property + def local_ip6_prefix_len(self): + """Local IPv6 prefix length """ + return self._local_ip6.len + + @local_ip6_prefix_len.setter + def local_ip6_prefix_len(self, value): + self._local_ip6.len = value + + @property + def local_ip6_prefix(self): + """Local IPv6 prefix """ return self._local_ip6 @property def local_ip6n(self): + """DEPRECATED """ """Local IPv6 address - raw, suitable as API parameter.""" - return socket.inet_pton(socket.AF_INET6, self.local_ip6) + return socket.inet_pton(socket.AF_INET6, self._local_ip6.address) @property def remote_ip6(self): @@ -61,8 +119,32 @@ class VppInterface(object): @property def remote_ip6n(self): - """IPv6 address of remote peer - raw, suitable as API parameter""" - return socket.inet_pton(socket.AF_INET6, self.remote_ip6) + """DEPRECATED """ + """Local IPv6 address - raw, suitable as API parameter.""" + return socket.inet_pton(socket.AF_INET6, self._remote_hosts[0].ip6) + + @property + def local_ip6_ll(self): + """Local IPv6 link-local address on VPP interface (string).""" + return self._local_ip6_ll.address + + @property + def local_ip6n_ll(self): + """DEPRECATED """ + """Local IPv6 link-local address on VPP interface (string).""" + return socket.inet_pton(socket.AF_INET6, self._local_ip6_ll.address) + + @property + def remote_ip6_ll(self): + """Link-local IPv6 address of remote peer + "connected" to this interface.""" + return self._remote_ip6_ll + + @property + def remote_ip6n_ll(self): + """DEPRECATED """ + """Local IPv6 link-local address on VPP interface (string).""" + return socket.inet_pton(socket.AF_INET6, self._remote_ip6_ll) @property def name(self): @@ -133,13 +215,14 @@ class VppInterface(object): mac = "02:%02x:00:00:ff:%02x" % (self.sw_if_index, i) ip4 = "172.16.%u.%u" % (self.sw_if_index, i) ip6 = "fd01:%x::%x" % (self.sw_if_index, i) - host = Host(mac, ip4, ip6) + ip6_ll = mk_ll_addr(mac) + host = Host(mac, ip4, ip6, ip6_ll) self._remote_hosts.append(host) self._hosts_by_mac[mac] = host self._hosts_by_ip4[ip4] = host self._hosts_by_ip6[ip6] = host - @abstractmethod + @abc.abstractmethod def __init__(self, test): self._test = test @@ -148,39 +231,52 @@ class VppInterface(object): self._hosts_by_ip4 = {} self._hosts_by_ip6 = {} + def set_mac(self, mac): + self._local_mac = str(mac) + self._local_ip6_ll = VppIpAddress(mk_ll_addr(self._local_mac)) + self.test.vapi.sw_interface_set_mac_address( + self.sw_if_index, mac.packed) + + def set_sw_if_index(self, sw_if_index): + self._sw_if_index = sw_if_index + self.generate_remote_hosts() - self._local_ip4 = "172.16.%u.1" % self.sw_if_index - self._local_ip4n = socket.inet_pton(socket.AF_INET, self.local_ip4) - self.local_ip4_prefix_len = 24 + self._local_ip4 = VppIpPrefix("172.16.%u.1" % self.sw_if_index, 24) + self._local_ip4_subnet = "172.16.%u.0" % self.sw_if_index + self._local_ip4_bcast = "172.16.%u.255" % self.sw_if_index self.has_ip4_config = False self.ip4_table_id = 0 - self._local_ip6 = "fd01:%x::1" % self.sw_if_index - self._local_ip6n = socket.inet_pton(socket.AF_INET6, self.local_ip6) - self.local_ip6_prefix_len = 64 + self._local_ip6 = VppIpPrefix("fd01:%x::1" % self.sw_if_index, 64) self.has_ip6_config = False self.ip6_table_id = 0 - r = self.test.vapi.sw_interface_dump() + self._local_addr = {socket.AF_INET: self.local_ip4, + socket.AF_INET6: self.local_ip6} + self._remote_addr = {socket.AF_INET: self.remote_ip4, + socket.AF_INET6: self.remote_ip6} + + r = self.test.vapi.sw_interface_dump(sw_if_index=self.sw_if_index) for intf in r: if intf.sw_if_index == self.sw_if_index: - self._name = intf.interface_name.split(b'\0', 1)[0] - self._local_mac = \ - ':'.join(intf.l2_address.encode('hex')[i:i + 2] - for i in range(0, 12, 2)) + self._name = intf.interface_name.split(b'\0', + 1)[0].decode('utf8') + self._local_mac = bytes(intf.l2_address) self._dump = intf break else: raise Exception( "Could not find interface with sw_if_index %d " "in interface dump %s" % - (self.sw_if_index, repr(r))) + (self.sw_if_index, moves.reprlib.repr(r))) + self._local_ip6_ll = VppIpAddress(mk_ll_addr(self.local_mac)) + self._remote_ip6_ll = mk_ll_addr(self.remote_mac) def config_ip4(self): """Configure IPv4 address on the VPP interface.""" self.test.vapi.sw_interface_add_del_address( - self.sw_if_index, self.local_ip4n, self.local_ip4_prefix_len) + sw_if_index=self.sw_if_index, prefix=self._local_ip4.encode()) self.has_ip4_config = True def unconfig_ip4(self): @@ -188,30 +284,26 @@ class VppInterface(object): try: if self.has_ip4_config: self.test.vapi.sw_interface_add_del_address( - self.sw_if_index, - self.local_ip4n, - self.local_ip4_prefix_len, - is_add=0) + sw_if_index=self.sw_if_index, + prefix=self._local_ip4.encode(), is_add=0) except AttributeError: self.has_ip4_config = False self.has_ip4_config = False - def configure_ipv4_neighbors(self, vrf_id=0): + def configure_ipv4_neighbors(self): """For every remote host assign neighbor's MAC to IPv4 addresses. :param vrf_id: The FIB table / VRF ID. (Default value = 0) """ for host in self._remote_hosts: - macn = host.mac.replace(":", "").decode('hex') - ipn = host.ip4n - self.test.vapi.ip_neighbor_add_del( - self.sw_if_index, macn, ipn, vrf_id) + self.test.vapi.ip_neighbor_add_del(self.sw_if_index, + host.mac, + host.ip4) def config_ip6(self): """Configure IPv6 address on the VPP interface.""" self.test.vapi.sw_interface_add_del_address( - self.sw_if_index, self._local_ip6n, self.local_ip6_prefix_len, - is_ipv6=1) + sw_if_index=self.sw_if_index, prefix=self._local_ip6.encode()) self.has_ip6_config = True def unconfig_ip6(self): @@ -219,24 +311,21 @@ class VppInterface(object): try: if self.has_ip6_config: self.test.vapi.sw_interface_add_del_address( - self.sw_if_index, - self.local_ip6n, - self.local_ip6_prefix_len, - is_ipv6=1, is_add=0) + sw_if_index=self.sw_if_index, + prefix=self._local_ip6.encode(), is_add=0) except AttributeError: self.has_ip6_config = False self.has_ip6_config = False - def configure_ipv6_neighbors(self, vrf_id=0): + def configure_ipv6_neighbors(self): """For every remote host assign neighbor's MAC to IPv6 addresses. :param vrf_id: The FIB table / VRF ID. (Default value = 0) """ for host in self._remote_hosts: - macn = host.mac.replace(":", "").decode('hex') - ipn = host.ip6n - self.test.vapi.ip_neighbor_add_del( - self.sw_if_index, macn, ipn, vrf_id, is_ipv6=1) + self.test.vapi.ip_neighbor_add_del(self.sw_if_index, + host.mac, + host.ip6) def unconfig(self): """Unconfigure IPv6 and IPv4 address on the VPP interface.""" @@ -263,33 +352,59 @@ class VppInterface(object): def disable_ipv6_ra(self): """Configure IPv6 RA suppress on the VPP interface.""" - self.test.vapi.sw_interface_ra_suppress(self.sw_if_index) + self.test.vapi.sw_interface_ip6nd_ra_config( + sw_if_index=self.sw_if_index, + suppress=1) def ip6_ra_config(self, no=0, suppress=0, send_unicast=0): """Configure IPv6 RA suppress on the VPP interface.""" - self.test.vapi.ip6_sw_interface_ra_config(self.sw_if_index, - no, - suppress, - send_unicast) + self.test.vapi.sw_interface_ip6nd_ra_config( + sw_if_index=self.sw_if_index, + is_no=no, + suppress=suppress, + send_unicast=send_unicast) + + def ip6_ra_prefix(self, prefix, is_no=0, + off_link=0, no_autoconfig=0, use_default=0): + """Configure IPv6 RA suppress on the VPP interface. + + prefix can be a string in the format of '
/