diff options
| author | Donatas Abraitis <donatas@opensourcerouting.org> | 2022-08-25 12:15:27 +0200 |
|---|---|---|
| committer | Donatas Abraitis <donatas@opensourcerouting.org> | 2022-08-25 12:15:27 +0200 |
| commit | 2bf9780b268d29161154e90af3fd6929298eef7e (patch) | |
| tree | 3abe62eb3ab46a2e29ae1e5d96e5bf79610edbd3 /bgpd/bgp_route.c | |
| parent | Merge pull request #11829 from donaldsharp/time_32_bits (diff) | |
| download | frr-2bf9780b268d29161154e90af3fd6929298eef7e.tar.xz frr-2bf9780b268d29161154e90af3fd6929298eef7e.zip | |
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>
Diffstat (limited to '')
| -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 85540627b..565133733 100644 --- 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)) |