proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 14:04:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6295 from ton31337/feature/show_bgp_afi_safi_sntpfx

Browse Source 
bgpd: Show PfxSnt for `show bgp <afi> <safi>` command
This commit is contained in:
Lou Berger 2020-04-28 11:34:13 -04:00 committed by GitHub
commit 3b548ddc33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bgpd/bgp_vty.c
View File

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

6
tests/topotests/all-protocol-startup/r1/show_bgp_ipv6_summary.ref
View File

@ -3,6 +3,6 @@ BGP table version 1
RIB entries 1, using XXXX bytes of memory RIB entries 1, using XXXX bytes of memory
Peers 2, using XXXX KiB of memory Peers 2, using XXXX KiB of memory
Neighbor V AS MsgRcvd MsgSent TblVer InQ OutQ Up/Down State/PfxRcd 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 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 fc00:0:0:8::2000 4 200 0 0 0 0 0 never Active 0

10
tests/topotests/all-protocol-startup/r1/show_ip_bgp_summary.ref
View File

@ -3,8 +3,8 @@ BGP table version 1
RIB entries 1, using XXXX bytes of memory RIB entries 1, using XXXX bytes of memory
Peers 4, using XXXX KiB of memory Peers 4, using XXXX KiB of memory
Neighbor V AS MsgRcvd MsgSent TblVer InQ OutQ Up/Down State/PfxRcd 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 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 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 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 fc00:0:0:8::2000 4 200 0 0 0 0 0 never Active 0

14
tests/topotests/bgp_multiview_topo1/test_bgp_multiview_topo1.py
View File

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