Revert "bgpd: Show PfxSnt for `show bgp <afi> <safi>` command"

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index f565fa1746b33dc3685ae872ad4a04f7ca5e0332..b7a7d2c3828eeb4fa47fca7ec03098e55b67a71d 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -9050,12 +9050,10 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
                                        vty_out(vty, "EstdCnt DropCnt ResetTime Reason\n");
                                else
                                        vty_out(vty,
-                                               "V         AS   MsgRcvd   MsgSent   TblVer  InQ OutQ  Up/Down State/PfxRcd   PfxSnt\n");
+                                       "V         AS   MsgRcvd   MsgSent   TblVer  InQ OutQ  Up/Down State/PfxRcd\n");
                        }
                }
 
-               paf = peer_af_find(peer, afi, pfx_rcd_safi);
-
                count++;
                /* Works for both failed & successful cases */
                if (peer_dynamic_neighbor(peer))
@@ -9111,6 +9109,7 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
                                json_object_int_add(json_peer, "pfxRcd",
                                                    peer->pcount[afi][pfx_rcd_safi]);
 
+                               paf = peer_af_find(peer, afi, pfx_rcd_safi);
                                if (paf && PAF_SUBGRP(paf))
                                        json_object_int_add(json_peer,
                                                            "pfxSnt",
@@ -9196,7 +9195,7 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
                                        peer_uptime(peer->uptime, timebuf,
                                                    BGP_UPTIME_LEN, 0, NULL));
 
