diff options
| author | Stephen Worley <sworley@cumulusnetworks.com> | 2019-09-03 19:53:45 +0200 |
|---|---|---|
| committer | Stephen Worley <sworley@cumulusnetworks.com> | 2019-10-25 17:13:43 +0200 |
| commit | 737170f5bf7e9f999543c30eff4824646885652b (patch) | |
| tree | a7ca530b2250e8f9c9845cd5db21d06ea2cdf92f /tests | |
| parent | zebra: Update ip route show with nexthop_num API (diff) | |
| download | frr-737170f5bf7e9f999543c30eff4824646885652b.tar.xz frr-737170f5bf7e9f999543c30eff4824646885652b.zip | |
topotests: Expect shared nexthop memory
A few topotests were failing since they were not aware
of shared nexthops and, therefore, matching on flags that
could be changed when another route sharing that nexthop is
installed.
Update routes that are not installed to not match their json output
on the nexthop flag information. The ones that are installed will
still retain their matches though since they can be sure the nexthop
should have those flags (they would be the route that set them).
Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
Diffstat (limited to 'tests')
7 files changed, 0 insertions, 7 deletions
diff --git a/tests/topotests/bfd-topo2/r1/ipv6_routes.json b/tests/topotests/bfd-topo2/r1/ipv6_routes.json index d09439a8a..0fd03b516 100644 --- a/tests/topotests/bfd-topo2/r1/ipv6_routes.json +++ b/tests/topotests/bfd-topo2/r1/ipv6_routes.json @@ -33,7 +33,6 @@ { "interfaceName": "r1-eth0", "interfaceIndex": 2, - "flags": 1, "active": true, "afi": "ipv6" } diff --git a/tests/topotests/bfd-topo2/r2/ipv4_routes.json b/tests/topotests/bfd-topo2/r2/ipv4_routes.json index 3c41e1343..69a5f1a5b 100644 --- a/tests/topotests/bfd-topo2/r2/ipv4_routes.json +++ b/tests/topotests/bfd-topo2/r2/ipv4_routes.json @@ -11,7 +11,6 @@ { "active": true, "directlyConnected": true, - "flags": 1, "interfaceIndex": 3, "interfaceName": "r2-eth1" } diff --git a/tests/topotests/bfd-topo2/r2/ipv6_routes.json b/tests/topotests/bfd-topo2/r2/ipv6_routes.json index bb45bbae5..66abade38 100644 --- a/tests/topotests/bfd-topo2/r2/ipv6_routes.json +++ b/tests/topotests/bfd-topo2/r2/ipv6_routes.json @@ -11,7 +11,6 @@ { "active": true, "directlyConnected": true, - "flags": 1, "interfaceIndex": 4, "interfaceName": "r2-eth2" } diff --git a/tests/topotests/bfd-topo2/r3/ipv4_routes.json b/tests/topotests/bfd-topo2/r3/ipv4_routes.json index cbf116e68..d4a0812ae 100644 --- a/tests/topotests/bfd-topo2/r3/ipv4_routes.json +++ b/tests/topotests/bfd-topo2/r3/ipv4_routes.json @@ -11,7 +11,6 @@ { "active": true, "directlyConnected": true, - "flags": 1, "interfaceIndex": 2, "interfaceName": "r3-eth0" } diff --git a/tests/topotests/bfd-topo2/r4/ipv6_routes.json b/tests/topotests/bfd-topo2/r4/ipv6_routes.json index a22c90cbb..af8272c4a 100644 --- a/tests/topotests/bfd-topo2/r4/ipv6_routes.json +++ b/tests/topotests/bfd-topo2/r4/ipv6_routes.json @@ -11,7 +11,6 @@ { "active": true, "directlyConnected": true, - "flags": 1, "interfaceIndex": 2, "interfaceName": "r4-eth0" } diff --git a/tests/topotests/bgp_ipv6_rtadv/r1/ipv6_routes.json b/tests/topotests/bgp_ipv6_rtadv/r1/ipv6_routes.json index d0378b564..acf5c8b27 100644 --- a/tests/topotests/bgp_ipv6_rtadv/r1/ipv6_routes.json +++ b/tests/topotests/bgp_ipv6_rtadv/r1/ipv6_routes.json @@ -10,7 +10,6 @@ { "interfaceName": "r1-eth0", "interfaceIndex": 2, - "flags": 1, "active": true, "afi": "ipv6" } 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 1ca62094b..e5aff94bd 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 @@ -10,7 +10,6 @@ "internalFlags": 0, "nexthops": [ { - "flags": 1, "afi": "ipv6", "interfaceIndex": 2, "interfaceName": "r1-eth0", |