summaryrefslogtreecommitdiffstats
path: root/ldpd
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas.abraitis@gmail.com>2021-10-13 09:00:43 +0200
committerGitHub <noreply@github.com>2021-10-13 09:00:43 +0200
commit314479e1141d93da2874bbadb2639677d58090cd (patch)
tree0ee37e3dbb3e76ed028ebe9db3c3b5b26662387b /ldpd
parentMerge pull request #9655 from yyuanam/first_commit (diff)
parent*: cleanup number-named access-lists in CLI (diff)
downloadfrr-314479e1141d93da2874bbadb2639677d58090cd.tar.xz
frr-314479e1141d93da2874bbadb2639677d58090cd.zip
Merge pull request #9715 from idryzhov/cleanup-number-named-acl
*: cleanup number-named access-lists in CLI
Diffstat (limited to 'ldpd')
-rw-r--r--ldpd/ldp_vty_cmds.c24
1 files changed, 5 insertions, 19 deletions
diff --git a/ldpd/ldp_vty_cmds.c b/ldpd/ldp_vty_cmds.c
index b65ebf6f5..9d3d1a606 100644
--- a/ldpd/ldp_vty_cmds.c
+++ b/ldpd/ldp_vty_cmds.c
@@ -253,14 +253,12 @@ DEFPY (ldp_allow_broken_lsps,
DEFPY (ldp_discovery_targeted_hello_accept,
ldp_discovery_targeted_hello_accept_cmd,
- "[no] discovery targeted-hello accept [from <(1-199)|(1300-2699)|WORD>$from_acl]",
+ "[no] discovery targeted-hello accept [from WORD$from_acl]",
NO_STR
"Configure discovery parameters\n"
"LDP Targeted Hellos\n"
"Accept and respond to targeted hellos\n"
"Access list to specify acceptable targeted hello source\n"
- "IP access-list number\n"
- "IP access-list number (expanded range)\n"
"IP access-list name\n")
{
return (ldp_vty_targeted_hello_accept(vty, no, from_acl));
@@ -290,18 +288,14 @@ DEFPY (ldp_discovery_transport_address_ipv6,
DEFPY (ldp_label_local_advertise,
ldp_label_local_advertise_cmd,
- "[no] label local advertise [{to <(1-199)|(1300-2699)|WORD>$to_acl|for <(1-199)|(1300-2699)|WORD>$for_acl}]",
+ "[no] label local advertise [{to WORD$to_acl|for WORD$for_acl}]",
NO_STR
"Configure label control and policies\n"
"Configure local label control and policies\n"
"Configure outbound label advertisement control\n"
"IP Access-list specifying controls on LDP Peers\n"
- "IP access-list number\n"
- "IP access-list number (expanded range)\n"
"IP access-list name\n"
"IP access-list for destination prefixes\n"
- "IP access-list number\n"
- "IP access-list number (expanded range)\n"
"IP access-list name\n")
{
return (ldp_vty_label_advertise(vty, no, to_acl, for_acl));
@@ -309,15 +303,13 @@ DEFPY (ldp_label_local_advertise,
DEFPY (ldp_label_local_advertise_explicit_null,
ldp_label_local_advertise_explicit_null_cmd,
- "[no] label local advertise explicit-null [for <(1-199)|(1300-2699)|WORD>$for_acl]",
+ "[no] label local advertise explicit-null [for WORD$for_acl]",
NO_STR
"Configure label control and policies\n"
"Configure local label control and policies\n"
"Configure outbound label advertisement control\n"
"Configure explicit-null advertisement\n"
"IP access-list for destination prefixes\n"
- "IP access-list number\n"
- "IP access-list number (expanded range)\n"
"IP access-list name\n")
{
return (ldp_vty_label_expnull(vty, no, for_acl));
@@ -325,15 +317,13 @@ DEFPY (ldp_label_local_advertise_explicit_null,
DEFPY (ldp_label_local_allocate,
ldp_label_local_allocate_cmd,
- "[no] label local allocate <host-routes$host_routes|for <(1-199)|(1300-2699)|WORD>$for_acl>",
+ "[no] label local allocate <host-routes$host_routes|for WORD$for_acl>",
NO_STR
"Configure label control and policies\n"
"Configure local label control and policies\n"
"Configure label allocation control\n"
"allocate local label for host routes only\n"
"IP access-list\n"
- "IP access-list number\n"
- "IP access-list number (expanded range)\n"
"IP access-list name\n")
{
return (ldp_vty_label_allocate(vty, no, host_routes, for_acl));
@@ -341,18 +331,14 @@ DEFPY (ldp_label_local_allocate,
DEFPY (ldp_label_remote_accept,
ldp_label_remote_accept_cmd,
- "[no] label remote accept {from <(1-199)|(1300-2699)|WORD>$from_acl|for <(1-199)|(1300-2699)|WORD>$for_acl}",
+ "[no] label remote accept {from WORD$from_acl|for WORD$for_acl}",
NO_STR
"Configure label control and policies\n"
"Configure remote/peer label control and policies\n"
"Configure inbound label acceptance control\n"
"Neighbor from whom to accept label advertisement\n"
- "IP access-list number\n"
- "IP access-list number (expanded range)\n"
"IP access-list name\n"
"IP access-list for destination prefixes\n"
- "IP access-list number\n"
- "IP access-list number (expanded range)\n"
"IP access-list name\n")
{
return (ldp_vty_label_accept(vty, no, from_acl, for_acl));