From: Igor Ryzhov Date: Fri, 2 Oct 2020 08:24:16 +0000 (+0300) Subject: tests: don't compare internal vrfId in topotests X-Git-Tag: base_7.6~469^2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=0224261ee49aaff76383d4941e437c0a80d5183b;p=mirror%2Ffrr.git tests: don't compare internal vrfId in topotests Signed-off-by: Igor Ryzhov --- diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r1/bgp_ipv6_routes_down.json b/tests/topotests/bfd-bgp-cbit-topo3/r1/bgp_ipv6_routes_down.json index ac5fd04074..5cba71ef20 100644 --- a/tests/topotests/bfd-bgp-cbit-topo3/r1/bgp_ipv6_routes_down.json +++ b/tests/topotests/bfd-bgp-cbit-topo3/r1/bgp_ipv6_routes_down.json @@ -1,5 +1,4 @@ { - "vrfId": 0, "vrfName": "default", "routerId": "10.254.254.1", "localAS": 101, diff --git a/tests/topotests/bfd-bgp-cbit-topo3/r3/bgp_ipv6_routes_down.json b/tests/topotests/bfd-bgp-cbit-topo3/r3/bgp_ipv6_routes_down.json index ab42b05e85..c0cb3c4ac9 100644 --- a/tests/topotests/bfd-bgp-cbit-topo3/r3/bgp_ipv6_routes_down.json +++ b/tests/topotests/bfd-bgp-cbit-topo3/r3/bgp_ipv6_routes_down.json @@ -1,5 +1,4 @@ { - "vrfId": 0, "vrfName": "default", "routerId": "10.254.254.3", "localAS": 102, diff --git a/tests/topotests/bgp-ecmp-topo1/r1/summary.txt b/tests/topotests/bgp-ecmp-topo1/r1/summary.txt index 11611d041b..f0929536d3 100644 --- a/tests/topotests/bgp-ecmp-topo1/r1/summary.txt +++ b/tests/topotests/bgp-ecmp-topo1/r1/summary.txt @@ -2,7 +2,6 @@ "ipv4Unicast":{ "routerId":"10.0.255.1", "as":100, - "vrfId":0, "vrfName":"Default", "peerCount":20, "peers":{ diff --git a/tests/topotests/bgp-ecmp-topo1/r1/summary20.txt b/tests/topotests/bgp-ecmp-topo1/r1/summary20.txt index f90aedb1ec..9015f485f8 100644 --- a/tests/topotests/bgp-ecmp-topo1/r1/summary20.txt +++ b/tests/topotests/bgp-ecmp-topo1/r1/summary20.txt @@ -1,7 +1,6 @@ { "routerId":"10.0.255.1", "as":100, - "vrfId":0, "vrfName":"Default", "peerCount":20, "peers":{ diff --git a/tests/topotests/bgp_features/r1/bgp_shutdown_summary.json b/tests/topotests/bgp_features/r1/bgp_shutdown_summary.json index 70b70de1d1..d986071768 100644 --- a/tests/topotests/bgp_features/r1/bgp_shutdown_summary.json +++ b/tests/topotests/bgp_features/r1/bgp_shutdown_summary.json @@ -2,7 +2,6 @@ "ipv4Unicast":{ "routerId":"192.168.0.1", "as":65000, - "vrfId":0, "vrfName":"default", "peerCount":2, "peers":{ diff --git a/tests/topotests/bgp_features/r1/bgp_summary.json b/tests/topotests/bgp_features/r1/bgp_summary.json index 57aa992fab..1ad734220a 100644 --- a/tests/topotests/bgp_features/r1/bgp_summary.json +++ b/tests/topotests/bgp_features/r1/bgp_summary.json @@ -2,7 +2,6 @@ "ipv4Unicast":{ "routerId":"192.168.0.1", "as":65000, - "vrfId":0, "vrfName":"default", "peerCount":2, "peers":{ diff --git a/tests/topotests/bgp_features/r1/show_bgp.json b/tests/topotests/bgp_features/r1/show_bgp.json index 97260b0d0a..45e0e17d7b 100644 --- a/tests/topotests/bgp_features/r1/show_bgp.json +++ b/tests/topotests/bgp_features/r1/show_bgp.json @@ -1,5 +1,4 @@ { - "vrfId": 0, "vrfName": "default", "routerId": "192.168.0.1", "defaultLocPrf": 100, diff --git a/tests/topotests/bgp_features/r2/bgp_shutdown_summary.json b/tests/topotests/bgp_features/r2/bgp_shutdown_summary.json index 95de3e3096..b7892639a2 100644 --- a/tests/topotests/bgp_features/r2/bgp_shutdown_summary.json +++ b/tests/topotests/bgp_features/r2/bgp_shutdown_summary.json @@ -2,7 +2,6 @@ "ipv4Unicast":{ "routerId":"192.168.0.2", "as":65000, - "vrfId":0, "vrfName":"default", "peerCount":2, "peers":{ diff --git a/tests/topotests/bgp_features/r2/bgp_summary.json b/tests/topotests/bgp_features/r2/bgp_summary.json index f29204116c..30e0ef47a8 100644 --- a/tests/topotests/bgp_features/r2/bgp_summary.json +++ b/tests/topotests/bgp_features/r2/bgp_summary.json @@ -2,7 +2,6 @@ "ipv4Unicast":{ "routerId":"192.168.0.2", "as":65000, - "vrfId":0, "vrfName":"default", "peerCount":2, "peers":{ diff --git a/tests/topotests/bgp_features/r2/show_bgp.json b/tests/topotests/bgp_features/r2/show_bgp.json index 43ca57d8f7..830d5a96f0 100644 --- a/tests/topotests/bgp_features/r2/show_bgp.json +++ b/tests/topotests/bgp_features/r2/show_bgp.json @@ -1,5 +1,4 @@ { - "vrfId": 0, "vrfName": "default", "routerId": "192.168.0.2", "defaultLocPrf": 100, diff --git a/tests/topotests/bgp_features/r4/bgp_shutdown_summary.json b/tests/topotests/bgp_features/r4/bgp_shutdown_summary.json index c22cbdadcd..ede4dd67b9 100644 --- a/tests/topotests/bgp_features/r4/bgp_shutdown_summary.json +++ b/tests/topotests/bgp_features/r4/bgp_shutdown_summary.json @@ -2,7 +2,6 @@ "ipv4Unicast":{ "routerId":"192.168.100.1", "as":65100, - "vrfId":0, "vrfName":"default", "peerCount":1, "peers":{ diff --git a/tests/topotests/bgp_features/r4/bgp_summary.json b/tests/topotests/bgp_features/r4/bgp_summary.json index d147602c74..c0dfe78c6d 100644 --- a/tests/topotests/bgp_features/r4/bgp_summary.json +++ b/tests/topotests/bgp_features/r4/bgp_summary.json @@ -2,7 +2,6 @@ "ipv4Unicast":{ "routerId":"192.168.100.1", "as":65100, - "vrfId":0, "vrfName":"default", "peerCount":1, "peers":{ diff --git a/tests/topotests/bgp_features/r5/bgp_summary.json b/tests/topotests/bgp_features/r5/bgp_summary.json index f303aa6c72..b854af59a6 100644 --- a/tests/topotests/bgp_features/r5/bgp_summary.json +++ b/tests/topotests/bgp_features/r5/bgp_summary.json @@ -2,7 +2,6 @@ "ipv4Unicast":{ "routerId":"192.168.200.1", "as":65200, - "vrfId":0, "vrfName":"default", "peerCount":1, "peers":{ diff --git a/tests/topotests/bgp_flowspec/r1/summary.txt b/tests/topotests/bgp_flowspec/r1/summary.txt index d5dfe0b6c2..82426f3162 100644 --- a/tests/topotests/bgp_flowspec/r1/summary.txt +++ b/tests/topotests/bgp_flowspec/r1/summary.txt @@ -2,7 +2,6 @@ "ipv4Unicast":{ "routerId":"10.0.1.1", "as":100, - "vrfId":0, "vrfName":"default", "peerCount":1, "peers":{ @@ -19,7 +18,6 @@ "ipv4Flowspec":{ "routerId":"10.0.1.1", "as":100, - "vrfId":0, "vrfName":"default", "peerCount":1, "peers":{ @@ -36,7 +34,6 @@ "ipv6Flowspec":{ "routerId":"10.0.1.1", "as":100, - "vrfId":0, "vrfName":"default", "peerCount":1, "peers":{ diff --git a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/ipv4_routes.json b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/ipv4_routes.json index b60350fa4d..1c7500b7be 100644 --- a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/ipv4_routes.json +++ b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/ipv4_routes.json @@ -3,7 +3,7 @@ { "prefix": "10.254.254.2/32", "protocol": "bgp", - "vrfId":3, + "vrfName": "r1-cust1", "selected": true, "destSelected": true, "distance": 20, @@ -24,7 +24,7 @@ { "prefix": "10.254.254.1/32", "protocol": "connected", - "vrfId":3, + "vrfName": "r1-cust1", "selected": true, "destSelected": true, "distance": 0, diff --git a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/ipv6_routes.json b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/ipv6_routes.json index 7e9193f8c1..0e1de87c34 100644 --- a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/ipv6_routes.json +++ b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r1/ipv6_routes.json @@ -3,7 +3,7 @@ { "prefix": "2001:db8:1::/64", "protocol": "bgp", - "vrfId":3, + "vrfName": "r1-cust1", "distance": 20, "metric": 0, "nexthops": [ @@ -17,7 +17,7 @@ { "prefix": "2001:db8:1::/64", "protocol": "connected", - "vrfId":3, + "vrfName": "r1-cust1", "selected": true, "destSelected": true, "distance": 0, diff --git a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/ipv4_routes.json b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/ipv4_routes.json index ccbea2aecc..4d7b289aeb 100644 --- a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/ipv4_routes.json +++ b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/ipv4_routes.json @@ -3,7 +3,7 @@ { "prefix": "10.254.254.2/32", "protocol": "connected", - "vrfId":3, + "vrfName": "r2-cust1", "selected": true, "destSelected": true, "distance": 0, @@ -24,7 +24,7 @@ { "prefix": "10.254.254.1/32", "protocol": "bgp", - "vrfId":3, + "vrfName": "r2-cust1", "selected": true, "destSelected": true, "distance": 20, diff --git a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/ipv6_routes.json b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/ipv6_routes.json index b678c1e719..805b57d36f 100644 --- a/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/ipv6_routes.json +++ b/tests/topotests/bgp_vrf_lite_ipv6_rtadv/r2/ipv6_routes.json @@ -3,7 +3,7 @@ { "prefix": "2001:db8:1::/64", "protocol": "connected", - "vrfId":3, + "vrfName": "r2-cust1", "selected": true, "destSelected": true, "distance": 0, diff --git a/tests/topotests/evpn-pim-1/spine/bgp.summ.json b/tests/topotests/evpn-pim-1/spine/bgp.summ.json index 53370507e8..5ff4b096fd 100644 --- a/tests/topotests/evpn-pim-1/spine/bgp.summ.json +++ b/tests/topotests/evpn-pim-1/spine/bgp.summ.json @@ -1,7 +1,6 @@ { "routerId":"192.168.100.1", "as":65001, - "vrfId":0, "vrfName":"default", "tableVersion":7, "peerCount":2, diff --git a/tests/topotests/isis-topo1-vrf/r1/r1_route.json b/tests/topotests/isis-topo1-vrf/r1/r1_route.json index 2bac6b9ef6..77d2ad9c63 100644 --- a/tests/topotests/isis-topo1-vrf/r1/r1_route.json +++ b/tests/topotests/isis-topo1-vrf/r1/r1_route.json @@ -15,7 +15,6 @@ "prefix": "10.0.10.0/24", "protocol": "isis", "selected": true, - "vrfId": 3, "vrfName": "r1-cust1" } ], @@ -32,7 +31,6 @@ ], "prefix": "10.0.20.0/24", "protocol": "isis", - "vrfId": 3, "vrfName": "r1-cust1" }, { @@ -47,7 +45,6 @@ "prefix": "10.0.20.0/24", "protocol": "connected", "selected": true, - "vrfId": 3, "vrfName": "r1-cust1" } ] diff --git a/tests/topotests/isis-topo1-vrf/r1/r1_route6.json b/tests/topotests/isis-topo1-vrf/r1/r1_route6.json index 6e717eaa1f..888b9e2c42 100644 --- a/tests/topotests/isis-topo1-vrf/r1/r1_route6.json +++ b/tests/topotests/isis-topo1-vrf/r1/r1_route6.json @@ -12,7 +12,6 @@ "prefix": "2001:db8:1:1::/64", "protocol": "connected", "selected": true, - "vrfId": 3, "vrfName": "r1-cust1" } ], @@ -31,7 +30,6 @@ "prefix": "2001:db8:2:1::/64", "protocol": "isis", "selected": true, - "vrfId": 3, "vrfName": "r1-cust1" } ] diff --git a/tests/topotests/isis-topo1-vrf/r2/r2_route.json b/tests/topotests/isis-topo1-vrf/r2/r2_route.json index e13a695295..98252c5939 100644 --- a/tests/topotests/isis-topo1-vrf/r2/r2_route.json +++ b/tests/topotests/isis-topo1-vrf/r2/r2_route.json @@ -15,7 +15,6 @@ "prefix": "10.0.11.0/24", "protocol": "isis", "selected": true, - "vrfId": 3, "vrfName": "r2-cust1" } ], @@ -32,7 +31,6 @@ ], "prefix": "10.0.21.0/24", "protocol": "isis", - "vrfId": 3, "vrfName": "r2-cust1" }, { @@ -47,7 +45,6 @@ "prefix": "10.0.21.0/24", "protocol": "connected", "selected": true, - "vrfId": 3, "vrfName": "r2-cust1" } ] diff --git a/tests/topotests/isis-topo1-vrf/r2/r2_route6.json b/tests/topotests/isis-topo1-vrf/r2/r2_route6.json index 802ca0833c..b01789b8d9 100644 --- a/tests/topotests/isis-topo1-vrf/r2/r2_route6.json +++ b/tests/topotests/isis-topo1-vrf/r2/r2_route6.json @@ -12,7 +12,6 @@ "prefix": "2001:db8:1:2::/64", "protocol": "connected", "selected": true, - "vrfId": 3, "vrfName": "r2-cust1" } ], @@ -31,7 +30,6 @@ "prefix": "2001:db8:2:2::/64", "protocol": "isis", "selected": true, - "vrfId": 3, "vrfName": "r2-cust1" } ] diff --git a/tests/topotests/isis-topo1-vrf/r3/r3_route.json b/tests/topotests/isis-topo1-vrf/r3/r3_route.json index fa678632b5..de158876f1 100644 --- a/tests/topotests/isis-topo1-vrf/r3/r3_route.json +++ b/tests/topotests/isis-topo1-vrf/r3/r3_route.json @@ -12,7 +12,6 @@ ], "prefix": "10.0.10.0/24", "protocol": "isis", - "vrfId": 4, "vrfName": "r3-cust1" }, { @@ -27,7 +26,6 @@ "prefix": "10.0.10.0/24", "protocol": "connected", "selected": true, - "vrfId": 4, "vrfName": "r3-cust1" } ], @@ -47,7 +45,6 @@ "prefix": "10.0.11.0/24", "protocol": "isis", "selected": true, - "vrfId": 4, "vrfName": "r3-cust1" } ], @@ -64,7 +61,6 @@ ], "prefix": "10.0.20.0/24", "protocol": "isis", - "vrfId": 4, "vrfName": "r3-cust1" }, { @@ -79,7 +75,6 @@ "prefix": "10.0.20.0/24", "protocol": "connected", "selected": true, - "vrfId": 4, "vrfName": "r3-cust1" } ], @@ -99,7 +94,6 @@ "prefix": "10.0.21.0/24", "protocol": "isis", "selected": true, - "vrfId": 4, "vrfName": "r3-cust1" } ] diff --git a/tests/topotests/isis-topo1-vrf/r4/r4_route.json b/tests/topotests/isis-topo1-vrf/r4/r4_route.json index ca8229dc46..b3ed4f2cbe 100644 --- a/tests/topotests/isis-topo1-vrf/r4/r4_route.json +++ b/tests/topotests/isis-topo1-vrf/r4/r4_route.json @@ -14,7 +14,6 @@ "prefix": "10.0.10.0/24", "protocol": "isis", "selected": true, - "vrfId": 4, "vrfName": "r4-cust1" } ], @@ -29,7 +28,6 @@ ], "prefix": "10.0.11.0/24", "protocol": "isis", - "vrfId": 4, "vrfName": "r4-cust1" }, { @@ -44,7 +42,6 @@ "prefix": "10.0.11.0/24", "protocol": "connected", "selected": true, - "vrfId": 4, "vrfName": "r4-cust1" } ], @@ -62,7 +59,6 @@ "prefix": "10.0.20.0/24", "protocol": "isis", "selected": true, - "vrfId": 4, "vrfName": "r4-cust1" } ], @@ -77,7 +73,6 @@ ], "prefix": "10.0.21.0/24", "protocol": "isis", - "vrfId": 4, "vrfName": "r4-cust1" }, { @@ -92,7 +87,6 @@ "prefix": "10.0.21.0/24", "protocol": "connected", "selected": true, - "vrfId": 4, "vrfName": "r4-cust1" } ] diff --git a/tests/topotests/isis-topo1-vrf/r4/r4_route6.json b/tests/topotests/isis-topo1-vrf/r4/r4_route6.json index 322c4d72dc..88a91749c2 100644 --- a/tests/topotests/isis-topo1-vrf/r4/r4_route6.json +++ b/tests/topotests/isis-topo1-vrf/r4/r4_route6.json @@ -14,7 +14,6 @@ "prefix": "2001:db8:1:1::/64", "protocol": "isis", "selected": true, - "vrfId": 4, "vrfName": "r4-cust1" } ], @@ -31,7 +30,6 @@ "prefix": "2001:db8:1:2::/64", "protocol": "connected", "selected": true, - "vrfId": 4, "vrfName": "r4-cust1" } ], @@ -50,7 +48,6 @@ "prefix": "2001:db8:2:1::/64", "protocol": "isis", "selected": true, - "vrfId": 4, "vrfName": "r4-cust1" } ], @@ -67,7 +64,6 @@ "prefix": "2001:db8:2:2::/64", "protocol": "connected", "selected": true, - "vrfId": 4, "vrfName": "r4-cust1" } ] diff --git a/tests/topotests/isis-topo1-vrf/r5/r5_route.json b/tests/topotests/isis-topo1-vrf/r5/r5_route.json index 781aa8ad73..5efa36bce6 100644 --- a/tests/topotests/isis-topo1-vrf/r5/r5_route.json +++ b/tests/topotests/isis-topo1-vrf/r5/r5_route.json @@ -12,7 +12,6 @@ ], "prefix": "10.0.10.0/24", "protocol": "isis", - "vrfId": 4, "vrfName": "r5-cust1" }, { @@ -27,7 +26,6 @@ "prefix": "10.0.10.0/24", "protocol": "connected", "selected": true, - "vrfId": 4, "vrfName": "r5-cust1" } ], @@ -42,7 +40,6 @@ ], "prefix": "10.0.11.0/24", "protocol": "isis", - "vrfId": 4, "vrfName": "r5-cust1" }, { @@ -57,7 +54,6 @@ "prefix": "10.0.11.0/24", "protocol": "connected", "selected": true, - "vrfId": 4, "vrfName": "r5-cust1" } ], @@ -75,7 +71,6 @@ "prefix": "10.0.20.0/24", "protocol": "isis", "selected": true, - "vrfId": 4, "vrfName": "r5-cust1" } ], @@ -93,7 +88,6 @@ "prefix": "10.0.21.0/24", "protocol": "isis", "selected": true, - "vrfId": 4, "vrfName": "r5-cust1" } ] diff --git a/tests/topotests/isis-topo1-vrf/r5/r5_route6.json b/tests/topotests/isis-topo1-vrf/r5/r5_route6.json index 25b73b7d43..5e8f6364af 100644 --- a/tests/topotests/isis-topo1-vrf/r5/r5_route6.json +++ b/tests/topotests/isis-topo1-vrf/r5/r5_route6.json @@ -14,7 +14,6 @@ "prefix": "2001:db8:1:1::/64", "protocol": "isis", "selected": true, - "vrfId": 4, "vrfName": "r5-cust1" } ], @@ -33,7 +32,6 @@ "prefix": "2001:db8:1:2::/64", "protocol": "isis", "selected": true, - "vrfId": 4, "vrfName": "r5-cust1" } ], @@ -50,7 +48,6 @@ "prefix": "2001:db8:2:1::/64", "protocol": "connected", "selected": true, - "vrfId": 4, "vrfName": "r5-cust1" } ], @@ -67,7 +64,6 @@ "prefix": "2001:db8:2:2::/64", "protocol": "connected", "selected": true, - "vrfId": 4, "vrfName": "r5-cust1" } ]