From bd83405867e73675983aeea65a9f2390158948ee Mon Sep 17 00:00:00 2001 From: Donatas Abraitis Date: Thu, 25 Aug 2022 13:15:27 +0300 Subject: [PATCH] bgpd: Do not print new line for EVPN CLI outputs if it's a JSON Before: ``` $ vtysh -c 'show bgp l2vpn evpn route detail json' <<<<<<<<<<<<<<<<<<<< empty line <<<<<<<<<<<<<<<<<<<< empty line <<<<<<<<<<<<<<<<<<<< empty line <<<<<<<<<<<<<<<<<<<< empty line { ... "numPrefix":4, "numPaths":4 <<<<< four paths = four empty lines } ``` Contain as much "empty lines" before the JSON string as the number of paths displayed. Signed-off-by: Donatas Abraitis --- bgpd/bgp_route.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index 28941fe296..70b28cf74a 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -9986,7 +9986,7 @@ void route_vty_out_detail(struct vty *vty, struct bgp *bgp, struct bgp_dest *bn, vty_out(vty, " Gateway IP %s", gwip_buf); } - if (safi == SAFI_EVPN) + if (safi == SAFI_EVPN && !json_path) vty_out(vty, "\n"); /* Line1 display AS-path, Aggregator */ @@ -11467,7 +11467,6 @@ void route_vty_out_detail_header(struct vty *vty, struct bgp *bgp, label = label_pton(&dest->local_label); if (safi == SAFI_EVPN) { - if (!json) { vty_out(vty, "BGP routing table entry for %s%s%pFX\n", prd ? prefix_rd2str(prd, buf1, sizeof(buf1)) -- 2.39.5