-                               if (peer->status == Established) {
+                               if (peer->status == Established)
                                        if (peer->afc_recv[afi][safi])
                                                vty_out(vty, " %12" PRIu32,
                                                        peer->pcount
@@ -9204,12 +9203,7 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
                                                                [pfx_rcd_safi]);
                                        else
                                                vty_out(vty, " NoNeg");
-
-                                       if (paf && PAF_SUBGRP(paf))
-                                               vty_out(vty, " %8" PRIu32,
-                                                       (PAF_SUBGRP(paf))
-                                                               ->scount);
-                               } else {
+                               else {
                                        if (CHECK_FLAG(peer->flags, PEER_FLAG_SHUTDOWN))
                                                vty_out(vty, " Idle (Admin)");
                                        else if (CHECK_FLAG(
@@ -9220,8 +9214,6 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
                                                vty_out(vty, " %12s",
                                                        lookup_msg(bgp_status_msg,
                                                                   peer->status, NULL));
-
-                                       vty_out(vty, " %8" PRIu32, 0);
                                }
                                vty_out(vty, "\n");
                        }

diff --git a/tests/topotests/all-protocol-startup/r1/show_bgp_ipv6_summary.ref b/tests/topotests/all-protocol-startup/r1/show_bgp_ipv6_summary.ref
index 1e41263e78ae49001ced3575c34fe7278f0b460f..3b140e369874f53d06ae7b5903251895b49bb12c 100644 (file)
--- a/tests/topotests/all-protocol-startup/r1/show_bgp_ipv6_summary.ref
+++ b/tests/topotests/all-protocol-startup/r1/show_bgp_ipv6_summary.ref
@@ -3,6 +3,6 @@ BGP table version 1
 RIB entries 1, using XXXX bytes of memory
 Peers 2, using XXXX KiB of memory
 
-Neighbor         V         AS   MsgRcvd   MsgSent   TblVer  InQ OutQ  Up/Down State/PfxRcd   PfxSnt
-fc00:0:0:8::1000 4        100         0         0        0    0    0    never       Active        0
-fc00:0:0:8::2000 4        200         0         0        0    0    0    never       Active        0
+Neighbor         V         AS   MsgRcvd   MsgSent   TblVer  InQ OutQ  Up/Down State/PfxRcd
+fc00:0:0:8::1000 4        100         0         0        0    0    0    never       Active
+fc00:0:0:8::2000 4        200         0         0        0    0    0    never       Active

diff --git a/tests/topotests/all-protocol-startup/r1/show_ip_bgp_summary.ref b/tests/topotests/all-protocol-startup/r1/show_ip_bgp_summary.ref
index 3ffbf3ff422844b786f7e1328eea196c5ddc9b3a..7a246b1149a66fe5e9e973ceae20731825e499ab 100644 (file)
--- a/tests/topotests/all-protocol-startup/r1/show_ip_bgp_summary.ref
+++ b/tests/topotests/all-protocol-startup/r1/show_ip_bgp_summary.ref
@@ -3,8 +3,8 @@ BGP table version 1
 RIB entries 1, using XXXX bytes of memory
 Peers 4, using XXXX KiB of memory
 
-Neighbor         V         AS   MsgRcvd   MsgSent   TblVer  InQ OutQ  Up/Down State/PfxRcd   PfxSnt
-192.168.7.10     4        100         0         0        0    0    0    never       Active        0
-192.168.7.20     4        200         0         0        0    0    0    never       Active        0
-fc00:0:0:8::1000 4        100         0         0        0    0    0    never       Active        0
-fc00:0:0:8::2000 4        200         0         0        0    0    0    never       Active        0
+Neighbor         V         AS   MsgRcvd   MsgSent   TblVer  InQ OutQ  Up/Down State/PfxRcd
+192.168.7.10     4        100         0         0        0    0    0    never       Active
+192.168.7.20     4        200         0         0        0    0    0    never       Active
+fc00:0:0:8::1000 4        100         0         0        0    0    0    never       Active
+fc00:0:0:8::2000 4        200         0         0        0    0    0    never       Active

diff --git a/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py b/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py
index a2020ffa557d65357225ab81a68aacbc8ffb8794..c342b17dd2ddbc04ef135dc99f29a3f75cca9d4c 100755 (executable)
--- a/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py
+++ b/tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py
@@ -29,19 +29,19 @@ test_bgp_multiview_topo1.py: Simple Quagga/FRR Route-Server Test
 |  peer1   | |  peer2   | |  peer3   | |  peer4   | |  peer5   |
 | AS 65001 | | AS 65002 | | AS 65003 | | AS 65004 | | AS 65005 |
 +-----+----+ +-----+----+ +-----+----+ +-----+----+ +-----+----+
-      | .1         | .2         | .3         | .4         | .5
+      | .1         | .2         | .3         | .4         | .5 
       |     ______/            /            /   _________/
-       \   /  ________________/            /   /
-        | |  /   _________________________/   /     +----------+
+       \   /  ________________/            /   /     
+        | |  /   _________________________/   /     +----------+  
         | | |  /   __________________________/   ___|  peer6   |
         | | | |  /  ____________________________/.6 | AS 65006 |
         | | | | |  /  _________________________     +----------+
-        | | | | | |  /  __________________     \    +----------+
+        | | | | | |  /  __________________     \    +----------+ 
         | | | | | | |  /                  \     \___|  peer7   |
         | | | | | | | |                    \     .7 | AS 65007 |
      ~~~~~~~~~~~~~~~~~~~~~                  \       +----------+
    ~~         SW1         ~~                 \      +----------+
-   ~~       Switch           ~~               \_____|  peer8   |
+   ~~       Switch           ~~               \_____|  peer8   |  
    ~~    172.16.1.0/24     ~~                    .8 | AS 65008 |
      ~~~~~~~~~~~~~~~~~~~~~                          +----------+
               |
@@ -49,7 +49,7 @@ test_bgp_multiview_topo1.py: Simple Quagga/FRR Route-Server Test
     +---------+---------+
     |      FRR R1       |
     |   BGP Multi-View  |
-    | Peer 1-3 > View 1 |
+    | Peer 1-3 > View 1 |       
     | Peer 4-5 > View 2 |
     | Peer 6-8 > View 3 |
     +---------+---------+
@@ -226,7 +226,7 @@ def test_bgp_converge():
         for i in range(1, 2):
             for view in range(1, 4):
                 notConverged = net["r%s" % i].cmd(
-                    'vtysh -c "show ip bgp view %s summary" 2> /dev/null | grep ^[0-9] | grep -vP " 11\s+(\d+)$"'
+                    'vtysh -c "show ip bgp view %s summary" 2> /dev/null | grep ^[0-9] | grep -v " 11$"'
                     % view
                 )
                 if notConverged: