diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2022-08-25 13:15:27 +0300 |
|---|---|---|
| committer | Donatas Abraitis <donatas@opensourcerouting.org> | 2022-08-29 16:24:36 +0300 |
| commit | bd83405867e73675983aeea65a9f2390158948ee (patch) | |
| tree | 52e30914ecfbb7224d23f9d876483a9a219a8496 | |
| parent | 73e4db98dd97570920756a5d4e8c619627769945 (diff) | |
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>
| -rw-r--r-- | bgpd/bgp_route.c | 3 |
1 files changed, 1 insertions, 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)) |