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

Merge pull request #6143 from ton31337/fix/remove_prefixReceivedCount

Browse Source 
bgpd: Remove `prefixReceivedCount` from JSON
This commit is contained in:
Sri Mohana Singamsetty 2020-04-05 11:41:04 -07:00 committed by GitHub
commit 2ebae25d08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 42 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bgpd/bgp_vty.c
View File

@ -9053,13 +9053,6 @@ static int bgp_show_summary(struct vty *vty, struct bgp *bgp, int afi, int safi,
peer_uptime(peer->uptime, timebuf, BGP_UPTIME_LEN, peer_uptime(peer->uptime, timebuf, BGP_UPTIME_LEN,
use_json, json_peer); use_json, json_peer);
/*
* Adding "pfxRcd" field to match with the corresponding
* CLI. "prefixReceivedCount" will be deprecated in
* future.
*/
json_object_int_add(json_peer, "prefixReceivedCount",
peer->pcount[afi][pfx_rcd_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]);

40
tests/topotests/bgp-ecmp-topo1/r1/summary.txt
View File

@ -9,121 +9,121 @@
"10.0.1.101":{ "10.0.1.101":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.1.102":{ "10.0.1.102":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.1.103":{ "10.0.1.103":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.1.104":{ "10.0.1.104":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.1.105":{ "10.0.1.105":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.2.106":{ "10.0.2.106":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.2.107":{ "10.0.2.107":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.2.108":{ "10.0.2.108":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.2.109":{ "10.0.2.109":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.2.110":{ "10.0.2.110":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.3.111":{ "10.0.3.111":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.3.112":{ "10.0.3.112":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.3.113":{ "10.0.3.113":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.3.114":{ "10.0.3.114":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.3.115":{ "10.0.3.115":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.4.116":{ "10.0.4.116":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.4.117":{ "10.0.4.117":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.4.118":{ "10.0.4.118":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.4.119":{ "10.0.4.119":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.4.120":{ "10.0.4.120":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
} }
}, },

40
tests/topotests/bgp-ecmp-topo1/r1/summary20.txt
View File

@ -8,121 +8,121 @@
"10.0.1.101":{ "10.0.1.101":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.1.102":{ "10.0.1.102":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.1.103":{ "10.0.1.103":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.1.104":{ "10.0.1.104":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.1.105":{ "10.0.1.105":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.2.106":{ "10.0.2.106":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.2.107":{ "10.0.2.107":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.2.108":{ "10.0.2.108":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.2.109":{ "10.0.2.109":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.2.110":{ "10.0.2.110":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.3.111":{ "10.0.3.111":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.3.112":{ "10.0.3.112":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.3.113":{ "10.0.3.113":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.3.114":{ "10.0.3.114":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.3.115":{ "10.0.3.115":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.4.116":{ "10.0.4.116":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.4.117":{ "10.0.4.117":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.4.118":{ "10.0.4.118":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.4.119":{ "10.0.4.119":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
}, },
"10.0.4.120":{ "10.0.4.120":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":42, "pfxRcd":42,
"state":"Established" "state":"Established"
} }
}, },

2
tests/topotests/bgp_vrf_netns/r1/summary.txt
View File

@ -8,7 +8,7 @@
"10.0.1.101":{ "10.0.1.101":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":10, "pfxRcd":10,
"state":"Established" "state":"Established"
} }
}, },

2
tests/topotests/bgp_vrf_netns/r1/summary20.txt
View File

@ -7,7 +7,7 @@
"10.0.1.101":{ "10.0.1.101":{
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":10, "pfxRcd":10,
"state":"Established" "state":"Established"
} }
}, },

2
tests/topotests/evpn-pim-1/spine/bgp.summ.json
View File

@ -12,7 +12,6 @@
"tableVersion":0, "tableVersion":0,
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":3,
"pfxRcd":3, "pfxRcd":3,
"pfxSnt":7, "pfxSnt":7,
"state":"Established", "state":"Established",
@ -26,7 +25,6 @@
"tableVersion":0, "tableVersion":0,
"outq":0, "outq":0,
"inq":0, "inq":0,
"prefixReceivedCount":3,
"pfxRcd":3, "pfxRcd":3,
"pfxSnt":7, "pfxSnt":7,
"state":"Established", "state":"Established",