X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_interface.py;h=cee6ea4f0807266942be079e8cde747e7afd3a67;hb=59abf89dda5e0d216892af503898c1307aae0c3d;hp=2dcf149a59350c73e4ee50d4263efd839e985d35;hpb=3bce8ebfdfaf2a4b576012beb3516d1f4030c20c;p=vpp.git diff --git a/test/vpp_interface.py b/test/vpp_interface.py index 2dcf149a593..cee6ea4f080 100644 --- a/test/vpp_interface.py +++ b/test/vpp_interface.py @@ -2,15 +2,17 @@ import binascii import socket import abc -import six -from six import moves - from util import Host, mk_ll_addr -from vpp_papi import mac_ntop +from vpp_papi import mac_ntop, VppEnum +from ipaddress import IPv4Network, IPv6Network + +try: + text_type = unicode +except NameError: + text_type = str -@six.add_metaclass(abc.ABCMeta) -class VppInterface(object): +class VppInterface(metaclass=abc.ABCMeta): """Generic VPP interface.""" @property @@ -26,7 +28,7 @@ class VppInterface(object): @property def local_mac(self): """MAC-address of the VPP interface.""" - return self._local_mac + return str(self._local_mac) @property def local_addr(self): @@ -36,76 +38,79 @@ class VppInterface(object): def remote_addr(self): return self._remote_addr - @property - def local_addr_n(self): - return self._local_addr_n - - @property - def remote_addr_n(self): - return self._remote_addr_n - @property def local_ip4(self): """Local IPv4 address on VPP interface (string).""" return self._local_ip4 + @local_ip4.setter + def local_ip4(self, value): + self._local_ip4 = 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_ip4n(self): - """Local IPv4 address - raw, suitable as API parameter.""" - return socket.inet_pton(socket.AF_INET, self._local_ip4) + def local_ip4_prefix(self): + """Local IPv4 prefix""" + return "%s/%d" % (self._local_ip4, self._local_ip4_len) @property def remote_ip4(self): """IPv4 address of remote peer "connected" to this interface.""" return self._remote_hosts[0].ip4 - @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) - @property def local_ip6(self): """Local IPv6 address on VPP interface (string).""" return self._local_ip6 + @local_ip6.setter + def local_ip6(self, value): + self._local_ip6 = 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_ip6n(self): - """Local IPv6 address - raw, suitable as API parameter.""" - return socket.inet_pton(socket.AF_INET6, self.local_ip6) + def local_ip6_prefix(self): + """Local IPv4 prefix""" + return "%s/%d" % (self._local_ip6, self._local_ip6_len) @property def remote_ip6(self): """IPv6 address of remote peer "connected" to this interface.""" return self._remote_hosts[0].ip6 - @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) - @property def local_ip6_ll(self): """Local IPv6 link-local address on VPP interface (string).""" + if not self._local_ip6_ll: + self._local_ip6_ll = str( + self.test.vapi.sw_interface_ip6_get_link_local_address( + self.sw_if_index + ).ip + ) return self._local_ip6_ll - @property - def local_ip6n_ll(self): - """Local IPv6 link-local address - raw, suitable as API parameter.""" - return self._local_ip6n_ll - @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): - """Link-local IPv6 address of remote peer - - raw, suitable as API parameter""" - return self._remote_ip6n_ll - @property def name(self): """Name of the interface.""" @@ -170,8 +175,7 @@ class VppInterface(object): self._hosts_by_mac = {} self._hosts_by_ip4 = {} self._hosts_by_ip6 = {} - for i in range( - 2, count + 2): # 0: network address, 1: local vpp address + for i in range(2, count + 2): # 0: network address, 1: local vpp address 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) @@ -193,80 +197,71 @@ class VppInterface(object): def set_mac(self, mac): self._local_mac = str(mac) - self._local_ip6_ll = mk_ll_addr(self._local_mac) - self.test.vapi.sw_interface_set_mac_address( - self.sw_if_index, mac.packed) + self.test.vapi.sw_interface_set_mac_address(self.sw_if_index, mac.packed) + return self def set_sw_if_index(self, sw_if_index): + if sw_if_index > 255: + raise RuntimeError("Don't support sw_if_index values greater than 255.") 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_len = 24 self._local_ip4_subnet = "172.16.%u.0" % self.sw_if_index - self._local_ip4n_subnet = socket.inet_pton(socket.AF_INET, - self._local_ip4_subnet) self._local_ip4_bcast = "172.16.%u.255" % self.sw_if_index - self._local_ip4n_bcast = socket.inet_pton(socket.AF_INET, - self._local_ip4_bcast) - self.local_ip4_prefix_len = 24 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_len = 64 self.has_ip6_config = False self.ip6_table_id = 0 - self._local_addr = {socket.AF_INET: self.local_ip4, - socket.AF_INET6: self.local_ip6} - self._local_addr_n = {socket.AF_INET: self.local_ip4n, - socket.AF_INET6: self.local_ip6n} - self._remote_addr = {socket.AF_INET: self.remote_ip4, - socket.AF_INET6: self.remote_ip6} - self._remote_addr_n = {socket.AF_INET: self.remote_ip4n, - socket.AF_INET6: self.remote_ip6n} + 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() + 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].decode('utf8') - self._local_mac = mac_ntop(intf.l2_address) + self._name = intf.interface_name + self._local_mac = 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, moves.reprlib.repr(r))) - self._local_ip6_ll = mk_ll_addr(self.local_mac) - self._local_ip6n_ll = socket.inet_pton(socket.AF_INET6, - self.local_ip6_ll) + "in interface dump %s" % (self.sw_if_index, moves.reprlib.repr(r)) + ) self._remote_ip6_ll = mk_ll_addr(self.remote_mac) - self._remote_ip6n_ll = socket.inet_pton(socket.AF_INET6, - self.remote_ip6_ll) + self._local_ip6_ll = None 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_prefix + ) self.has_ip4_config = True + return self def unconfig_ip4(self): """Remove IPv4 address on the VPP interface.""" 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_prefix, is_add=0 + ) except AttributeError: self.has_ip4_config = False self.has_ip4_config = False + return self def configure_ipv4_neighbors(self): """For every remote host assign neighbor's MAC to IPv4 addresses. @@ -274,29 +269,28 @@ class VppInterface(object): :param vrf_id: The FIB table / VRF ID. (Default value = 0) """ for host in self._remote_hosts: - self.test.vapi.ip_neighbor_add_del(self.sw_if_index, - host.mac, - host.ip4) + self.test.vapi.ip_neighbor_add_del(self.sw_if_index, host.mac, host.ip4) + return self 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_prefix + ) self.has_ip6_config = True + return self def unconfig_ip6(self): """Remove IPv6 address on the VPP interface.""" 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_prefix, is_add=0 + ) except AttributeError: self.has_ip6_config = False self.has_ip6_config = False + return self def configure_ipv6_neighbors(self): """For every remote host assign neighbor's MAC to IPv6 addresses. @@ -304,14 +298,13 @@ class VppInterface(object): :param vrf_id: The FIB table / VRF ID. (Default value = 0) """ for host in self._remote_hosts: - self.test.vapi.ip_neighbor_add_del(self.sw_if_index, - host.mac, - host.ip6) + 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.""" self.unconfig_ip4() self.unconfig_ip6() + return self def set_table_ip4(self, table_id): """Set the interface in a IPv4 Table. @@ -319,8 +312,8 @@ class VppInterface(object): .. note:: Must be called before configuring IP4 addresses. """ self.ip4_table_id = table_id - self.test.vapi.sw_interface_set_table( - self.sw_if_index, 0, self.ip4_table_id) + self.test.vapi.sw_interface_set_table(self.sw_if_index, 0, self.ip4_table_id) + return self def set_table_ip6(self, table_id): """Set the interface in a IPv6 Table. @@ -328,109 +321,137 @@ class VppInterface(object): .. note:: Must be called before configuring IP6 addresses. """ self.ip6_table_id = table_id - self.test.vapi.sw_interface_set_table( - self.sw_if_index, 1, self.ip6_table_id) + self.test.vapi.sw_interface_set_table(self.sw_if_index, 1, self.ip6_table_id) + return self 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 + ) + return self 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) - - def ip6_ra_prefix(self, address, address_length, is_no=0, - off_link=0, no_autoconfig=0, use_default=0): - """Configure IPv6 RA suppress on the VPP interface.""" - self.test.vapi.ip6_sw_interface_ra_prefix(self.sw_if_index, - address, - address_length, - is_no=is_no, - off_link=off_link, - no_autoconfig=no_autoconfig, - use_default=use_default) + self.test.vapi.sw_interface_ip6nd_ra_config( + sw_if_index=self.sw_if_index, + is_no=no, + suppress=suppress, + send_unicast=send_unicast, + ) + return self + + 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 '
/