diff options
Diffstat (limited to 'test/vpp_mpls_tunnel_interface.py')
| -rw-r--r-- | test/vpp_mpls_tunnel_interface.py | 51 |
1 files changed, 16 insertions, 35 deletions
diff --git a/test/vpp_mpls_tunnel_interface.py b/test/vpp_mpls_tunnel_interface.py index 12f62fb4b51..598936136ad 100644 --- a/test/vpp_mpls_tunnel_interface.py +++ b/test/vpp_mpls_tunnel_interface.py @@ -13,50 +13,31 @@ class VppMPLSTunnelInterface(VppInterface): self.t_paths = paths self.is_multicast = is_multicast self.is_l2 = is_l2 - - def add_vpp_config(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( - 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) - sw_if_index = reply.sw_if_index - self.tunnel_index = reply.tunnel_index - self.set_sw_if_index(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: - 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_via_label=path.nh_via_label, - next_hop_out_label_stack=lstack, - next_hop_n_out_labels=len(lstack), - 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_sw_if_index and \ - self.tunnel_index == t.mt_tunnel_index: + 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 |