Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
VCL: cleanup namespace_secret env-var cfg code.
[vpp.git]
/
test
/
vpp_bier.py
diff --git
a/test/vpp_bier.py
b/test/vpp_bier.py
index
58c4f72
..
ef9a9ab
100644
(file)
--- a/
test/vpp_bier.py
+++ b/
test/vpp_bier.py
@@
-4,6
+4,7
@@
import socket
from vpp_object import VppObject
import socket
from vpp_object import VppObject
+from vpp_ip_route import MPLS_LABEL_INVALID, VppRoutePath
class BIER_HDR_PAYLOAD:
class BIER_HDR_PAYLOAD:
@@
-18,7
+19,7
@@
class BIER_HDR_PAYLOAD:
class VppBierTableID():
class VppBierTableID():
- def __init__(self, s
et_id, sub_domain
_id, hdr_len_id):
+ def __init__(self, s
ub_domain_id, set
_id, hdr_len_id):
self.set_id = set_id
self.sub_domain_id = sub_domain_id
self.hdr_len_id = hdr_len_id
self.set_id = set_id
self.sub_domain_id = sub_domain_id
self.hdr_len_id = hdr_len_id
@@
-113,22
+114,17
@@
class VppBierRoute(VppObject):
BIER route
"""
BIER route
"""
- def __init__(self, test, tbl_id, bp, nh, out_label,
- disp_table=0):
+ def __init__(self, test, tbl_id, bp, paths):
self._test = test
self.tbl_id = tbl_id
self._test = test
self.tbl_id = tbl_id
- self.out_label = out_label
self.bp = bp
self.bp = bp
- self.disp_table = disp_table
- self.nh = socket.inet_pton(socket.AF_INET, nh)
+ self.paths = paths
def add_vpp_config(self):
self._test.vapi.bier_route_add_del(
self.tbl_id,
self.bp,
def add_vpp_config(self):
self._test.vapi.bier_route_add_del(
self.tbl_id,
self.bp,
- self.nh,
- self.out_label,
- self.disp_table,
+ self.paths,
is_add=1)
self._test.registry.register(self, self._test.logger)
is_add=1)
self._test.registry.register(self, self._test.logger)
@@
-136,9
+132,7
@@
class VppBierRoute(VppObject):
self._test.vapi.bier_route_add_del(
self.tbl_id,
self.bp,
self._test.vapi.bier_route_add_del(
self.tbl_id,
self.bp,
- self.nh,
- self.out_label,
- self.disp_table,
+ self.paths,
is_add=0)
def __str__(self):
is_add=0)
def __str__(self):
@@
-225,11
+219,12
@@
class VppBierDispEntry(VppObject):
BIER Disposition Entry
"""
BIER Disposition Entry
"""
- def __init__(self, test, tbl_id, bp, payload_proto, nh
, nh_tbl
,
- rpf_id=~0):
+ def __init__(self, test, tbl_id, bp, payload_proto, nh
_proto
,
+
nh, nh_tbl,
rpf_id=~0):
self._test = test
self.tbl_id = tbl_id
self.nh_tbl = nh_tbl
self._test = test
self.tbl_id = tbl_id
self.nh_tbl = nh_tbl
+ self.nh_proto = nh_proto
self.bp = bp
self.payload_proto = payload_proto
self.rpf_id = rpf_id
self.bp = bp
self.payload_proto = payload_proto
self.rpf_id = rpf_id
@@
-240,6
+235,7
@@
class VppBierDispEntry(VppObject):
self.tbl_id,
self.bp,
self.payload_proto,
self.tbl_id,
self.bp,
self.payload_proto,
+ self.nh_proto,
self.nh,
self.nh_tbl,
self.rpf_id,
self.nh,
self.nh_tbl,
self.rpf_id,
@@
-251,6
+247,7
@@
class VppBierDispEntry(VppObject):
self.tbl_id,
self.bp,
self.payload_proto,
self.tbl_id,
self.bp,
self.payload_proto,
+ self.nh_proto,
self.nh,
self.nh_tbl,
self.rpf_id,
self.nh,
self.nh_tbl,
self.rpf_id,