fib: fib api updates

[vpp.git] / test / vpp_interface.py

diff --git a/test/vpp_interface.py b/test/vpp_interface.py
index b6f3a91..7b9de82 100644 (file)
--- a/test/vpp_interface.py
+++ b/test/vpp_interface.py
@@ -7,6 +7,12 @@ from six import moves
 
 from util import Host, mk_ll_addr
 from vpp_papi import mac_ntop
+from ipaddress import IPv4Network
+
+try:
+    text_type = unicode
+except NameError:
+    text_type = str
 
 
 @six.add_metaclass(abc.ABCMeta)
@@ -229,7 +235,7 @@ class VppInterface(object):
         self._remote_addr_n = {socket.AF_INET: self.remote_ip4n,
                                socket.AF_INET6: self.remote_ip6n}
 
-        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',
@@ -252,7 +258,8 @@ class VppInterface(object):
     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, address=self.local_ip4n,
+            address_length=self.local_ip4_prefix_len)
         self.has_ip4_config = True
 
     def unconfig_ip4(self):
@@ -260,10 +267,8 @@ 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, address=self.local_ip4n,
+                    address_length=self.local_ip4_prefix_len, is_add=0)
         except AttributeError:
             self.has_ip4_config = False
         self.has_ip4_config = False
@@ -281,8 +286,8 @@ class VppInterface(object):
     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, address=self._local_ip6n,
+            address_length=self.local_ip6_prefix_len, is_ipv6=1)
         self.has_ip6_config = True
 
     def unconfig_ip6(self):
@@ -290,10 +295,9 @@ 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, address=self.local_ip6n,
+                    address_length=self.local_ip6_prefix_len, is_ipv6=1,
+                    is_add=0)
         except AttributeError:
             self.has_ip6_config = False
         self.has_ip6_config = False
@@ -345,17 +349,17 @@ class VppInterface(object):
             suppress=suppress,
             send_unicast=send_unicast)
 
+    # TODO: This should accept ipaddress object.
     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.sw_interface_ip6nd_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)
+            sw_if_index=self.sw_if_index,
+            prefix={'address': address,
+                    'address_length': address_length},
+            use_default=use_default,
+            off_link=off_link, no_autoconfig=no_autoconfig,
+            is_no=is_no)
 
     def admin_up(self):
         """Put interface ADMIN-UP."""
@@ -367,6 +371,14 @@ class VppInterface(object):
         self.test.vapi.sw_interface_set_flags(self.sw_if_index,
                                               admin_up_down=0)
 
+    def link_up(self):
+        """Put interface link-state-UP."""
+        self.test.vapi.cli("test interface link-state %s up" % self.name)
+
+    def link_down(self):
+        """Put interface link-state-down."""
+        self.test.vapi.cli("test interface link-state %s down" % self.name)
+
     def ip6_enable(self):
         """IPv6 Enable interface"""
         self.test.vapi.sw_interface_ip6_enable_disable(self.sw_if_index,
@@ -392,34 +404,30 @@ class VppInterface(object):
 
     def enable_mpls(self):
         """Enable MPLS on the VPP interface."""
-        self.test.vapi.sw_interface_set_mpls_enable(
-            self.sw_if_index)
+        self.test.vapi.sw_interface_set_mpls_enable(self.sw_if_index)
 
     def disable_mpls(self):
         """Enable MPLS on the VPP interface."""
-        self.test.vapi.sw_interface_set_mpls_enable(
-            self.sw_if_index, 0)
+        self.test.vapi.sw_interface_set_mpls_enable(self.sw_if_index, 0)
 
     def is_ip4_entry_in_fib_dump(self, dump):
         for i in dump:
-            if i.address == self.local_ip4n and \
-               i.address_length == self.local_ip4_prefix_len and \
-               i.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(
-            self.sw_if_index,
-            ip_sw_if_index)
+        self.test.vapi.sw_interface_set_unnumbered(ip_sw_if_index,
+                                                   self.sw_if_index)
 
     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(
-            self.sw_if_index,
-            ip_sw_if_index,
-            is_add=0)
+        self.test.vapi.sw_interface_set_unnumbered(ip_sw_if_index,
+                                                   self.sw_if_index, is_add=0)
 
     def set_proxy_arp(self, enable=1):
         """ Set the interface to enable/disable Proxy ARP """
@@ -428,13 +436,13 @@ class VppInterface(object):
             enable)
 
     def query_vpp_config(self):
-        dump = self.test.vapi.sw_interface_dump()
+        dump = self.test.vapi.sw_interface_dump(sw_if_index=self.sw_if_index)
         return self.is_interface_config_in_dump(dump)
 
     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:
+                    i.sw_if_index == self.sw_if_index:
                 return i
         else:
             return None
@@ -462,3 +470,11 @@ class VppInterface(object):
 
     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]
+
+    def get_tx_stats(self):
+        c = self.test.statistics.get_counter("^/if/tx$")
+        return c[0][self.sw_if_index]