zebra: zebra route-map delay-timer is global not per vrf

The zebra route-map delay timer value is a global value
not a per vrf change.  As such we should only print it
out one time.

We are seeing this:

zebra route-map delay-timer 33
 exit-vrf
zebra route-map delay-timer 33

When we have 2 vrf's configured.

Fix the code to only write it out for the default vrf

Ticket: CM-32888
Signed-off-by: Donald Sharp <sharpd@nvidia.com>

diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c
index 8155f9acfe058d6f079d9efa6aca467edc02e7c6..88ef4823b15880c0e31a7957f8b0039c74ac8b1b 100644 (file)
--- a/zebra/zebra_routemap.c
+++ b/zebra/zebra_routemap.c
@@ -1900,7 +1900,8 @@ void zebra_routemap_config_write_protocol(struct vty *vty,
                vty_out(vty, "%sipv6 nht %s route-map %s\n", space, "any",
                        NHT_RM_NAME(zvrf, AFI_IP6, ZEBRA_ROUTE_MAX));
 
-       if (zebra_rmap_update_timer != ZEBRA_RMAP_DEFAULT_UPDATE_TIMER)
+       if (zvrf_id(zvrf) == VRF_DEFAULT
+           && zebra_rmap_update_timer != ZEBRA_RMAP_DEFAULT_UPDATE_TIMER)
                vty_out(vty, "zebra route-map delay-timer %d\n",
                        zebra_rmap_update_timer);
 }