From: Daniel Walton <dwalton@cumulusnetworks.com>
Date: Thu, 5 Nov 2015 22:42:38 +0000 (+0000)
Subject: BGP: Correctly display local-as for peer-group member
X-Git-Tag: frr-2.0-rc1~1204^2~3
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=06830cb85fc02b5a4fcfd907462e0aa81b86f5ba;p=matthieu%2Ffrr.git

BGP: Correctly display local-as for peer-group member

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by:   Donald Sharp <sharpd@cumulusnetworks.com>

Ticket: CM-7700
---

diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 1edb9229d2..7b76345147 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -6281,7 +6281,12 @@ bgp_config_write_peer_global (struct vty *vty, struct bgp *bgp,
   /* local-as */
   if (peer->change_local_as)
     {
-      if (! peer_group_active (peer))
+      if (! peer_group_active (peer)
+          || peer->change_local_as != g_peer->change_local_as
+          || (CHECK_FLAG (peer->flags, PEER_FLAG_LOCAL_AS_NO_PREPEND) !=
+              CHECK_FLAG (g_peer->flags, PEER_FLAG_LOCAL_AS_NO_PREPEND))
+          || (CHECK_FLAG (peer->flags, PEER_FLAG_LOCAL_AS_REPLACE_AS) !=
+              CHECK_FLAG (g_peer->flags, PEER_FLAG_LOCAL_AS_REPLACE_AS)))
         {
           vty_out (vty, " neighbor %s local-as %u%s%s%s", addr,
                    peer->change_local_as,