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 --- .../round-robin/node.tag/class/node.def | 6 +++--- .../match/node.tag/ether/protocol/node.def | 19 ++++++++--------- .../match/node.tag/ip/destination/port/node.def | 1 + .../class/node.tag/match/node.tag/ip/dscp/node.def | 24 +++++++++++----------- .../node.tag/match/node.tag/ip/protocol/node.def | 21 +++++++++---------- .../match/node.tag/ip/source/port/node.def | 1 + .../match/node.tag/ipv6/destination/port/node.def | 1 + .../node.tag/match/node.tag/ipv6/dscp/node.def | 24 +++++++++++----------- .../node.tag/match/node.tag/ipv6/protocol/node.def | 21 +++++++++---------- .../match/node.tag/ipv6/source/port/node.def | 1 + .../class/node.tag/match/node.tag/vif/node.def | 6 +++--- .../node.tag/class/node.tag/queue-limit/node.def | 1 + .../node.tag/class/node.tag/queue-type/node.def | 10 ++++----- .../node.tag/default/queue-limit/node.def | 1 + .../node.tag/default/queue-type/node.def | 10 ++++----- .../round-robin/node.tag/quantum/node.def | 4 +++- 16 files changed, 78 insertions(+), 73 deletions(-) (limited to 'templates/traffic-policy/round-robin') diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.def index 3dbbeeb..171d0a4 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.def +++ b/templates/traffic-policy/round-robin/node.tag/class/node.def @@ -1,6 +1,6 @@ tag: type: u32 help: Class handle -syntax:expression: $VAR(@) > 1 && $VAR(@) < 4096; "Class identifier must be between 3 and 4095" -comp_help: possible completions - <2-4095> Class ID +syntax:expression: $VAR(@) > 1 && $VAR(@) <= 4095; \ + "Class identifier must be between 3 and 4095" +val_help:<1-4095>; Class identifier diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def index 102a12e..ceadb5b 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def +++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def @@ -3,13 +3,12 @@ help: Ethernet protocol for this match allowed: echo \ all 802.1Q 802_2 802_3 aarp aoe arp atalk \ dec ip ipv6 ipx lat localtalk rarp snap x25 - -comp_help: <0-65536> Ethernet protocol value or name -Common names: - all Any protocol - ip Internet IP (IPv4) - ipv6 Internet IP (IPv6) - arp Address Resolution Protocol - atalk Appletalk - ipx Novell Internet Packet Exchange - 802.1Q 802.1Q VLAN tag +val_help: u32:0-65535; Ethernet protocol number +val_help: txt; Ethernet protocol name +val_help: all; Any protocol +val_help: ip; Internet IP (IPv4) +val_help: _ipv6; Internet IP (IPv6) +val_help: arp; Address Resolution Protocol +val_help: atalk; Appletalk +val_help: ipx; Novell Internet Packet Exchange +val_help: 802.1Q; 802.1Q VLAN tag diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def index fd145a5..c067ef4 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def +++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def @@ -1,3 +1,4 @@ type: u32 help: IP destination port for this match syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535" +val_help:<1-65535>; IP port diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def index d02dc5c..27d880b 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def +++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def @@ -4,15 +4,15 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)" allowed: awk ' /^#/ { next } { printf "%s ", $2 }' Differentiated Services Codepoint (DSCP) value - default match DSCP (000000) - reliability match DSCP (000001) - throughput match DSCP (000010) - lowdelay match DSCP (000100) - priority match DSCP (001000) - immediate match DSCP (010000) - flash match DSCP (011000) - flash-override match DSCP (100000) - critical match DSCP (101000) - internet match DSCP (110000) - network match DSCP (111000) +val_help:u32:0-63;Differentiated Services Codepoint (DSCP) value +val_help:default; match DSCP (000000) +val_help:reliability; match; DSCP (000001) +val_help:throughput; match; DSCP (000010) +val_help:lowdelay; match; DSCP (000100) +val_help:priority; match; DSCP (001000) +val_help:immediate; match; DSCP (010000) +val_help:flash; match DSCP (011000) +val_help:flash-override; match DSCP (100000) +val_help:critical; match DSCP (101000) +val_help:internet; match; DSCP (110000) +val_help:network; match; DSCP (111000) diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def index 9c665c2..1451175 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def +++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def @@ -4,14 +4,13 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)" allowed: awk ' /^#/ { next } { printf "%s ", $1 }' IP protocol value or name -Common names: - icmp Internet Control Message Protocol - igmp Internet Group Management Protocol - ggp Gateway-Gateway protocol - tcp Transmission Control Protocol - egp Exterior Gateway Protocol - udp User Datagram Protocol - gre General Routing Encapsulation - ospf Open Shortest Path First IGP - sctp Stream Control Transmission Protocol +val_help:<0-255>; IP protocol value +val_help:icmp; Internet Control Message Protocol +val_help:igmp; Internet Group Management Protocol +val_help:ggp; Gateway-Gateway protocol +val_help:tcp; Transmission Control Protocol +val_help:egp; Exterior Gateway Protocol +val_help:udp; User Datagram Protocol +val_help:gre; General Routing Encapsulation +val_help:ospf; Open Shortest Path First IGP +val_help:sctp; Stream Control Transmission Protocol diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def index 61247fd..89c241e 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def +++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def @@ -1,3 +1,4 @@ type: u32 help: IP source port for this match syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535" +val_help:<1-65535>; IP port diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def index fd145a5..c067ef4 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def +++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def @@ -1,3 +1,4 @@ type: u32 help: IP destination port for this match syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535" +val_help:<1-65535>; IP port diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def index d02dc5c..27d880b 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def +++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def @@ -4,15 +4,15 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)" allowed: awk ' /^#/ { next } { printf "%s ", $2 }' Differentiated Services Codepoint (DSCP) value - default match DSCP (000000) - reliability match DSCP (000001) - throughput match DSCP (000010) - lowdelay match DSCP (000100) - priority match DSCP (001000) - immediate match DSCP (010000) - flash match DSCP (011000) - flash-override match DSCP (100000) - critical match DSCP (101000) - internet match DSCP (110000) - network match DSCP (111000) +val_help:u32:0-63;Differentiated Services Codepoint (DSCP) value +val_help:default; match DSCP (000000) +val_help:reliability; match; DSCP (000001) +val_help:throughput; match; DSCP (000010) +val_help:lowdelay; match; DSCP (000100) +val_help:priority; match; DSCP (001000) +val_help:immediate; match; DSCP (010000) +val_help:flash; match DSCP (011000) +val_help:flash-override; match DSCP (100000) +val_help:critical; match DSCP (101000) +val_help:internet; match; DSCP (110000) +val_help:network; match; DSCP (111000) diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def index 9c665c2..1451175 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def +++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def @@ -4,14 +4,13 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)" allowed: awk ' /^#/ { next } { printf "%s ", $1 }' IP protocol value or name -Common names: - icmp Internet Control Message Protocol - igmp Internet Group Management Protocol - ggp Gateway-Gateway protocol - tcp Transmission Control Protocol - egp Exterior Gateway Protocol - udp User Datagram Protocol - gre General Routing Encapsulation - ospf Open Shortest Path First IGP - sctp Stream Control Transmission Protocol +val_help:<0-255>; IP protocol value +val_help:icmp; Internet Control Message Protocol +val_help:igmp; Internet Group Management Protocol +val_help:ggp; Gateway-Gateway protocol +val_help:tcp; Transmission Control Protocol +val_help:egp; Exterior Gateway Protocol +val_help:udp; User Datagram Protocol +val_help:gre; General Routing Encapsulation +val_help:ospf; Open Shortest Path First IGP +val_help:sctp; Stream Control Transmission Protocol diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def index 61247fd..89c241e 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def +++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def @@ -1,3 +1,4 @@ type: u32 help: IP source port for this match syntax:expression: ($VAR(@) > 0 && $VAR(@) < 65536) ; "port must be between 1 and 65535" +val_help:<1-65535>; IP port diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/vif/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/vif/node.def index f98cda5..65f05a5 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/vif/node.def +++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/vif/node.def @@ -1,5 +1,5 @@ type: u32 help: Virtual Local Area Network (VLAN) ID for this match -syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4095; "VLAN ID must be between 0 and 4095" -comp_help: possible completions: - <0-4095> Set VLAN ID +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4095; \ + "VLAN ID must be between 0 and 4095" +val_help:<0-4095>; Virtual Local Area Network (VLAN) tag diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-limit/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-limit/node.def index f0dfee8..5d1a02a 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-limit/node.def +++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-limit/node.def @@ -2,3 +2,4 @@ type: u32 help: Maximum queue size (packets) syntax:expression: $VAR(@) > 1 && $VAR(@) < 128;\ "Queue limit must greater than 1 and less than 128" +val_help:<1-127>; Queue size in bytes diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-type/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-type/node.def index 9e2227d..7832d71 100644 --- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-type/node.def +++ b/templates/traffic-policy/round-robin/node.tag/class/node.tag/queue-type/node.def @@ -1,8 +1,8 @@ type: txt default: "drop-tail" -syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail"; "Unknown queue-type" +syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail"; \ + "Unknown queue-type" help: Queue type for this class -comp_help:Possible completions - fair-queue\tStochastic Fair Queue (SFQ) - drop-tail\tFirst-In-First-Out (FIFO) - priority\tPriority queueing based on DSCP +val_help:fair-queue; Stochastic Fair Queue (SFQ) +val_help:drop-tail; First-In-First-Out (FIFO) +val_help:priority; Priority queueing based on DSCP diff --git a/templates/traffic-policy/round-robin/node.tag/default/queue-limit/node.def b/templates/traffic-policy/round-robin/node.tag/default/queue-limit/node.def index 2aaf405..b9f0651 100644 --- a/templates/traffic-policy/round-robin/node.tag/default/queue-limit/node.def +++ b/templates/traffic-policy/round-robin/node.tag/default/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 diff --git a/templates/traffic-policy/round-robin/node.tag/default/queue-type/node.def b/templates/traffic-policy/round-robin/node.tag/default/queue-type/node.def index e1d77a3..2785543 100644 --- a/templates/traffic-policy/round-robin/node.tag/default/queue-type/node.def +++ b/templates/traffic-policy/round-robin/node.tag/default/queue-type/node.def @@ -1,9 +1,9 @@ type: txt default: "fair-queue" -syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail"; "Unknown queue-type" +syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail";\ + "Unknown queue-type" help: Queue type for this class -comp_help:Possible completions - fair-queue\tStochastic Fair Queue (SFQ) - drop-tail\tFirst-In-First-Out (FIFO) - priority\tPriority queueing based on DSCP +val_help:fair-queue; Stochastic Fair Queue (SFQ) +val_help:drop-tail; First-In-First-Out (FIFO) +val_help:priority; Priority queueing based on DSCP diff --git a/templates/traffic-policy/round-robin/node.tag/quantum/node.def b/templates/traffic-policy/round-robin/node.tag/quantum/node.def index 05db7c0..a2b41df 100644 --- a/templates/traffic-policy/round-robin/node.tag/quantum/node.def +++ b/templates/traffic-policy/round-robin/node.tag/quantum/node.def @@ -1,2 +1,4 @@ type: u32 -help: Packet scheduling quantum (bytes) +help: Packet scheduling quantum +syntax:expression: $VAR(@) > 0 ; "Quantum must be greater than zero" +val_help:<1-4294967295>; Packet scheduling quantum (bytes) -- cgit v1.2.3