X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_mpls_tunnel_interface.py;h=6c8941a3f19d9cc166a44f1b5211c7e2afb5f685;hb=62af9bb645ac2fdb9777b823d55f5069258f736b;hp=c789c3f1dd0495c84f368ccdbd038c5352a4e1d8;hpb=31ed74407643595fdce206e9d7487108fb8b33ab;p=vpp.git

diff --git a/test/vpp_mpls_tunnel_interface.py b/test/vpp_mpls_tunnel_interface.py
index c789c3f1dd0..6c8941a3f19 100644
--- a/test/vpp_mpls_tunnel_interface.py
+++ b/test/vpp_mpls_tunnel_interface.py
@@ -1,7 +1,4 @@
-
 from vpp_interface import VppInterface
-from vpp_ip_route import VppRoutePath, VppMplsLabel
-import socket
 
 
 class VppMPLSTunnelInterface(VppInterface):
@@ -10,41 +7,40 @@ class VppMPLSTunnelInterface(VppInterface):
     """
 
     def __init__(self, test, paths, is_multicast=0, is_l2=0):
-        """ Create MPLS Tunnel interface """
-        self._sw_if_index = 0
+        """Create MPLS Tunnel interface"""
         super(VppMPLSTunnelInterface, self).__init__(test)
-        self._test = test
         self.t_paths = paths
         self.is_multicast = is_multicast
         self.is_l2 = is_l2
-
-    def add_vpp_config(self):
-        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(
-                self._sw_if_index,
-                1,  # IPv4 next-hop
-                path.nh_addr,
-                path.nh_itf,
-                path.nh_table_id,
-                path.weight,
-                next_hop_out_label_stack=lstack,
-                next_hop_n_out_labels=len(lstack),
-                is_multicast=self.is_multicast,
-                l2_only=self.is_l2)
-            self._sw_if_index = reply.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:
-            reply = 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_out_label_stack=path.nh_labels,
-                next_hop_n_out_labels=len(path.nh_labels),
-                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_tunnel.mt_sw_if_index
+                and self.tunnel_index == t.mt_tunnel.mt_tunnel_index
+            ):
+                return True
+        return False
+
+    def object_id(self):
+        return "mpls-tunnel%d-%d" % (self.tunnel_index, self.sw_if_index)