SR-MPLS: fixes and tests

[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 2e0ed67..b125f3c 100644 (file)
--- a/test/vpp_mpls_tunnel_interface.py
+++ b/test/vpp_mpls_tunnel_interface.py
@@ -9,7 +9,7 @@ class VppMPLSTunnelInterface(VppInterface):
 
     def __init__(self, test, paths, is_multicast=0, is_l2=0):
         """ Create MPLS Tunnel interface """
-        self._test = test
+        super(VppMPLSTunnelInterface, self).__init__(test)
         self.t_paths = paths
         self.is_multicast = is_multicast
         self.is_l2 = is_l2
@@ -26,13 +26,13 @@ class VppMPLSTunnelInterface(VppInterface):
                 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._sw_if_index = sw_if_index
-        super(VppMPLSTunnelInterface, self).__init__(self.test)
+        self.set_sw_if_index(sw_if_index)
 
     def remove_vpp_config(self):
         for path in self.t_paths:
@@ -43,6 +43,7 @@ class VppMPLSTunnelInterface(VppInterface):
                 path.nh_itf,
                 path.nh_table_id,
                 path.weight,
+                next_hop_via_label=path.nh_via_label,
                 next_hop_out_label_stack=path.nh_labels,
                 next_hop_n_out_labels=len(path.nh_labels),
                 is_add=0)