X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_gre_interface.py;h=a40e8531a6198de932e48fa09295e38cbe6c76bc;hb=853cc9f2ad3ee52cbdd891fb09d51c25678baed0;hp=acfd348d64f141c6db191691c7779bd4e0ee9e3a;hpb=33ce60d6759bbbfebb7d489aa591b696e140d870;p=vpp.git

diff --git a/test/vpp_gre_interface.py b/test/vpp_gre_interface.py
index acfd348d64f..a40e8531a61 100644
--- a/test/vpp_gre_interface.py
+++ b/test/vpp_gre_interface.py
@@ -1,6 +1,5 @@
-
 from vpp_interface import VppInterface
-import socket
+from vpp_papi import VppEnum
 
 
 class VppGreInterface(VppInterface):
@@ -8,64 +7,76 @@ class VppGreInterface(VppInterface):
     VPP GRE interface
     """
 
-    def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, is_teb=0):
-        """ Create VPP GRE interface """
-        self._sw_if_index = 0
+    def __init__(
+        self,
+        test,
+        src_ip,
+        dst_ip,
+        outer_table_id=0,
+        type=None,
+        mode=None,
+        flags=0,
+        session=0,
+    ):
+        """Create VPP GRE interface"""
         super(VppGreInterface, self).__init__(test)
-        self._test = test
         self.t_src = src_ip
         self.t_dst = dst_ip
-        self.t_outer_fib = outer_fib_id
-        self.t_is_teb = is_teb
+        self.t_outer_table = outer_table_id
+        self.t_session = session
+        self.t_flags = flags
+        self.t_type = type
+        if not self.t_type:
+            self.t_type = VppEnum.vl_api_gre_tunnel_type_t.GRE_API_TUNNEL_TYPE_L3
+        self.t_mode = mode
+        if not self.t_mode:
+            self.t_mode = VppEnum.vl_api_tunnel_mode_t.TUNNEL_API_MODE_P2P
 
     def add_vpp_config(self):
-        s = socket.inet_pton(socket.AF_INET, self.t_src)
-        d = socket.inet_pton(socket.AF_INET, self.t_dst)
-        r = self.test.vapi.gre_tunnel_add_del(s, d,
-                                              outer_fib_id=self.t_outer_fib,
-                                              is_teb=self.t_is_teb)
-        self._sw_if_index = r.sw_if_index
+        r = self.test.vapi.gre_tunnel_add_del(
+            is_add=1,
+            tunnel={
+                "src": self.t_src,
+                "dst": self.t_dst,
+                "outer_table_id": self.t_outer_table,
+                "instance": 0xFFFFFFFF,
+                "type": self.t_type,
+                "mode": self.t_mode,
+                "flags": self.t_flags,
+                "session_id": self.t_session,
+            },
+        )
+        self.set_sw_if_index(r.sw_if_index)
         self.generate_remote_hosts()
+        self.test.registry.register(self, self.test.logger)
+        return self
 
     def remove_vpp_config(self):
-        s = socket.inet_pton(socket.AF_INET, self.t_src)
-        d = socket.inet_pton(socket.AF_INET, self.t_dst)
         self.unconfig()
-        r = self.test.vapi.gre_tunnel_add_del(s, d,
-                                              outer_fib_id=self.t_outer_fib,
-                                              is_add=0)
+        self.test.vapi.gre_tunnel_add_del(
+            is_add=0,
+            tunnel={
+                "src": self.t_src,
+                "dst": self.t_dst,
+                "outer_table_id": self.t_outer_table,
+                "instance": 0xFFFFFFFF,
+                "type": self.t_type,
+                "mode": self.t_mode,
+                "flags": self.t_flags,
+                "session_id": self.t_session,
+            },
+        )
 
+    def object_id(self):
+        return "gre-%d" % self.sw_if_index
 
-class VppGre6Interface(VppInterface):
-    """
-    VPP GRE IPv6 interface
-    """
-
-    def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, is_teb=0):
-        """ Create VPP GRE interface """
-        self._sw_if_index = 0
-        super(VppGre6Interface, self).__init__(test)
-        self._test = test
-        self.t_src = src_ip
-        self.t_dst = dst_ip
-        self.t_outer_fib = outer_fib_id
-        self.t_is_teb = is_teb
+    def query_vpp_config(self):
+        return self.test.vapi.gre_tunnel_dump(sw_if_index=self._sw_if_index)
 
-    def add_vpp_config(self):
-        s = socket.inet_pton(socket.AF_INET6, self.t_src)
-        d = socket.inet_pton(socket.AF_INET6, self.t_dst)
-        r = self.test.vapi.gre_tunnel_add_del(s, d,
-                                              outer_fib_id=self.t_outer_fib,
-                                              is_teb=self.t_is_teb,
-                                              is_ip6=1)
-        self._sw_if_index = r.sw_if_index
-        self.generate_remote_hosts()
+    @property
+    def remote_ip(self):
+        return self.t_dst
 
-    def remove_vpp_config(self):
-        s = socket.inet_pton(socket.AF_INET6, self.t_src)
-        d = socket.inet_pton(socket.AF_INET6, self.t_dst)
-        self.unconfig()
-        r = self.test.vapi.gre_tunnel_add_del(s, d,
-                                              outer_fib_id=self.t_outer_fib,
-                                              is_add=0,
-                                              is_ip6=1)
+    @property
+    def local_ip(self):
+        return self.t_src