X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_gre_interface.py;h=998f6eab32b9fb1121ba88d9716a5715e569c3ea;hb=75e7d1301475d49311d14e202936c62df0c07d10;hp=1c71875f73a5f4b6b52b2e301e211b8a1000522b;hpb=7eac916e1b00d6a3393a09925e1634d71bf30568;p=vpp.git

diff --git a/test/vpp_gre_interface.py b/test/vpp_gre_interface.py
index 1c71875f73a..998f6eab32b 100644
--- a/test/vpp_gre_interface.py
+++ b/test/vpp_gre_interface.py
@@ -9,7 +9,7 @@ class VppGreInterface(VppInterface):
     """
 
     def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, is_teb=0):
-        """ Create VPP loopback interface """
+        """ Create VPP GRE interface """
         self._sw_if_index = 0
         super(VppGreInterface, self).__init__(test)
         self._test = test
@@ -26,14 +26,21 @@ class VppGreInterface(VppInterface):
                                               is_teb=self.t_is_teb)
         self._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,
+                                          is_add=0)
+
+    def __str__(self):
+        return self.object_id()
+
+    def object_id(self):
+        return "gre-%d" % self._sw_if_index
 
 
 class VppGre6Interface(VppInterface):
@@ -42,7 +49,7 @@ class VppGre6Interface(VppInterface):
     """
 
     def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, is_teb=0):
-        """ Create VPP loopback interface """
+        """ Create VPP GRE interface """
         self._sw_if_index = 0
         super(VppGre6Interface, self).__init__(test)
         self._test = test
@@ -60,12 +67,19 @@ class VppGre6Interface(VppInterface):
                                               is_ip6=1)
         self._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,
+                                          is_add=0,
+                                          is_ip6=1)
+
+    def __str__(self):
+        return self.object_id()
+
+    def object_id(self):
+        return "gre-%d" % self._sw_if_index