proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-29 21:01:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgpd: Remove redundant warning message

Browse Source 
When bgp_vty_find_and_parse_afi_safi_vrf detects
a invalidly named vrf, it warns the user.  There
is no need for the calling function to warn
again.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2017-01-25 09:43:11 -05:00
parent 7eeee51e02
commit c493f2d83a
1 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
bgpd/bgp_route.c
View File

@ -7877,10 +7877,8 @@ DEFUN (show_ip_bgp,
idx = bgp_vty_find_and_parse_afi_safi_vrf (vty, argv, argc, idx, &afi, &safi, &vrf); idx = bgp_vty_find_and_parse_afi_safi_vrf (vty, argv, argc, idx, &afi, &safi, &vrf);
if (!idx) if (!idx)
{ return CMD_WARNING;
vty_out (vty, "View/Vrf Specified: %s is unknown", argv[5]->arg);
return CMD_WARNING;
}
int uj = use_json (argc, argv); int uj = use_json (argc, argv);
if (uj) argc--; if (uj) argc--;
@ -7986,10 +7984,7 @@ DEFUN (show_ip_bgp_route,
idx = bgp_vty_find_and_parse_afi_safi_vrf (vty, argv, argc, idx, &afi, &safi, &vrf); idx = bgp_vty_find_and_parse_afi_safi_vrf (vty, argv, argc, idx, &afi, &safi, &vrf);
if (!idx) if (!idx)
{ return CMD_WARNING;
vty_out (vty, "View/Vrf Specified: %s is unknown", argv[5]->arg);
return CMD_WARNING;
}
if (vrf != VRF_ALL) if (vrf != VRF_ALL)
{ {
@ -8056,10 +8051,7 @@ DEFUN (show_ip_bgp_regexp,
int idx = 0; int idx = 0;
idx = bgp_vty_find_and_parse_afi_safi_vrf (vty, argv, argc, idx, &afi, &safi, &vrf); idx = bgp_vty_find_and_parse_afi_safi_vrf (vty, argv, argc, idx, &afi, &safi, &vrf);
if (!idx) if (!idx)
{ return CMD_WARNING;
vty_out (vty, "View/Vrf Specified: %s is unknown", argv[5]->arg);
return CMD_WARNING;
}
// get index of regex // get index of regex
argv_find (argv, argc, "regexp", &idx); argv_find (argv, argc, "regexp", &idx);
@ -8093,10 +8085,8 @@ DEFUN (show_ip_bgp_instance_all,
int idx = 0; int idx = 0;
idx = bgp_vty_find_and_parse_afi_safi_vrf (vty, argv, argc, idx, &afi, &safi, &vrf); idx = bgp_vty_find_and_parse_afi_safi_vrf (vty, argv, argc, idx, &afi, &safi, &vrf);
if (!idx) if (!idx)
{ return CMD_WARNING;
vty_out (vty, "View/Vrf Specified: %s is unknown", argv[5]->arg);
return CMD_WARNING;
}
int uj = use_json (argc, argv); int uj = use_json (argc, argv);
if (uj) argc--; if (uj) argc--;
@ -8786,10 +8776,8 @@ DEFUN (show_ip_bgp_instance_neighbor_prefix_counts,
idx = bgp_vty_find_and_parse_afi_safi_vrf (vty, argv, argc, idx, &afi, &safi, &vrf); idx = bgp_vty_find_and_parse_afi_safi_vrf (vty, argv, argc, idx, &afi, &safi, &vrf);
if (!idx) if (!idx)
{ return CMD_WARNING;
vty_out (vty, "View/Vrf Specified: %s is unknown", argv[5]->arg);
return CMD_WARNING;
}
int uj = use_json (argc, argv); int uj = use_json (argc, argv);
if (uj) argc--; if (uj) argc--;
@ -9146,10 +9134,8 @@ DEFUN (show_ip_bgp_instance_neighbor_advertised_route,
idx = bgp_vty_find_and_parse_afi_safi_vrf (vty, argv, argc, idx, &afi, &safi, &vrf); idx = bgp_vty_find_and_parse_afi_safi_vrf (vty, argv, argc, idx, &afi, &safi, &vrf);
if (!idx) if (!idx)
{ return CMD_WARNING;
vty_out (vty, "View/Vrf Specified: %s is unknown", argv[5]->arg);
return CMD_WARNING;
}
int uj = use_json (argc, argv); int uj = use_json (argc, argv);
if (uj) argc--; if (uj) argc--;
@ -9334,12 +9320,10 @@ DEFUN (show_ip_bgp_neighbor_routes,
int idx = 0; int idx = 0;
idx = bgp_vty_find_and_parse_afi_safi_vrf (vty, argv, argc, idx, &afi, &safi, &vrf); idx = bgp_vty_find_and_parse_afi_safi_vrf (vty, argv, argc, idx, &afi, &safi, &vrf);
if (!idx) if (!idx)
{ return CMD_WARNING;
vty_out (vty, "View/Vrf Specified: %s is unknown", argv[5]->arg);
return CMD_WARNING;
}
int uj = use_json (argc, argv); int uj = use_json (argc, argv);
if (uj) argc--; if (uj) argc--;