IPIP: Add IP{v4,v6} over IP{v4,v6} configured tunnel support.

[vpp.git] / test / vpp_papi_provider.py

diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py
index 18bb1f6..22c6a0d 100644 (file)
--- a/test/vpp_papi_provider.py
+++ b/test/vpp_papi_provider.py
@@ -3202,21 +3202,35 @@ class VppPapiProvider(object):
         """ GBP contract Dump """
         return self.api(self.papi.gbp_contract_dump, {})
 
-    def sixrd_add_tunnel(self, fib_index, ip6_prefix, ip6_prefix_len,
-                         ip4_prefix, ip4_prefix_len, ip4_src, mtu,
-                         security_check):
+    def ipip_6rd_add_tunnel(self, fib_index, ip6_prefix, ip6_prefix_len,
+                            ip4_prefix, ip4_prefix_len, ip4_src,
+                            security_check):
         """ 6RD tunnel Add """
-        return self.api(self.papi.sixrd_add_tunnel,
+        return self.api(self.papi.ipip_6rd_add_tunnel,
                         {'fib_index': fib_index,
                          'ip6_prefix': ip6_prefix,
                          'ip6_prefix_len': ip6_prefix_len,
                          'ip4_prefix': ip4_prefix,
                          'ip4_prefix_len': ip4_prefix_len,
                          'ip4_src': ip4_src,
-                         'mtu': mtu,
                          'security_check': security_check})
 
-    def sixrd_del_tunnel(self, sw_if_index):
+    def ipip_6rd_del_tunnel(self, sw_if_index):
         """ 6RD tunnel Delete """
-        return self.api(self.papi.sixrd_del_tunnel,
+        return self.api(self.papi.ipip_6rd_del_tunnel,
+                        {'sw_if_index': sw_if_index})
+
+    def ipip_add_tunnel(self, src_address, dst_address, is_ipv6=1,
+                        instance=0xFFFFFFFF, fib_index=0):
+        """ IPIP tunnel Add/Del """
+        return self.api(self.papi.ipip_add_tunnel,
+                        {'is_ipv6': is_ipv6,
+                         'instance': instance,
+                         'src_address': src_address,
+                         'dst_address': dst_address,
+                         'fib_index': fib_index})
+
+    def ipip_del_tunnel(self, sw_if_index):
+        """ IPIP tunnel Delete """
+        return self.api(self.papi.ipip_del_tunnel,
                         {'sw_if_index': sw_if_index})