From 9df81095f8f2735a89df6e0f2bb3dfd7c0aa2b56 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Wed, 6 Jan 2021 11:29:43 -0500 Subject: [PATCH] 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 --- zebra/zebra_routemap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c index 7f766a5179..bbc8b6f19d 100644 --- a/zebra/zebra_routemap.c +++ b/zebra/zebra_routemap.c @@ -1862,7 +1862,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); } -- 2.39.5