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>

diff --git a/tests/topotests/bfd-topo2/r1/ipv6_routes.json b/tests/topotests/bfd-topo2/r1/ipv6_routes.json
index d09439a8a63aa938d3ddb9bfaa0094863ce52e94..0fd03b516d7fdd86b3f8c942ffe07e8e796573b4 100644 (file)
--- 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 3c41e134349bb49f96a021df580f2cab99f7e643..69a5f1a5bc97f0e92908ec11b655a8d3c48c2910 100644 (file)
--- 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 bb45bbae52837678737ee3fa8265593cc2ad1081..66abade380effeb500f5799eb428858124f6cc44 100644 (file)
--- 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 cbf116e6879e12298355da42ab9adeffa07013e1..d4a0812ae16a984c2c2edc6393d8c2ef1c94bc1c 100644 (file)
--- 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 a22c90cbbaeea8454fe8919646a75fae3a20c172..af8272c4aff821b95c561c8b8a28a0f7600a7e1b 100644 (file)
--- 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 d0378b56493f3afe9c1b5c90cb07e87eed514ecf..acf5c8b276bad0c203b7d6f9950077d8e7789054 100644 (file)
--- 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 1ca62094bdfc9af1259f93ef04afd1837a5e991a..e5aff94bdd0d6973800495c5b3e93d3f472623b1 100644 (file)
--- 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",