summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Walton <dwalton@cumulusnetworks.com>2015-09-17 07:54:20 -0700
committerDaniel Walton <dwalton@cumulusnetworks.com>2015-09-17 07:54:20 -0700
commitd1d16a965e15efda6ac4ec0a4946ff6f4310f674 (patch)
treec28fc6b059a012f6655eaddc83393b858fc47907
parentc50aceeeee3944f6c229b08e31e2354d037a3ab1 (diff)
BGP: "show ip bgp json" should return empty "routes : {}" if the table
is empty Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com> Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com> Ticket: CM-7475 Reviewed By: Donald Sharp Testing Done: If the BGP table is empty, intead of returning {'alert': 'No BGP network exists', 'routerId': '10.0.9.2', 'tableVersion': 180} we should return {'routerId': '10.0.9.2', 'routes': {}, 'tableVersion': 180} This provides a more consistent json interface which is easier to script against.
-rw-r--r--bgpd/bgp_route.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 7913867dfa..2e35f15ec4 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -8084,15 +8084,7 @@ bgp_show_table (struct vty *vty, struct bgp_table *table, struct in_addr *router
if (use_json)
{
- if (output_count == 0)
- {
- if (type == bgp_show_type_normal)
- json_object_string_add(json, "alert", "No BGP network exists");
- else
- json_object_string_add(json, "alert", "No route output");
- }
- else
- json_object_object_add(json, "routes", json_routes);
+ json_object_object_add(json, "routes", json_routes);
vty_out (vty, "%s%s", json_object_to_json_string(json), VTY_NEWLINE);
json_object_free(json);
}