X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_interface.py;h=cee6ea4f0807266942be079e8cde747e7afd3a67;hb=d9b0c6fbf7aa5bd9af84264105b39c82028a4a29;hp=f92dc8e594f296266ae2db665e03d2ed7ff85c96;hpb=5d440d9cb6a51c6658f4be855008b91f05d294c6;p=vpp.git diff --git a/test/vpp_interface.py b/test/vpp_interface.py index f92dc8e594f..cee6ea4f080 100644 --- a/test/vpp_interface.py +++ b/test/vpp_interface.py @@ -2,9 +2,6 @@ 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, VppEnum from ipaddress import IPv4Network, IPv6Network @@ -15,8 +12,7 @@ except NameError: text_type = str -@six.add_metaclass(abc.ABCMeta) -class VppInterface(object): +class VppInterface(metaclass=abc.ABCMeta): """Generic VPP interface.""" @property @@ -53,7 +49,7 @@ class VppInterface(object): @property def local_ip4_prefix_len(self): - """Local IPv4 prefix length """ + """Local IPv4 prefix length""" return self._local_ip4_len @local_ip4_prefix_len.setter @@ -62,26 +58,14 @@ class VppInterface(object): @property def local_ip4_prefix(self): - """Local IPv4 prefix """ - return ("%s/%d" % (self._local_ip4, self._local_ip4_len)) - - @property - def local_ip4n(self): - """DEPRECATED """ - """Local IPv4 address - raw, suitable as API parameter.""" - return socket.inet_pton(socket.AF_INET, self._local_ip4) + """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): - """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).""" @@ -93,7 +77,7 @@ class VppInterface(object): @property def local_ip6_prefix_len(self): - """Local IPv6 prefix length """ + """Local IPv6 prefix length""" return self._local_ip6_len @local_ip6_prefix_len.setter @@ -102,49 +86,31 @@ class VppInterface(object): @property def local_ip6_prefix(self): - """Local IPv4 prefix """ - return ("%s/%d" % (self._local_ip6, self._local_ip6_len)) - - @property - def local_ip6n(self): - """DEPRECATED """ - """Local IPv6 address - raw, suitable as API parameter.""" - return socket.inet_pton(socket.AF_INET6, self._local_ip6) + """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): - """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).""" + 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): - """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): """Name of the interface.""" @@ -209,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) @@ -232,14 +197,12 @@ 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.") + raise RuntimeError("Don't support sw_if_index values greater than 255.") self._sw_if_index = sw_if_index self.generate_remote_hosts() @@ -256,10 +219,14 @@ class VppInterface(object): 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._remote_addr = {socket.AF_INET: self.remote_ip4, - socket.AF_INET6: self.remote_ip6} + 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: @@ -271,27 +238,30 @@ class VppInterface(object): 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) + "in interface dump %s" % (self.sw_if_index, moves.reprlib.repr(r)) + ) self._remote_ip6_ll = mk_ll_addr(self.remote_mac) + self._local_ip6_ll = None def config_ip4(self): """Configure IPv4 address on the VPP interface.""" self.test.vapi.sw_interface_add_del_address( - sw_if_index=self.sw_if_index, prefix=self.local_ip4_prefix) + 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( - sw_if_index=self.sw_if_index, - prefix=self.local_ip4_prefix, 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. @@ -299,26 +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( - sw_if_index=self.sw_if_index, prefix=self.local_ip6_prefix) + 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( - sw_if_index=self.sw_if_index, - prefix=self.local_ip6_prefix, 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. @@ -326,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. @@ -341,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. @@ -350,14 +321,15 @@ 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_ip6nd_ra_config( - sw_if_index=self.sw_if_index, - suppress=1) + 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.""" @@ -365,10 +337,13 @@ class VppInterface(object): sw_if_index=self.sw_if_index, is_no=no, suppress=suppress, - send_unicast=send_unicast) + send_unicast=send_unicast, + ) + return self - def ip6_ra_prefix(self, prefix, is_no=0, - off_link=0, no_autoconfig=0, use_default=0): + 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 '
/' @@ -378,19 +353,24 @@ class VppInterface(object): sw_if_index=self.sw_if_index, prefix=prefix, use_default=use_default, - off_link=off_link, no_autoconfig=no_autoconfig, - is_no=is_no) + off_link=off_link, + no_autoconfig=no_autoconfig, + is_no=is_no, + ) + return self def admin_up(self): """Put interface ADMIN-UP.""" self.test.vapi.sw_interface_set_flags( self.sw_if_index, - flags=VppEnum.vl_api_if_status_flags_t.IF_STATUS_API_FLAG_ADMIN_UP) + flags=VppEnum.vl_api_if_status_flags_t.IF_STATUS_API_FLAG_ADMIN_UP, + ) + return self def admin_down(self): """Put interface ADMIN-down.""" - self.test.vapi.sw_interface_set_flags(self.sw_if_index, - flags=0) + self.test.vapi.sw_interface_set_flags(self.sw_if_index, flags=0) + return self def link_up(self): """Put interface link-state-UP.""" @@ -402,59 +382,65 @@ class VppInterface(object): def ip6_enable(self): """IPv6 Enable interface""" - self.test.vapi.sw_interface_ip6_enable_disable(self.sw_if_index, - enable=1) + self.test.vapi.sw_interface_ip6_enable_disable(self.sw_if_index, enable=1) + return self def ip6_disable(self): """Put interface ADMIN-DOWN.""" - self.test.vapi.sw_interface_ip6_enable_disable(self.sw_if_index, - enable=0) + self.test.vapi.sw_interface_ip6_enable_disable(self.sw_if_index, enable=0) + return self def add_sub_if(self, sub_if): """Register a sub-interface with this interface. :param sub_if: sub-interface """ - if not hasattr(self, 'sub_if'): + if not hasattr(self, "sub_if"): self.sub_if = sub_if else: if isinstance(self.sub_if, list): self.sub_if.append(sub_if) else: self.sub_if = sub_if + return self def enable_mpls(self): """Enable MPLS on the VPP interface.""" self.test.vapi.sw_interface_set_mpls_enable(self.sw_if_index) + return self def disable_mpls(self): """Enable MPLS on the VPP interface.""" self.test.vapi.sw_interface_set_mpls_enable(self.sw_if_index, 0) + return self def is_ip4_entry_in_fib_dump(self, dump): for i in dump: - n = IPv4Network(text_type("%s/%d" % (self.local_ip4, - self.local_ip4_prefix_len))) - if i.route.prefix == n and \ - i.route.table_id == self.ip4_table_id: + n = IPv4Network( + text_type("%s/%d" % (self.local_ip4, self.local_ip4_prefix_len)) + ) + if i.route.prefix == n and i.route.table_id == self.ip4_table_id: return True return False def set_unnumbered(self, ip_sw_if_index): - """ Set the interface to unnumbered via ip_sw_if_index """ - self.test.vapi.sw_interface_set_unnumbered(ip_sw_if_index, - self.sw_if_index) + """Set the interface to unnumbered via ip_sw_if_index""" + self.test.vapi.sw_interface_set_unnumbered(ip_sw_if_index, self.sw_if_index) + return self def unset_unnumbered(self, ip_sw_if_index): - """ Unset the interface to unnumbered via ip_sw_if_index """ - self.test.vapi.sw_interface_set_unnumbered(ip_sw_if_index, - self.sw_if_index, is_add=0) + """Unset the interface to unnumbered via ip_sw_if_index""" + self.test.vapi.sw_interface_set_unnumbered( + ip_sw_if_index, self.sw_if_index, is_add=0 + ) + return self def set_proxy_arp(self, enable=1): - """ Set the interface to enable/disable Proxy ARP """ + """Set the interface to enable/disable Proxy ARP""" self.test.vapi.proxy_arp_intfc_enable_disable( - self.sw_if_index, - enable) + sw_if_index=self.sw_if_index, enable=enable + ) + return self def query_vpp_config(self): dump = self.test.vapi.sw_interface_dump(sw_if_index=self.sw_if_index) @@ -462,8 +448,10 @@ class VppInterface(object): def get_interface_config_from_dump(self, dump): for i in dump: - if i.interface_name.rstrip(' \t\r\n\0') == self.name and \ - i.sw_if_index == self.sw_if_index: + if ( + i.interface_name.rstrip(" \t\r\n\0") == self.name + and i.sw_if_index == self.sw_if_index + ): return i else: return None @@ -471,43 +459,38 @@ class VppInterface(object): def is_interface_config_in_dump(self, dump): return self.get_interface_config_from_dump(dump) is not None - def assert_interface_state(self, admin_up_down, link_up_down, - expect_event=False): + def assert_interface_state(self, admin_up_down, link_up_down, expect_event=False): if expect_event: - event = self.test.vapi.wait_for_event(timeout=1, - name='sw_interface_event') - self.test.assert_equal(event.sw_if_index, self.sw_if_index, - "sw_if_index") - self.test.assert_equal((event.flags & 1), admin_up_down, - "admin state") - self.test.assert_equal((event.flags & 2), link_up_down, - "link state") + event = self.test.vapi.wait_for_event(timeout=1, name="sw_interface_event") + self.test.assert_equal(event.sw_if_index, self.sw_if_index, "sw_if_index") + self.test.assert_equal((event.flags & 1), admin_up_down, "admin state") + self.test.assert_equal((event.flags & 2), link_up_down, "link state") dump = self.test.vapi.sw_interface_dump() if_state = self.get_interface_config_from_dump(dump) - self.test.assert_equal((if_state.flags & 1), admin_up_down, - "admin state") - self.test.assert_equal((if_state.flags & 2), link_up_down, - "link state") + self.test.assert_equal((if_state.flags & 1), admin_up_down, "admin state") + self.test.assert_equal((if_state.flags & 2), link_up_down, "link state") def __str__(self): return self.name def get_rx_stats(self): - c = self.test.statistics.get_counter("^/if/rx$") - return c[0][self.sw_if_index] + return self.test.statistics["/if/rx"][:, self.sw_if_index].sum_packets() def get_tx_stats(self): - c = self.test.statistics.get_counter("^/if/tx$") - return c[0][self.sw_if_index] + return self.test.statistics["/if/tx"][:, self.sw_if_index].sum_packets() def set_l3_mtu(self, mtu): self.test.vapi.sw_interface_set_mtu(self.sw_if_index, [mtu, 0, 0, 0]) + return self def set_ip4_mtu(self, mtu): self.test.vapi.sw_interface_set_mtu(self.sw_if_index, [0, mtu, 0, 0]) + return self def set_ip6_mtu(self, mtu): self.test.vapi.sw_interface_set_mtu(self.sw_if_index, [0, 0, mtu, 0]) + return self def set_mpls_mtu(self, mtu): self.test.vapi.sw_interface_set_mtu(self.sw_if_index, [0, 0, 0, mtu]) + return self