From 4e6e6ff12dd1b3c402717d71f9ee1f8f68545213 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 29 Mar 2010 17:23:40 -0700 Subject: Rename rate-limiter to rate-control Bug 4541 Limiting implies packet drop, but this qos-policy does shaping. --- scripts/vyatta-qos.pl | 4 ++-- templates/qos-policy/rate-control/node.def | 8 ++++++++ templates/qos-policy/rate-control/node.tag/bandwidth/node.def | 9 +++++++++ templates/qos-policy/rate-control/node.tag/burst/node.def | 7 +++++++ templates/qos-policy/rate-control/node.tag/description/node.def | 2 ++ templates/qos-policy/rate-control/node.tag/latency/node.def | 7 +++++++ templates/qos-policy/rate-limit/node.def | 8 -------- templates/qos-policy/rate-limit/node.tag/bandwidth/node.def | 9 --------- templates/qos-policy/rate-limit/node.tag/burst/node.def | 7 ------- templates/qos-policy/rate-limit/node.tag/description/node.def | 2 -- templates/qos-policy/rate-limit/node.tag/latency/node.def | 7 ------- 11 files changed, 35 insertions(+), 35 deletions(-) create mode 100644 templates/qos-policy/rate-control/node.def create mode 100644 templates/qos-policy/rate-control/node.tag/bandwidth/node.def create mode 100644 templates/qos-policy/rate-control/node.tag/burst/node.def create mode 100644 templates/qos-policy/rate-control/node.tag/description/node.def create mode 100644 templates/qos-policy/rate-control/node.tag/latency/node.def delete mode 100644 templates/qos-policy/rate-limit/node.def delete mode 100644 templates/qos-policy/rate-limit/node.tag/bandwidth/node.def delete mode 100644 templates/qos-policy/rate-limit/node.tag/burst/node.def delete mode 100644 templates/qos-policy/rate-limit/node.tag/description/node.def delete mode 100644 templates/qos-policy/rate-limit/node.tag/latency/node.def diff --git a/scripts/vyatta-qos.pl b/scripts/vyatta-qos.pl index 6fc38dc..4a3783e 100755 --- a/scripts/vyatta-qos.pl +++ b/scripts/vyatta-qos.pl @@ -28,10 +28,10 @@ my $debug = $ENV{'QOS_DEBUG'}; my %policies = ( 'traffic-shaper' => 'TrafficShaper', 'fair-queue' => 'FairQueue', - 'rate-limit' => 'RateLimiter', + 'rate-control' => 'RateLimiter', 'drop-tail' => 'DropTail', 'network-emulator' => 'NetworkEmulator', - 'round-robin' => 'RoundRobin', + 'round-robin' => 'RoundRobin', 'priority-queue' => 'Priority', 'random-detect' => 'RandomDetect', 'traffic-limiter' => 'TrafficLimiter', diff --git a/templates/qos-policy/rate-control/node.def b/templates/qos-policy/rate-control/node.def new file mode 100644 index 0000000..57bf98e --- /dev/null +++ b/templates/qos-policy/rate-control/node.def @@ -0,0 +1,8 @@ +tag: +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(@) diff --git a/templates/qos-policy/rate-control/node.tag/bandwidth/node.def b/templates/qos-policy/rate-control/node.tag/bandwidth/node.def new file mode 100644 index 0000000..db8ca65 --- /dev/null +++ b/templates/qos-policy/rate-control/node.tag/bandwidth/node.def @@ -0,0 +1,9 @@ +type: txt +help: Set the bandwidth limit +syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --rate $VAR(@)" +comp_help: Allowed values: + Bandwidth in Kbps per second + Value with scaling suffix + bits per sec (kbit, mbit, gbit) + bytes per sec (kbps, mbps, gbps) + diff --git a/templates/qos-policy/rate-control/node.tag/burst/node.def b/templates/qos-policy/rate-control/node.tag/burst/node.def new file mode 100644 index 0000000..4df45de --- /dev/null +++ b/templates/qos-policy/rate-control/node.tag/burst/node.def @@ -0,0 +1,7 @@ +type: txt +help: Set the burst size +default: "15k" +syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --burst $VAR(@)" +comp_help: Allowed values: + Burst size in bytes + Size with scaling suffix (kb, mb, gb) diff --git a/templates/qos-policy/rate-control/node.tag/description/node.def b/templates/qos-policy/rate-control/node.tag/description/node.def new file mode 100644 index 0000000..1e8e64f --- /dev/null +++ b/templates/qos-policy/rate-control/node.tag/description/node.def @@ -0,0 +1,2 @@ +type: txt +help: Set description for this queuing policy diff --git a/templates/qos-policy/rate-control/node.tag/latency/node.def b/templates/qos-policy/rate-control/node.tag/latency/node.def new file mode 100644 index 0000000..bef5491 --- /dev/null +++ b/templates/qos-policy/rate-control/node.tag/latency/node.def @@ -0,0 +1,7 @@ +type: txt +syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --time $VAR(@)" +default: "50ms" +help: Set maximum latency +comp_help: Limit on the queue size based on latency + Latency in milliseconds + Time with suffx (secs, ms, us) diff --git a/templates/qos-policy/rate-limit/node.def b/templates/qos-policy/rate-limit/node.def deleted file mode 100644 index 57bf98e..0000000 --- a/templates/qos-policy/rate-limit/node.def +++ /dev/null @@ -1,8 +0,0 @@ -tag: -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(@) diff --git a/templates/qos-policy/rate-limit/node.tag/bandwidth/node.def b/templates/qos-policy/rate-limit/node.tag/bandwidth/node.def deleted file mode 100644 index db8ca65..0000000 --- a/templates/qos-policy/rate-limit/node.tag/bandwidth/node.def +++ /dev/null @@ -1,9 +0,0 @@ -type: txt -help: Set the bandwidth limit -syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --rate $VAR(@)" -comp_help: Allowed values: - Bandwidth in Kbps per second - Value with scaling suffix - bits per sec (kbit, mbit, gbit) - bytes per sec (kbps, mbps, gbps) - diff --git a/templates/qos-policy/rate-limit/node.tag/burst/node.def b/templates/qos-policy/rate-limit/node.tag/burst/node.def deleted file mode 100644 index 4df45de..0000000 --- a/templates/qos-policy/rate-limit/node.tag/burst/node.def +++ /dev/null @@ -1,7 +0,0 @@ -type: txt -help: Set the burst size -default: "15k" -syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --burst $VAR(@)" -comp_help: Allowed values: - Burst size in bytes - Size with scaling suffix (kb, mb, gb) diff --git a/templates/qos-policy/rate-limit/node.tag/description/node.def b/templates/qos-policy/rate-limit/node.tag/description/node.def deleted file mode 100644 index 1e8e64f..0000000 --- a/templates/qos-policy/rate-limit/node.tag/description/node.def +++ /dev/null @@ -1,2 +0,0 @@ -type: txt -help: Set description for this queuing policy diff --git a/templates/qos-policy/rate-limit/node.tag/latency/node.def b/templates/qos-policy/rate-limit/node.tag/latency/node.def deleted file mode 100644 index bef5491..0000000 --- a/templates/qos-policy/rate-limit/node.tag/latency/node.def +++ /dev/null @@ -1,7 +0,0 @@ -type: txt -syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --time $VAR(@)" -default: "50ms" -help: Set maximum latency -comp_help: Limit on the queue size based on latency - Latency in milliseconds - Time with suffx (secs, ms, us) -- cgit v1.2.3