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 <donatas@opensourcerouting.org>

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 85540627b035d49f286a7e2e5c72b96f60f13cee..5651337332c17319d5f6962396d3f64e20ffb48e 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -10052,7 +10052,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 */
@@ -11545,7 +11545,6 @@ void route_vty_out_detail_header(struct vty *vty, struct bgp *bgp,
        has_valid_label = bgp_is_valid_label(&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))