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

bgpd: Fix 'show bgp ... summary json' to have empty {}

Browse Source 
When we have no output for a json command we should have
an empty {} displayed.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-05-02 10:20:10 -04:00
parent 05ba625af7
commit 5ce77b2b1e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bgpd/bgp_vty.c
View File

@ -6759,6 +6759,7 @@ bgp_show_summary_afi_safi (struct vty *vty, struct bgp *bgp, int afi, int safi,
int afi_wildcard = (afi == AFI_MAX); int afi_wildcard = (afi == AFI_MAX);
int safi_wildcard = (safi == SAFI_MAX); int safi_wildcard = (safi == SAFI_MAX);
int is_wildcard = (afi_wildcard || safi_wildcard); int is_wildcard = (afi_wildcard || safi_wildcard);
bool json_output = false;
if (use_json && is_wildcard) if (use_json && is_wildcard)
vty_out (vty, "{%s", VTY_NEWLINE); vty_out (vty, "{%s", VTY_NEWLINE);
@ -6772,6 +6773,7 @@ bgp_show_summary_afi_safi (struct vty *vty, struct bgp *bgp, int afi, int safi,
{ {
if (bgp_show_summary_afi_safi_peer_exists (bgp, afi, safi)) if (bgp_show_summary_afi_safi_peer_exists (bgp, afi, safi))
{ {
json_output = true;
if (is_wildcard) if (is_wildcard)
{ {
/* /*
@ -6812,7 +6814,8 @@ bgp_show_summary_afi_safi (struct vty *vty, struct bgp *bgp, int afi, int safi,
if (use_json && is_wildcard) if (use_json && is_wildcard)
vty_out (vty, "}%s", VTY_NEWLINE); vty_out (vty, "}%s", VTY_NEWLINE);
else if (use_json && !json_output)
vty_out (vty, "{}%s", VTY_NEWLINE);
} }
static void static void