From f5fa5ae2b021f946fbb8ec56e692459cd34bc7fb Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Wed, 26 Sep 2018 05:07:25 -0700 Subject: MPLS tunnel dump: use sw_if_index not tunnel_index Change-Id: I6c0d5aec6ee96a0d40358f0e09a0901b22265063 Signed-off-by: Neale Ranns --- test/vpp_mpls_tunnel_interface.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'test/vpp_mpls_tunnel_interface.py') diff --git a/test/vpp_mpls_tunnel_interface.py b/test/vpp_mpls_tunnel_interface.py index 3cbf856dfc5..a2ab1bf27cb 100644 --- a/test/vpp_mpls_tunnel_interface.py +++ b/test/vpp_mpls_tunnel_interface.py @@ -32,6 +32,7 @@ class VppMPLSTunnelInterface(VppInterface): is_multicast=self.is_multicast, l2_only=self.is_l2) 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) @@ -54,7 +55,8 @@ class VppMPLSTunnelInterface(VppInterface): 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_sw_if_index and \ + self.tunnel_index == t.mt_tunnel_index: return True return False @@ -62,4 +64,5 @@ class VppMPLSTunnelInterface(VppInterface): 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)) -- cgit 1.2.3-korg