X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_mpls_tunnel_interface.py;h=598936136ad63d4bb8b490639ad6058a06fce4c2;hb=097fa66b986f06281f603767d321ab13ab6c88c3;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..598936136ad 100644
--- a/test/vpp_mpls_tunnel_interface.py
+++ b/test/vpp_mpls_tunnel_interface.py
@@ -13,53 +13,34 @@ class VppMPLSTunnelInterface(VppInterface):
         self.t_paths = paths
         self.is_multicast = is_multicast
         self.is_l2 = is_l2
-
-    def add_vpp_config(self):
-        sw_if_index = 0xffffffff
+        self.encoded_paths = []
         for path in self.t_paths:
-            lstack = path.encode_labels()
+            self.encoded_paths.append(path.encode())
 
-            reply = self.test.vapi.mpls_tunnel_add_del(
-                sw_if_index,
-                1,  # IPv4 next-hop
-                path.nh_addr,
-                path.nh_itf,
-                path.nh_table_id,
-                path.weight,
-                next_hop_via_label=path.nh_via_label,
-                next_hop_out_label_stack=lstack,
-                next_hop_n_out_labels=len(lstack),
-                is_multicast=self.is_multicast,
-                l2_only=self.is_l2)
-            sw_if_index = reply.sw_if_index
-        self.set_sw_if_index(sw_if_index)
+    def add_vpp_config(self):
+        reply = self.test.vapi.mpls_tunnel_add_del(
+            0xffffffff,
+            self.encoded_paths,
+            is_multicast=self.is_multicast,
+            l2_only=self.is_l2)
+        self.set_sw_if_index(reply.sw_if_index)
+        self.tunnel_index = reply.tunnel_index
         self._test.registry.register(self, self._test.logger)
 
     def remove_vpp_config(self):
-        for path in self.t_paths:
-            lstack = path.encode_labels()
-
-            self.test.vapi.mpls_tunnel_add_del(
-                self.sw_if_index,
-                1,  # IPv4 next-hop
-                path.nh_addr,
-                path.nh_itf,
-                path.nh_table_id,
-                path.weight,
-                next_hop_via_label=path.nh_via_label,
-                next_hop_out_label_stack=lstack,
-                next_hop_n_out_labels=len(lstack),
-                is_add=0)
+        reply = self.test.vapi.mpls_tunnel_add_del(
+            self.sw_if_index,
+            self.encoded_paths,
+            is_add=0)
 
     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_tunnel.mt_sw_if_index and \
+               self.tunnel_index == t.mt_tunnel.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))