X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_mpls_tunnel_interface.py;h=12f62fb4b5126b6f4bace07313535fbf4bebf9d7;hb=524fb8d65b7a75e6a5b6fd94db44a3fb42d780ac;hp=3cbf856dfc501b28519b369f2f72d71c7a12a46a;hpb=6a30b5f9182a44989e97bbc044f29adccdef09b2;p=vpp.git

diff --git a/test/vpp_mpls_tunnel_interface.py b/test/vpp_mpls_tunnel_interface.py
index 3cbf856dfc5..12f62fb4b51 100644
--- a/test/vpp_mpls_tunnel_interface.py
+++ b/test/vpp_mpls_tunnel_interface.py
@@ -32,6 +32,7 @@ class VppMPLSTunnelInterface(VppInterface):
                 is_multicast=self.is_multicast,
                 l2_only=self.is_l2)
             sw_if_index = reply.sw_if_index
+            self.tunnel_index = reply.tunnel_index
         self.set_sw_if_index(sw_if_index)
         self._test.registry.register(self, self._test.logger)
 
@@ -54,12 +55,11 @@ class VppMPLSTunnelInterface(VppInterface):
     def query_vpp_config(self):
         dump = self._test.vapi.mpls_tunnel_dump()
         for t in dump:
-            if self.sw_if_index == t.mt_sw_if_index:
+            if self.sw_if_index == t.mt_sw_if_index and \
+               self.tunnel_index == t.mt_tunnel_index:
                 return True
         return False
 
-    def __str__(self):
-        return self.object_id()
-
     def object_id(self):
-        return ("mpls-tunnel%d" % self.sw_if_index)
+        return ("mpls-tunnel%d-%d" % (self.tunnel_index,
+                                      self.sw_if_index))