bgpd: Display 'no neighbor 192.168.33.44 activate'

Since the default for ipv4 unicast is to now assume
that the neighbor is activated, print out the
no neighbor 192.168.33.44 activate
line when it is explicitly turned off.

Ticket: CM-12809
Reported-by: Lou Berger <lberger@labn.net>
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by:

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 87e5c54ea2958888ac9c0c71ba718cea621526b6..bfde53d3e487c2d9d0f5fb1fd9eefdb954b3773c 100644 (file)
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -6739,6 +6739,18 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
                                 "  neighbor %s activate%s",
                                 addr, VTY_NEWLINE);
         }
+      else
+       {
+         if ((afi == AFI_IP) && (safi == SAFI_UNICAST))
+           {
+             if (!bgp_flag_check (bgp, BGP_FLAG_NO_DEFAULT_IPV4))
+               {
+                 afi_header_vty_out (vty, afi, safi, write,
+                                     "  no neighbor %s activate%s",
+                                     addr, VTY_NEWLINE);
+               }
+           }
+       }
     }
 
   /* addpath TX knobs */