Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
GBP Endpoint Updates
[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
..
b125f3c
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_interface import VppInterface
-from vpp_ip_route import VppRoutePath, VppMplsLabel
-import socket
class VppMPLSTunnelInterface(VppInterface):
class VppMPLSTunnelInterface(VppInterface):
@@
-11,40
+9,41
@@
class VppMPLSTunnelInterface(VppInterface):
def __init__(self, test, paths, is_multicast=0, is_l2=0):
""" Create MPLS Tunnel interface """
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)
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.t_paths = paths
self.is_multicast = is_multicast
self.is_l2 = is_l2
def add_vpp_config(self):
- s
elf._s
w_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(
for path in self.t_paths:
lstack = path.encode_labels()
reply = self.test.vapi.mpls_tunnel_add_del(
- s
elf._s
w_if_index,
+ sw_if_index,
1, # IPv4 next-hop
path.nh_addr,
path.nh_itf,
path.nh_table_id,
path.weight,
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)
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.set_sw_if_index(sw_if_index)
def remove_vpp_config(self):
for path in self.t_paths:
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,
path.nh_itf,
path.nh_table_id,
path.weight,
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=path.nh_labels,
next_hop_n_out_labels=len(path.nh_labels),
is_add=0)
next_hop_out_label_stack=path.nh_labels,
next_hop_n_out_labels=len(path.nh_labels),
is_add=0)