Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix failing tests after Fluorine bump in HC (HONEYCOMB-433)
[csit.git]
/
resources
/
test_data
/
honeycomb
/
bgp.py
diff --git
a/resources/test_data/honeycomb/bgp.py
b/resources/test_data/honeycomb/bgp.py
index
84c9431
..
52513f0
100644
(file)
--- a/
resources/test_data/honeycomb/bgp.py
+++ b/
resources/test_data/honeycomb/bgp.py
@@
-39,9
+39,7
@@
peer_internal = {
},
"afi-safis": {
"afi-safi": [{
},
"afi-safis": {
"afi-safi": [{
- "afi-safi-name": "openconfig-bgp-types:IPV4-UNICAST",
- "receive": True,
- "send-max": 0
+ "afi-safi-name": "openconfig-bgp-types:IPV4-UNICAST"
}]
}
}]
}]
}
}]
@@
-67,9
+65,7
@@
peer_internal_update = {
},
"afi-safis": {
"afi-safi": [{
},
"afi-safis": {
"afi-safi": [{
- "afi-safi-name": "openconfig-bgp-types:IPV6-UNICAST",
- "receive": False,
- "send-max": 1
+ "afi-safi-name": "openconfig-bgp-types:IPV6-UNICAST"
}]
}
}]
}]
}
}]
@@
-90,15
+86,11
@@
peer_application = {
"afi-safis": {
"afi-safi": [
{
"afi-safis": {
"afi-safi": [
{
- "afi-safi-name": "openconfig-bgp-types:IPV4-UNICAST",
- "receive": True,
- "send-max": 0
+ "afi-safi-name": "openconfig-bgp-types:IPV4-UNICAST"
},
{
"afi-safi-name":
},
{
"afi-safi-name":
- "openconfig-bgp-types:IPV4-LABELLED-UNICAST",
- "receive": True,
- "send-max": 0
+ "openconfig-bgp-types:IPV4-LABELLED-UNICAST"
}]
}
}]
}]
}
}]
@@
-109,6
+101,7
@@
route_address_ipv4 = "192.168.0.5/32"
route_id_ipv4 = 0
route_data_ipv4 = {
"bgp-inet:ipv4-route": [{
route_id_ipv4 = 0
route_data_ipv4 = {
"bgp-inet:ipv4-route": [{
+ "route-key": route_address_ipv4,
"path-id": route_id_ipv4,
"prefix": route_address_ipv4,
"attributes": {
"path-id": route_id_ipv4,
"prefix": route_address_ipv4,
"attributes": {
@@
-129,6
+122,7
@@
route_data_ipv4 = {
# IPv4 route for testing Update operation
route_data_ipv4_update = {
"bgp-inet:ipv4-route": [{
# IPv4 route for testing Update operation
route_data_ipv4_update = {
"bgp-inet:ipv4-route": [{
+ "route-key": route_address_ipv4,
"path-id": route_id_ipv4,
"prefix": route_address_ipv4,
"attributes": {
"path-id": route_id_ipv4,
"prefix": route_address_ipv4,
"attributes": {
@@
-151,6
+145,7
@@
route_address_ipv4_2 = "192.168.0.6/32"
route_id_ipv4_2 = 1
route_data_ipv4_2 = {
"bgp-inet:ipv4-route": [{
route_id_ipv4_2 = 1
route_data_ipv4_2 = {
"bgp-inet:ipv4-route": [{
+ "route-key": route_address_ipv4_2,
"path-id": route_id_ipv4_2,
"prefix": route_address_ipv4_2,
"attributes": {
"path-id": route_id_ipv4_2,
"prefix": route_address_ipv4_2,
"attributes": {
@@
-173,6
+168,7
@@
route_address_ipv6 = "3ffe:62::1/64"
route_id_ipv6 = 0
route_data_ipv6 = {
"bgp-inet:ipv6-route": [{
route_id_ipv6 = 0
route_data_ipv6 = {
"bgp-inet:ipv6-route": [{
+ "route-key": route_address_ipv6,
"path-id": route_id_ipv6,
"prefix": route_address_ipv6,
"attributes": {
"path-id": route_id_ipv6,
"prefix": route_address_ipv6,
"attributes": {
@@
-194,7
+190,7
@@
route_data_ipv6 = {
table1_oper = {
"destination-prefix": route_address_ipv4,
"next-hop": "192.168.1.1",
table1_oper = {
"destination-prefix": route_address_ipv4,
"next-hop": "192.168.1.1",
- "vpp-ipv4-
route-sta
te": {}
+ "vpp-ipv4-
unicast-routing:vpp-ipv4-rou
te": {}
}
# Peer configurations for traffic test
}
# Peer configurations for traffic test
@@
-219,13
+215,11
@@
dut1_peer = {
"afi-safis": {
"afi-safi": [
{
"afi-safis": {
"afi-safi": [
{
- "afi-safi-name": "openconfig-bgp-types:IPV4-UNICAST",
- "receive": True,
- "send-max": 0},
+ "afi-safi-name": "openconfig-bgp-types:IPV4-UNICAST"
+ },
{
{
- "afi-safi-name": "openconfig-bgp-types:IPV6-UNICAST",
- "receive": True,
- "send-max": 0},
+ "afi-safi-name": "openconfig-bgp-types:IPV6-UNICAST"
+ },
{
"afi-safi-name": "LINKSTATE"
}
{
"afi-safi-name": "LINKSTATE"
}
@@
-255,13
+249,11
@@
dut2_peer = {
"afi-safis": {
"afi-safi": [
{
"afi-safis": {
"afi-safi": [
{
- "afi-safi-name": "openconfig-bgp-types:IPV4-UNICAST",
- "receive": True,
- "send-max": 0},
+ "afi-safi-name": "openconfig-bgp-types:IPV4-UNICAST"
+ },
{
{
- "afi-safi-name": "openconfig-bgp-types:IPV6-UNICAST",
- "receive": True,
- "send-max": 0},
+ "afi-safi-name": "openconfig-bgp-types:IPV6-UNICAST"
+ },
{
"afi-safi-name": "LINKSTATE"
}
{
"afi-safi-name": "LINKSTATE"
}
@@
-272,9
+264,10
@@
dut2_peer = {
# IPv4 route for traffic test
dut1_route_address = "192.168.0.5/32"
# IPv4 route for traffic test
dut1_route_address = "192.168.0.5/32"
-dut1_route_id =
1
+dut1_route_id =
0
dut1_route = {
"bgp-inet:ipv4-route": [{
dut1_route = {
"bgp-inet:ipv4-route": [{
+ "route-key": dut1_route_address,
"path-id": dut1_route_id,
"prefix": dut1_route_address,
"attributes": {
"path-id": dut1_route_id,
"prefix": dut1_route_address,
"attributes": {
@@
-306,18
+299,19
@@
rib_operational = {
}
route_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
"destination-prefix": dut1_route_address
}
# IPv6 route for traffic test
-dut1_route_ip6_
address = "3ffe:62::1
/64"
-dut1_route_ip6_id =
1
+dut1_route_ip6_
prefix = "3ffe:62::
/64"
+dut1_route_ip6_id =
0
dut1_route_ip6 = {
"bgp-inet:ipv6-route": [{
dut1_route_ip6 = {
"bgp-inet:ipv6-route": [{
+ "route-key": dut1_route_ip6_prefix,
"path-id": dut1_route_ip6_id,
"path-id": dut1_route_ip6_id,
- "prefix": dut1_route_ip6_
address
,
+ "prefix": dut1_route_ip6_
prefix
,
"attributes": {
"as-path": {},
"origin": {
"attributes": {
"as-path": {},
"origin": {
@@
-347,7
+341,7
@@
rib_ip6_operational = {
}
route_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
}
}