aboutsummaryrefslogtreecommitdiffstats
path: root/resources/test_data/honeycomb
diff options
context:
space:
mode:
Diffstat (limited to 'resources/test_data/honeycomb')
-rw-r--r--resources/test_data/honeycomb/bgp.py16
-rw-r--r--resources/test_data/honeycomb/routing.py186
2 files changed, 112 insertions, 90 deletions
diff --git a/resources/test_data/honeycomb/bgp.py b/resources/test_data/honeycomb/bgp.py
index 84c9431e6b..c7a968cfd6 100644
--- a/resources/test_data/honeycomb/bgp.py
+++ b/resources/test_data/honeycomb/bgp.py
@@ -194,7 +194,7 @@ route_data_ipv6 = {
table1_oper = {
"destination-prefix": route_address_ipv4,
"next-hop": "192.168.1.1",
- "vpp-ipv4-route-state": {}
+ "vpp-ipv4-unicast-routing:vpp-ipv4-route": {}
}
# Peer configurations for traffic test
@@ -306,18 +306,18 @@ rib_operational = {
}
route_operational = {
- "vpp-ipv4-route-state": {},
- "next-hop": "192.168.1.3",
+ "next-hop": {"next-hop-address": "192.168.1.3"},
+ "vpp-ipv4-unicast-routing:vpp-ipv4-route": {},
"destination-prefix": dut1_route_address
}
# IPv6 route for traffic test
-dut1_route_ip6_address = "3ffe:62::1/64"
+dut1_route_ip6_prefix = "3ffe:62::/64"
dut1_route_ip6_id = 1
dut1_route_ip6 = {
"bgp-inet:ipv6-route": [{
"path-id": dut1_route_ip6_id,
- "prefix": dut1_route_ip6_address,
+ "prefix": dut1_route_ip6_prefix,
"attributes": {
"as-path": {},
"origin": {
@@ -347,7 +347,7 @@ rib_ip6_operational = {
}
route_ip6_operational = {
- "vpp-ipv6-route-state": {},
- "next-hop": "3ffe:63::1",
- "destination-prefix": dut1_route_ip6_address
+ "next-hop": {"next-hop-address": "3ffe:63::1"},
+ "vpp-ipv6-unicast-routing:vpp-ipv6-route": {},
+ "destination-prefix": dut1_route_ip6_prefix
}
diff --git a/resources/test_data/honeycomb/routing.py b/resources/test_data/honeycomb/routing.py
index c28b2212a4..25fefe9426 100644
--- a/resources/test_data/honeycomb/routing.py
+++ b/resources/test_data/honeycomb/routing.py
@@ -63,80 +63,86 @@ def get_variables(node, ip_version, out_interface):
# route configuration used in tests
tables_cfg = {
"table1": {
- "id": 1,
"description": "single hop ipv4",
"destination-prefix":
"{0}/{1}".format(ipv4_base["dst_net"], ipv4_base["prefix_len"]),
- "next-hop": ipv4_base["next_hop"],
- "outgoing-interface": out_interface,
- "vpp-ipv4-route": {}
+ "next-hop": {
+ "next-hop-address" : ipv4_base["next_hop"],
+ "outgoing-interface": out_interface
+ },
+ "vpp-ipv4-unicast-routing:vpp-ipv4-route": {}
},
"table2": {
- "id": 1,
"description": "multi hop ipv4",
"destination-prefix":
"{0}/{1}".format(ipv4_base["dst_net"], ipv4_base["prefix_len"]),
- "next-hop-list": {
- "next-hop": [
- {
- "id": 1,
- "address": ipv4_base["next_hop1"],
- "outgoing-interface": out_interface,
- "weight": "1"
- },
- {
- "id": 2,
- "address": ipv4_base["next_hop2"],
- "outgoing-interface": out_interface,
- "weight": "1"
- }
- ]
+ "next-hop":{
+ "next-hop-list": {
+ "next-hop": [
+ {
+ "index": "1",
+ "next-hop-address": ipv4_base["next_hop1"],
+ "outgoing-interface": out_interface,
+ "weight": "1"
+ },
+ {
+ "index": "2",
+ "next-hop-address": ipv4_base["next_hop2"],
+ "outgoing-interface": out_interface,
+ "weight": "1"
+ }
+ ]
+ }
}
},
"table3": {
- "id": 1,
"description": "blackhole ipv4",
"destination-prefix":
"{0}/{1}".format(ipv4_base["dst_net"], ipv4_base["prefix_len"]),
- "special-next-hop": "receive"
+ "next-hop": {
+ "special-next-hop-enum": "blackhole"
+ }
},
"table4": {
- "id": 1,
"description": "single hop ipv6",
"destination-prefix":
"{0}/{1}".format(ipv6_base["dst_net"], ipv6_base["prefix_len"]),
- "next-hop": ipv6_base["next_hop"],
- "outgoing-interface": out_interface,
- "vpp-ipv6-route": {}
+ "next-hop": {
+ "next-hop-address": ipv6_base["next_hop"],
+ "outgoing-interface": out_interface
+ },
+ "vpp-ipv6-unicast-routing:vpp-ipv6-route": {}
},
"table5": {
- "id": 1,
"description": "multi hop ipv6",
"destination-prefix":
"{0}/{1}".format(ipv6_base["dst_net"], ipv6_base["prefix_len"]),
- "next-hop-list": {
- "next-hop": [
- {
- "id": 1,
- "address": ipv6_base["next_hop1"],
- "outgoing-interface": out_interface,
- "weight": "1"
- },
- {
- "id": 2,
- "address": ipv6_base["next_hop2"],
- "outgoing-interface": out_interface,
- "weight": "1"
- }
- ]
+ "next-hop":{
+ "next-hop-list": {
+ "next-hop": [
+ {
+ "index": "1",
+ "next-hop-address": ipv6_base["next_hop1"],
+ "outgoing-interface": out_interface,
+ "weight": "1"
+ },
+ {
+ "index": "2",
+ "next-hop-address": ipv6_base["next_hop2"],
+ "outgoing-interface": out_interface,
+ "weight": "1"
+ }
+ ]
+ }
}
},
"table6": {
- "id": 1,
"description": "blackhole ipv6",
"destination-prefix":
"{0}/{1}".format(ipv6_base["dst_net"], ipv6_base["prefix_len"]),
- "special-next-hop": "blackhole"
+ "next-hop":{
+ "special-next-hop-enum": "blackhole"
+ }
}
}
@@ -145,69 +151,85 @@ def get_variables(node, ip_version, out_interface):
"table1_oper": {
"destination-prefix":
"{0}/{1}".format(ipv4_base["dst_net"], ipv4_base["prefix_len"]),
- "next-hop": ipv4_base["next_hop"],
- "outgoing-interface": out_interface,
- "vpp-ipv4-route-state": {}
+ "next-hop":{
+ "next-hop-address": ipv4_base["next_hop"],
+ "outgoing-interface": out_interface
+ },
+ "vpp-ipv4-unicast-routing:vpp-ipv4-route": {}
},
"table2_oper": {
"destination-prefix":
"{0}/{1}".format(ipv4_base["dst_net"], ipv4_base["prefix_len"]),
- "next-hop-list": {
- "next-hop": [
- {
- "address": ipv4_base["next_hop1"],
- "outgoing-interface": out_interface,
- "weight": 1
- },
- {
- "address": ipv4_base["next_hop2"],
- "outgoing-interface": out_interface,
- "weight": 1
- }
- ]
+ "next-hop":{
+ "next-hop-list": {
+ "next-hop": [
+ {
+ "index": "2",
+ "next-hop-address": ipv4_base["next_hop2"],
+ "outgoing-interface": out_interface,
+ "vpp-ipv4-unicast-routing:weight": 1
+ },
+ {
+ "index": "1",
+ "next-hop-address": ipv4_base["next_hop1"],
+ "outgoing-interface": out_interface,
+ "vpp-ipv4-unicast-routing:weight": 1
+ }
+ ]
+ }
},
- 'vpp-ipv4-route-state': {}
+ "vpp-ipv4-unicast-routing:vpp-ipv4-route": {}
},
"table3_oper": {
"destination-prefix":
"{0}/{1}".format(ipv4_base["dst_net"], ipv4_base["prefix_len"]),
- "special-next-hop": "receive",
- "vpp-ipv4-route-state": {}
+ "next-hop":{
+ "special-next-hop-enum": "blackhole"
+ },
+ "vpp-ipv4-unicast-routing:vpp-ipv4-route": {}
},
"table4_oper": {
"destination-prefix":
"{0}/{1}".format(ipv6_base["dst_net"],
ipv6_base["prefix_len"]),
- "next-hop": ipv6_base["next_hop"],
- "outgoing-interface": out_interface,
- "vpp-ipv6-route-state": {}
+ "next-hop":{
+ "next-hop-address": ipv6_base["next_hop"],
+ "outgoing-interface": out_interface
+ },
+ "vpp-ipv6-unicast-routing:vpp-ipv6-route": {}
},
"table5_oper": {
"destination-prefix":
"{0}/{1}".format(ipv6_base["dst_net"],
ipv6_base["prefix_len"]),
- "next-hop-list": {
- "next-hop": [
- {
- "address": ipv6_base["next_hop1"],
- "outgoing-interface": out_interface,
- "weight": 1
- },
- {
- "address": ipv6_base["next_hop2"],
- "outgoing-interface": out_interface,
- "weight": 1
- }
- ]
+ "next-hop":{
+ "next-hop-list": {
+ "next-hop": [
+ {
+ "index": "2",
+ "next-hop-address": ipv6_base["next_hop2"],
+ "outgoing-interface": out_interface,
+ "vpp-ipv6-unicast-routing:weight": 1
+ },
+ {
+ "index": "1",
+ "next-hop-address": ipv6_base["next_hop1"],
+ "outgoing-interface": out_interface,
+ "vpp-ipv6-unicast-routing:weight": 1
+ }
+ ]
+ }
},
- "vpp-ipv6-route-state": {}
+ "vpp-ipv6-unicast-routing:vpp-ipv6-route": {}
},
"table6_oper": {
"destination-prefix":
"{0}/{1}".format(ipv6_base["dst_net"],
ipv6_base["prefix_len"]),
- "special-next-hop": "blackhole",
- 'vpp-ipv6-route-state': {}
+ "next-hop":{
+ "special-next-hop-enum": "blackhole"
+ },
+ "vpp-ipv6-unicast-routing:vpp-ipv6-route": {}
}
}