From b8fd6a15a681c0c1daec158a538ff4a19e456d2e Mon Sep 17 00:00:00 2001 From: vivek Date: Thu, 31 Mar 2016 17:42:48 -0700 Subject: [PATCH] BGP: Enable multiple instance support by default Quagga BGP needed a config 'bgp multiple-instance' in order to be able to configure and use VRFs. Since this support is intrinsic to the implementation, make this configuration on by default. Corresponding change to 'show running-config' (and write) to display only if "no" is configured. This change will eliminate one unnecessary step in the configuration. Signed-off-by: Vivek Venkatraman Reviewed-by: Don Slice Reviewed-by: Donald Sharp Ticket: CM-10070 Reviewed By: CCR-4383 Testing Done: Manual --- bgpd/bgpd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 499f72bfd1..7b3f4bb6c1 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -6930,9 +6930,9 @@ bgp_config_write (struct vty *vty) struct listnode *mnode, *mnnode; /* BGP Multiple instance. */ - if (bgp_option_check (BGP_OPT_MULTIPLE_INSTANCE)) + if (!bgp_option_check (BGP_OPT_MULTIPLE_INSTANCE)) { - vty_out (vty, "bgp multiple-instance%s", VTY_NEWLINE); + vty_out (vty, "no bgp multiple-instance%s", VTY_NEWLINE); write++; } @@ -7182,6 +7182,9 @@ bgp_master_init (void) bm->rmap_update_timer = RMAP_DEFAULT_UPDATE_TIMER; bgp_process_queue_init(); + + /* Enable multiple instances by default. */ + bgp_option_set (BGP_OPT_MULTIPLE_INSTANCE); } /* -- 2.39.5