ipsec: Correctly rewind the buffer to the IP header when punting UDP encapped SPI...

[vpp.git] / test / vpp_interface.py

diff --git a/test/vpp_interface.py b/test/vpp_interface.py
index 6797b10..3611819 100644 (file)
--- a/test/vpp_interface.py
+++ b/test/vpp_interface.py
@@ -229,7 +229,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',
@@ -343,17 +343,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."""
@@ -365,6 +365,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,
@@ -421,7 +429,7 @@ 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):
@@ -455,3 +463,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]