summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bgpd/bgp_vty.c7
-rw-r--r--tests/topotests/bgp-ecmp-topo1/r1/summary.txt40
-rw-r--r--tests/topotests/bgp-ecmp-topo1/r1/summary20.txt40
-rw-r--r--tests/topotests/bgp_vrf_netns/r1/summary.txt2
-rw-r--r--tests/topotests/bgp_vrf_netns/r1/summary20.txt2
-rw-r--r--tests/topotests/evpn-pim-1/spine/bgp.summ.json2
6 files changed, 42 insertions, 51 deletions
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 9f4347e736..0569a770c2 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -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,
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",
peer->pcount[afi][pfx_rcd_safi]);
diff --git a/tests/topotests/bgp-ecmp-topo1/r1/summary.txt b/tests/topotests/bgp-ecmp-topo1/r1/summary.txt
index bccc483d52..11611d041b 100644
--- a/tests/topotests/bgp-ecmp-topo1/r1/summary.txt
+++ b/tests/topotests/bgp-ecmp-topo1/r1/summary.txt
@@ -9,121 +9,121 @@
"10.0.1.101":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.1.102":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.1.103":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.1.104":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.1.105":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.2.106":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.2.107":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.2.108":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.2.109":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.2.110":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.3.111":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.3.112":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.3.113":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.3.114":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.3.115":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.4.116":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.4.117":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.4.118":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.4.119":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.4.120":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
}
},
diff --git a/tests/topotests/bgp-ecmp-topo1/r1/summary20.txt b/tests/topotests/bgp-ecmp-topo1/r1/summary20.txt
index 73ae256abe..f90aedb1ec 100644
--- a/tests/topotests/bgp-ecmp-topo1/r1/summary20.txt
+++ b/tests/topotests/bgp-ecmp-topo1/r1/summary20.txt
@@ -8,121 +8,121 @@
"10.0.1.101":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.1.102":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.1.103":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.1.104":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.1.105":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.2.106":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.2.107":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.2.108":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.2.109":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.2.110":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.3.111":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.3.112":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.3.113":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.3.114":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.3.115":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.4.116":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.4.117":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.4.118":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.4.119":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
},
"10.0.4.120":{
"outq":0,
"inq":0,
- "prefixReceivedCount":42,
+ "pfxRcd":42,
"state":"Established"
}
},
diff --git a/tests/topotests/bgp_vrf_netns/r1/summary.txt b/tests/topotests/bgp_vrf_netns/r1/summary.txt
index 7473fa2151..1a079ff130 100644
--- a/tests/topotests/bgp_vrf_netns/r1/summary.txt
+++ b/tests/topotests/bgp_vrf_netns/r1/summary.txt
@@ -8,7 +8,7 @@
"10.0.1.101":{
"outq":0,
"inq":0,
- "prefixReceivedCount":10,
+ "pfxRcd":10,
"state":"Established"
}
},
diff --git a/tests/topotests/bgp_vrf_netns/r1/summary20.txt b/tests/topotests/bgp_vrf_netns/r1/summary20.txt
index 18318e07a8..2b5787e6da 100644
--- a/tests/topotests/bgp_vrf_netns/r1/summary20.txt
+++ b/tests/topotests/bgp_vrf_netns/r1/summary20.txt
@@ -7,7 +7,7 @@
"10.0.1.101":{
"outq":0,
"inq":0,
- "prefixReceivedCount":10,
+ "pfxRcd":10,
"state":"Established"
}
},
diff --git a/tests/topotests/evpn-pim-1/spine/bgp.summ.json b/tests/topotests/evpn-pim-1/spine/bgp.summ.json
index faf40c8d43..53370507e8 100644
--- a/tests/topotests/evpn-pim-1/spine/bgp.summ.json
+++ b/tests/topotests/evpn-pim-1/spine/bgp.summ.json
@@ -12,7 +12,6 @@
"tableVersion":0,
"outq":0,
"inq":0,
- "prefixReceivedCount":3,
"pfxRcd":3,
"pfxSnt":7,
"state":"Established",
@@ -26,7 +25,6 @@
"tableVersion":0,
"outq":0,
"inq":0,
- "prefixReceivedCount":3,
"pfxRcd":3,
"pfxSnt":7,
"state":"Established",