From: Stephen Worley <sworley@cumulusnetworks.com>
Date: Tue, 3 Sep 2019 17:53:45 +0000 (-0400)
Subject: topotests: Expect shared nexthop memory
X-Git-Tag: base_7.3~219^2~23
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=737170f5bf7e9f999543c30eff4824646885652b;p=matthieu%2Ffrr.git

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 d09439a8a6..0fd03b516d 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 3c41e13434..69a5f1a5bc 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 bb45bbae52..66abade380 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 cbf116e687..d4a0812ae1 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 a22c90cbba..af8272c4af 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 d0378b5649..acf5c8b276 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 1ca62094bd..e5aff94bdd 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",