diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_bier.py | 41 | ||||
| -rw-r--r-- | test/vpp_bier.py | 3 | ||||
| -rw-r--r-- | test/vpp_ip_route.py | 13 |
3 files changed, 39 insertions, 18 deletions
diff --git a/test/test_bier.py b/test/test_bier.py index c7ec0eed127..c4f64bdbddd 100644 --- a/test/test_bier.py +++ b/test/test_bier.py @@ -315,10 +315,12 @@ class TestBier(VppTestCase): # # BIER route in table that's for-us # - bier_route_1 = VppBierRoute(self, bti, 1, - [VppRoutePath("0.0.0.0", - 0xffffffff, - nh_table_id=8)]) + bier_route_1 = VppBierRoute( + self, bti, 1, + [VppRoutePath("0.0.0.0", + 0xffffffff, + proto=DpoProto.DPO_PROTO_BIER, + nh_table_id=8)]) bier_route_1.add_vpp_config() # @@ -446,10 +448,12 @@ class TestBier(VppTestCase): # BIER routes in table that are for-us, resolving through # disp table 8. # - bier_route_1 = VppBierRoute(self, bti, 1, - [VppRoutePath("0.0.0.0", - 0xffffffff, - nh_table_id=8)]) + bier_route_1 = VppBierRoute( + self, bti, 1, + [VppRoutePath("0.0.0.0", + 0xffffffff, + proto=DpoProto.DPO_PROTO_BIER, + nh_table_id=8)]) bier_route_1.add_vpp_config() bier_route_max = VppBierRoute(self, bti, max_bp, [VppRoutePath("0.0.0.0", @@ -573,11 +577,12 @@ class TestBier(VppTestCase): 330, 8138) udp_encap.add_vpp_config() - bier_route = VppBierRoute(self, bti, 1, - [VppRoutePath("0.0.0.0", - 0xFFFFFFFF, - is_udp_encap=1, - next_hop_id=4)]) + bier_route = VppBierRoute( + self, bti, 1, + [VppRoutePath("0.0.0.0", + 0xFFFFFFFF, + is_udp_encap=1, + next_hop_id=4)]) bier_route.add_vpp_config() # @@ -652,10 +657,12 @@ class TestBier(VppTestCase): # # BIER route in table that's for-us # - bier_route_1 = VppBierRoute(self, bti, 1, - [VppRoutePath("0.0.0.0", - 0xffffffff, - nh_table_id=8)]) + bier_route_1 = VppBierRoute( + self, bti, 1, + [VppRoutePath("0.0.0.0", + 0xffffffff, + proto=DpoProto.DPO_PROTO_BIER, + nh_table_id=8)]) bier_route_1.add_vpp_config() # diff --git a/test/vpp_bier.py b/test/vpp_bier.py index 7566b1f95ab..88dd79ce3b7 100644 --- a/test/vpp_bier.py +++ b/test/vpp_bier.py @@ -134,7 +134,8 @@ class VppBierRoute(VppObject): lstack.append({}) br_paths.append({'next_hop': p.nh_addr, 'weight': 1, - 'afi': 0, + 'afi': p.proto, + 'sw_if_index': 0xffffffff, 'preference': 0, 'table_id': p.nh_table_id, 'next_hop_id': p.next_hop_id, diff --git a/test/vpp_ip_route.py b/test/vpp_ip_route.py index ca0ae1ad47d..39b2b1ae1e8 100644 --- a/test/vpp_ip_route.py +++ b/test/vpp_ip_route.py @@ -168,6 +168,19 @@ class VppRoutePath(object): 'ttl': 255}) return lstack + def encode(self): + return {'next_hop': self.nh_addr, + 'weight': 1, + 'afi': 0, + 'preference': 0, + 'table_id': self.nh_table_id, + 'next_hop_id': self.next_hop_id, + 'sw_if_index': self.nh_itf, + 'afi': self.proto, + 'is_udp_encap': self.is_udp_encap, + 'n_labels': len(self.nh_labels), + 'label_stack': self.encode_labels()} + class VppMRoutePath(VppRoutePath): |