make test: VPP-1288 fix bogus sw_if_index values

Change-Id: I9a61538f4c832f09269c6ddfcd55f909003b8694
Signed-off-by: Klement Sekera <ksekera@cisco.com>

diff --git a/test/vpp_mpls_tunnel_interface.py b/test/vpp_mpls_tunnel_interface.py
index c789c3f..2e0ed67 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,20 +9,18 @@ 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,
@@ -34,11 +30,13 @@ class VppMPLSTunnelInterface(VppInterface):
                 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._sw_if_index = sw_if_index
+        super(VppMPLSTunnelInterface, self).__init__(self.test)
 
     def remove_vpp_config(self):
         for path in self.t_paths:
-            reply = self.test.vapi.mpls_tunnel_add_del(
+            self.test.vapi.mpls_tunnel_add_del(
                 self.sw_if_index,
                 1,  # IPv4 next-hop
                 path.nh_addr,