diff options
Diffstat (limited to 'templates/qos-policy')
16 files changed, 36 insertions, 31 deletions
diff --git a/templates/qos-policy/drop-tail/node.def b/templates/qos-policy/drop-tail/node.def index 111bb63..1bbb25f 100644 --- a/templates/qos-policy/drop-tail/node.def +++ b/templates/qos-policy/drop-tail/node.def @@ -3,6 +3,6 @@ type: txt help: Set drop tail queue (FIFO) policy syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$" ; "only alpha-numeric policy name allowed" -create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy "$VAR(.)" "$VAR(@)" -delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy "$VAR(@)" -end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy "$VAR(@)" +create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy $VAR(.) $VAR(@) +delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy $VAR(@) +end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(@) diff --git a/templates/qos-policy/drop-tail/node.tag/queue-limit/node.def b/templates/qos-policy/drop-tail/node.tag/queue-limit/node.def index 49c47b4..fe3b4dd 100644 --- a/templates/qos-policy/drop-tail/node.tag/queue-limit/node.def +++ b/templates/qos-policy/drop-tail/node.tag/queue-limit/node.def @@ -1,2 +1,2 @@ type: u32 -help: Set maximum queue size (packets) +help: Set maximum queue size (packets) [REQUIRED] diff --git a/templates/qos-policy/fair-queue/node.def b/templates/qos-policy/fair-queue/node.def index ac9dc2d..1966ab6 100644 --- a/templates/qos-policy/fair-queue/node.def +++ b/templates/qos-policy/fair-queue/node.def @@ -3,6 +3,6 @@ type: txt help: Set fair queueing policy syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$" ; "only alpha-numeric policy name allowed" -create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy "$VAR(.)" "$VAR(@)" -delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy "$VAR(@)" -end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy "$VAR(@)" +create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy $VAR(.) $VAR(@) +delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy $VAR(@) +end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(@) diff --git a/templates/qos-policy/network-emulator/node.def b/templates/qos-policy/network-emulator/node.def index 4a3e570..9a89c53 100644 --- a/templates/qos-policy/network-emulator/node.def +++ b/templates/qos-policy/network-emulator/node.def @@ -3,6 +3,6 @@ type: txt help: Setup network emulator policy syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$" ; "only alpha-numeric policy name allowed" -create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy "$VAR(.)" "$VAR(@)" -delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy "$VAR(@)" -end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy "$VAR(@)" +create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy $VAR(.) $VAR(@) +delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy $VAR(@) +end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(@) diff --git a/templates/qos-policy/node.def b/templates/qos-policy/node.def index e692c0f..e6a2afc 100644 --- a/templates/qos-policy/node.def +++ b/templates/qos-policy/node.def @@ -1 +1,2 @@ +priority: 900 help: Configure Quality of Service (QOS) policy type diff --git a/templates/qos-policy/random-detect/node.def b/templates/qos-policy/random-detect/node.def index 02911a1..7dc1caa 100644 --- a/templates/qos-policy/random-detect/node.def +++ b/templates/qos-policy/random-detect/node.def @@ -3,6 +3,6 @@ type: txt help: Set Weighted Random Early Detect policy syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$" ; "only alpha-numeric policy name allowed" -create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy "$VAR(.)" "$VAR(@)" -delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy "$VAR(@)" -end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy "$VAR(@)" +create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy $VAR(.) $VAR(@) +delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy $VAR(@) +end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(@) diff --git a/templates/qos-policy/random-detect/node.tag/precedence/node.tag/average-packet/node.def b/templates/qos-policy/random-detect/node.tag/precedence/node.tag/average-packet/node.def new file mode 100644 index 0000000..23cdb0f --- /dev/null +++ b/templates/qos-policy/random-detect/node.tag/precedence/node.tag/average-packet/node.def @@ -0,0 +1,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" diff --git a/templates/qos-policy/random-detect/node.tag/precedence/node.tag/queue-limit/node.def b/templates/qos-policy/random-detect/node.tag/precedence/node.tag/queue-limit/node.def new file mode 100644 index 0000000..49c47b4 --- /dev/null +++ b/templates/qos-policy/random-detect/node.tag/precedence/node.tag/queue-limit/node.def @@ -0,0 +1,2 @@ +type: u32 +help: Set maximum queue size (packets) diff --git a/templates/qos-policy/rate-limit/node.def b/templates/qos-policy/rate-limit/node.def index 2e3eed1..57bf98e 100644 --- a/templates/qos-policy/rate-limit/node.def +++ b/templates/qos-policy/rate-limit/node.def @@ -3,6 +3,6 @@ type: txt help: Set rate limiting policy syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$" ; "only alpha-numeric policy name allowed" -create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy "$VAR(.)" "$VAR(@)" -delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy "$VAR(@)" -end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy "$VAR(@)" +create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy $VAR(.) $VAR(@) +delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy $VAR(@) +end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(@) diff --git a/templates/qos-policy/round-robin/node.def b/templates/qos-policy/round-robin/node.def index daf795a..4427e1a 100644 --- a/templates/qos-policy/round-robin/node.def +++ b/templates/qos-policy/round-robin/node.def @@ -3,6 +3,6 @@ type: txt help: Set deficit round robin based policy syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$" ; "only alpha-numeric policy name allowed" -create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy "$VAR(.)" "$VAR(@)" -delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy "$VAR(@)" -end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy "$VAR(@)" +create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy $VAR(.) $VAR(@) +delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy $VAR(@) +end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(@) diff --git a/templates/qos-policy/round-robin/node.tag/class/node.tag/queue-type/node.def b/templates/qos-policy/round-robin/node.tag/class/node.tag/queue-type/node.def index 61f9506..ecbcede 100644 --- a/templates/qos-policy/round-robin/node.tag/class/node.tag/queue-type/node.def +++ b/templates/qos-policy/round-robin/node.tag/class/node.tag/queue-type/node.def @@ -1,9 +1,8 @@ type: txt -default: "fair-queue" +default: "drop-tail" syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail"; "Unknown queue-type" help: Set the 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 - diff --git a/templates/qos-policy/round-robin/node.tag/default/queue-type/node.def b/templates/qos-policy/round-robin/node.tag/default/queue-type/node.def index 295c04c..61f9506 100644 --- a/templates/qos-policy/round-robin/node.tag/default/queue-type/node.def +++ b/templates/qos-policy/round-robin/node.tag/default/queue-type/node.def @@ -1,10 +1,9 @@ type: txt default: "fair-queue" -syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail", "random-detect"; "Unknown queue-type" +syntax:expression: $VAR(@) in "fair-queue", "priority", "drop-tail"; "Unknown queue-type" help: Set the 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 - random-detect\tRandom Early Detection (RED) diff --git a/templates/qos-policy/traffic-limiter/node.def b/templates/qos-policy/traffic-limiter/node.def index b411273..f8bdf26 100644 --- a/templates/qos-policy/traffic-limiter/node.def +++ b/templates/qos-policy/traffic-limiter/node.def @@ -3,6 +3,6 @@ type: txt help: Set traffic input limiting policy syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$" ; "only alpha-numeric policy name allowed" -create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy "$VAR(.)" "$VAR(@)" -delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy "$VAR(@)" -end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy "$VAR(@)" +create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy $VAR(.) $VAR(@) +delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy $VAR(@) +end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(@) diff --git a/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/bandwidth/node.def b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/bandwidth/node.def index 21a46a4..13c70ee 100644 --- a/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/bandwidth/node.def +++ b/templates/qos-policy/traffic-limiter/node.tag/class/node.tag/bandwidth/node.def @@ -1,5 +1,5 @@ type: txt -help: Set the traffic-limit used for this class +help: Set the traffic-limit used for this class [REQUIRED] syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --rate $VAR(@)" comp_help: Allowed values: <number> Bandwidth in Kbps diff --git a/templates/qos-policy/traffic-shaper/node.def b/templates/qos-policy/traffic-shaper/node.def index e54c093..cd7b07d 100644 --- a/templates/qos-policy/traffic-shaper/node.def +++ b/templates/qos-policy/traffic-shaper/node.def @@ -3,6 +3,6 @@ type: txt help: Set traffic shaping based policy syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$" ; "only alpha-numeric policy name allowed" -create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy "$VAR(.)" "$VAR(@)" -delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy "$VAR(@)" -end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy "$VAR(@)" +create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy $VAR(.) $VAR(@) +delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy $VAR(@) +end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(@) diff --git a/templates/qos-policy/traffic-shaper/node.tag/default/bandwidth/node.def b/templates/qos-policy/traffic-shaper/node.tag/default/bandwidth/node.def index 3743688..f0bc773 100644 --- a/templates/qos-policy/traffic-shaper/node.tag/default/bandwidth/node.def +++ b/templates/qos-policy/traffic-shaper/node.tag/default/bandwidth/node.def @@ -1,5 +1,5 @@ type: txt -help: Set the bandwidth used for default traffic +help: Set the bandwidth used for default traffic [REQUIRED] syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate \$VAR(@)" comp_help: Allowed values: <number> Bandwidth in Kbps per second |