From baa0d50c299c06ad5027f730d7a63e8eec6bef43 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 21 Jul 2010 12:07:29 -0700 Subject: Convert Quagga templates to use val_help: --- templates/policy/access-list6/node.def | 5 +---- templates/policy/access-list6/node.tag/rule/node.def | 6 +----- .../policy/access-list6/node.tag/rule/node.tag/action/node.def | 7 ++----- .../access-list6/node.tag/rule/node.tag/source/network/node.def | 5 +---- 4 files changed, 5 insertions(+), 18 deletions(-) (limited to 'templates/policy/access-list6') diff --git a/templates/policy/access-list6/node.def b/templates/policy/access-list6/node.def index 01a5f90f..72f7f9e5 100644 --- a/templates/policy/access-list6/node.def +++ b/templates/policy/access-list6/node.def @@ -1,8 +1,7 @@ tag: - type: txt - help: Set IPv6 access-list filter +val_help: Name of IPv6 access-list syntax:expression: pattern $VAR(@) "^[[:graph:]]{1,64}$" ; \ "access-list name must be 64 characters or less" @@ -13,5 +12,3 @@ syntax:expression: pattern $VAR(@) "^[^|;&$<>]*$" ; \ end: /opt/vyatta/sbin/vyatta-policy.pl --update-access-list6 "$VAR(@)" -comp_help: possible completions: - Set name of ipv6 access-list diff --git a/templates/policy/access-list6/node.tag/rule/node.def b/templates/policy/access-list6/node.tag/rule/node.def index 68666a4e..736e1e49 100644 --- a/templates/policy/access-list6/node.tag/rule/node.def +++ b/templates/policy/access-list6/node.tag/rule/node.def @@ -1,11 +1,7 @@ tag: - type: u32 - help: Set a rule for this access-list6 +val_help: u32:1-65535; Access-list6 rule number syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; \ "rule number must be between 1 and 65535" - -comp_help: possible completions: - <1-65535> Set access-list6 rule number diff --git a/templates/policy/access-list6/node.tag/rule/node.tag/action/node.def b/templates/policy/access-list6/node.tag/rule/node.tag/action/node.def index 00d8d511..c6b30231 100644 --- a/templates/policy/access-list6/node.tag/rule/node.tag/action/node.def +++ b/templates/policy/access-list6/node.tag/rule/node.tag/action/node.def @@ -1,9 +1,6 @@ type: txt - help: Set action to take on networks matching this rule [REQUIRED] +val_help: permit; Permit matching networks +val_help: deny; Deny matching networks syntax:expression: $VAR(@) in "permit", "deny"; "action must be permit or deny" - -comp_help: possible completions - permit permit matching networks - deny deny matching networks diff --git a/templates/policy/access-list6/node.tag/rule/node.tag/source/network/node.def b/templates/policy/access-list6/node.tag/rule/node.tag/source/network/node.def index 085a59ec..b6758c87 100644 --- a/templates/policy/access-list6/node.tag/rule/node.tag/source/network/node.def +++ b/templates/policy/access-list6/node.tag/rule/node.tag/source/network/node.def @@ -1,9 +1,6 @@ type: ipv6net - help: Set a network/netmask to match (requires inverse-mask be defined) - -comp_help: possible completions: - Set the IPv6 address and prefix length +val_help: IPv6 address and prefix length commit:expression: ($VAR(../any/) == ""); "policy access-list6 $VAR(../../../@) rule $VAR(../../@) source: you may only define one filter type. (network|any)" -- cgit v1.2.3