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

diff --git a/test/vpp_gre_interface.py b/test/vpp_gre_interface.py
index acfd348d64f..d5a40eeb03d 100644
--- a/test/vpp_gre_interface.py
+++ b/test/vpp_gre_interface.py
@@ -8,32 +8,42 @@ class VppGreInterface(VppInterface):
     VPP GRE interface
     """
 
-    def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, is_teb=0):
+    def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, type=0,
+                 session=0):
         """ Create VPP GRE interface """
-        self._sw_if_index = 0
         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_type = type
+        self.t_session = session
 
     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
+                                              tunnel_type=self.t_type,
+                                              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)
 
     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(s, d,
+                                          outer_fib_id=self.t_outer_fib,
+                                          tunnel_type=self.t_type,
+                                          session_id=self.t_session,
+                                          is_add=0)
+
+    def __str__(self):
+        return self.object_id()
+
+    def object_id(self):
+        return "gre-%d" % self.sw_if_index
 
 
 class VppGre6Interface(VppInterface):
@@ -41,31 +51,41 @@ class VppGre6Interface(VppInterface):
     VPP GRE IPv6 interface
     """
 
-    def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, is_teb=0):
+    def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, type=0,
+                 session=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
+        self.t_type = type
+        self.t_session = session
 
     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,
+                                              tunnel_type=self.t_type,
+                                              session_id=self.t_session,
                                               is_ip6=1)
-        self._sw_if_index = r.sw_if_index
+        self.set_sw_if_index(r.sw_if_index)
         self.generate_remote_hosts()
+        self.test.registry.register(self, self.test.logger)
 
     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)
+        self.test.vapi.gre_tunnel_add_del(s, d,
+                                          outer_fib_id=self.t_outer_fib,
+                                          tunnel_type=self.t_type,
+                                          session_id=self.t_session,
+                                          is_add=0,
+                                          is_ip6=1)
+
+    def __str__(self):
+        return self.object_id()
+
+    def object_id(self):
+        return "gre-%d" % self._sw_if_index