From 658e7a9769a37dc53d873c53de0d461f3b7b6024 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 16 Jul 2010 12:38:30 -0700 Subject: Use val_help: to show command options Replace all usage in this package of comp_help with new val_help --- .../traffic-policy/random-detect/node.tag/bandwidth/node.def | 9 +++------ .../traffic-policy/random-detect/node.tag/precedence/node.def | 8 ++++---- .../node.tag/precedence/node.tag/average-packet/node.def | 1 + .../node.tag/precedence/node.tag/mark-probability/node.def | 3 +-- .../node.tag/precedence/node.tag/maximum-threshold/node.def | 6 +++--- .../node.tag/precedence/node.tag/minimum-threshold/node.def | 6 +++--- .../node.tag/precedence/node.tag/queue-limit/node.def | 1 + 7 files changed, 16 insertions(+), 18 deletions(-) (limited to 'templates/traffic-policy/random-detect') diff --git a/templates/traffic-policy/random-detect/node.tag/bandwidth/node.def b/templates/traffic-policy/random-detect/node.tag/bandwidth/node.def index b2b2206..d7ac169 100644 --- a/templates/traffic-policy/random-detect/node.tag/bandwidth/node.def +++ b/templates/traffic-policy/random-detect/node.tag/bandwidth/node.def @@ -3,9 +3,6 @@ help: Available bandwidth for this policy default: "auto" syntax:expression: $VAR(@) == "auto" || \ exec "/opt/vyatta/sbin/vyatta-qos-util.pl --rate $VAR(@)" -comp_help: Allowed values: - auto Set bandwidth based on interface speed (default) - Bandwidth in Kbps - Value with scaling suffix - bits per sec (kbit, mbit, gbit) - bytes per sec (kbps, mbps, gbps) +val_help:auto; Rate based on interface speed (default) +val_help:; Rate in k (1000) bytes per second +val_help:; Rate with scaling suffix (mbit, mbps, ...) diff --git a/templates/traffic-policy/random-detect/node.tag/precedence/node.def b/templates/traffic-policy/random-detect/node.tag/precedence/node.def index 86f151a..2b6171f 100644 --- a/templates/traffic-policy/random-detect/node.tag/precedence/node.def +++ b/templates/traffic-policy/random-detect/node.tag/precedence/node.def @@ -1,6 +1,6 @@ tag: type: u32 -help: Precedence values -syntax:expression: $VAR(@) >= 0 && $VAR(@) < 8; "IP precedence value must be between 0 and 7" -comp_help: possible completions - <0-7> IP precedence number +help: IP precedence +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 7; \ + "IP precedence value must be between 0 and 7" +val_help:<0-7>; IP precedence value diff --git a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/average-packet/node.def b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/average-packet/node.def index 23cdb0f..e625ed7 100644 --- a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/average-packet/node.def +++ b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/average-packet/node.def @@ -2,3 +2,4 @@ type: u32 help: Average packet size (bytes) default: 1024 syntax:expression: $VAR(@) >= 16 && $VAR(@) <= 10240 ; "Average packet size must be between 16 and 10240" +val_help:<16-10240>; Average packet size in bytes diff --git a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/mark-probability/node.def b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/mark-probability/node.def index 8bb75d8..5a7df82 100644 --- a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/mark-probability/node.def +++ b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/mark-probability/node.def @@ -1,5 +1,4 @@ type: u32 help: Mark probability for this precedence syntax:expression: $VAR(@) > 0 ; "Mark probability must be greater than 0" -comp_help: Allowed values: - Numeric value ( 1 / N ) +val_help:; Numeric value ( 1 / N ) diff --git a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/maximum-threshold/node.def b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/maximum-threshold/node.def index f30769f..3f42375 100644 --- a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/maximum-threshold/node.def +++ b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/maximum-threshold/node.def @@ -1,5 +1,5 @@ type: u32 help: Maximum threshold for random detection -syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4096; "Threshold must be between 0 and 4096" -comp_help: Allowed values: - Threshold in packets +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4096;\ + "Threshold must be between 0 and 4096" +val_help:<0-4096>; Maximum Threshold in packets diff --git a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/minimum-threshold/node.def b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/minimum-threshold/node.def index 3114f95..6875bc1 100644 --- a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/minimum-threshold/node.def +++ b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/minimum-threshold/node.def @@ -1,5 +1,5 @@ type: u32 help: Minimum threshold for random detection -syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4096; "Threshold must be between 0 and 4096" -comp_help: Allowed values: - Threshold in packets +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4096; \ + "Threshold must be between 0 and 4096" +val_help:<0-4096>; Minimum Threshold in packets diff --git a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/queue-limit/node.def b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/queue-limit/node.def index 2aaf405..b9f0651 100644 --- a/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/queue-limit/node.def +++ b/templates/traffic-policy/random-detect/node.tag/precedence/node.tag/queue-limit/node.def @@ -1,3 +1,4 @@ type: u32 help: Maximum queue size (packets) syntax:expression: $VAR(@) > 0 ; "Queue limit must greater than zero" +val_help:<1-4294967295>; Queue size in bytes -- cgit v1.2.3