MAP: Use explicit address/prefix types in API

[vpp.git] / test / vpp_mpls_tunnel_interface.py

diff --git a/test/vpp_mpls_tunnel_interface.py b/test/vpp_mpls_tunnel_interface.py
index c789c3f..a2ab1bf 100644 (file)
--- a/test/vpp_mpls_tunnel_interface.py
+++ b/test/vpp_mpls_tunnel_interface.py
@@ -1,7 +1,5 @@
 
 from vpp_interface import VppInterface
-from vpp_ip_route import VppRoutePath, VppMplsLabel
-import socket
 
 
 class VppMPLSTunnelInterface(VppInterface):
@@ -11,40 +9,60 @@ class VppMPLSTunnelInterface(VppInterface):
 
     def __init__(self, test, paths, is_multicast=0, is_l2=0):
         """ Create MPLS Tunnel interface """
-        self._sw_if_index = 0
         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
+        sw_if_index = 0xffffffff
         for path in self.t_paths:
             lstack = path.encode_labels()
 
             reply = self.test.vapi.mpls_tunnel_add_del(
-                self._sw_if_index,
+                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)
-            self._sw_if_index = reply.sw_if_index
+            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)
 
     def remove_vpp_config(self):
         for path in self.t_paths:
-            reply = self.test.vapi.mpls_tunnel_add_del(
+            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_out_label_stack=path.nh_labels,
-                next_hop_n_out_labels=len(path.nh_labels),
+                next_hop_via_label=path.nh_via_label,
+                next_hop_out_label_stack=lstack,
+                next_hop_n_out_labels=len(lstack),
                 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 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-%d" % (self.tunnel_index,
+                                      self.sw_if_index))