summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDon Slice <dslice@cumulusnetworks.com>2018-05-24 10:58:37 -0400
committerDon Slice <dslice@cumulusnetworks.com>2018-05-24 10:58:37 -0400
commit9e6e6f46eebb3c7d02643d53ceced6d08ba10db2 (patch)
tree80e3b1015a313cd0a4a6939c98476845894cfb72
parent88b7d2555c577a9ba947f3043a33cdf6b90776a7 (diff)
bgpd: additional neighbor message improvement
Added improved error message text to other places that could also encounter the same condition. In testing found that in certain case, duplicate error messages were previously issued. This fix also removes the duplicates. Signed-off-by: Don Slice <dslice@cumulusnetworks.com>
-rw-r--r--bgpd/bgp_route.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 004bdb2ef4..d0c2ff8186 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -9648,13 +9648,13 @@ static struct peer *peer_lookup_in_view(struct vty *vty, struct bgp *bgp,
json_object *json_no = NULL;
json_no = json_object_new_object();
json_object_string_add(json_no, "warning",
- "No such neighbor");
+ "No such neighbor in this view/vrf");
vty_out(vty, "%s\n",
json_object_to_json_string_ext(
json_no, JSON_C_TO_STRING_PRETTY));
json_object_free(json_no);
} else
- vty_out(vty, "No such neighbor\n");
+ vty_out(vty, "No such neighbor in this view/vrf\n");
return NULL;
}
@@ -10752,10 +10752,8 @@ DEFUN (show_ip_bgp_neighbor_routes,
peerstr = argv[++idx]->arg;
peer = peer_lookup_in_view(vty, bgp, peerstr, uj);
- if (!peer) {
- vty_out(vty, "No such neighbor\n");
+ if (!peer)
return CMD_WARNING;
- }
if (argv_find(argv, argc, "flap-statistics", &idx))
sh_type = bgp_show_type_flap_neighbor;