summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-07-12 09:24:19 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-07-12 09:24:19 -0700
commitcf51e90bfc2d1c3b58192a726e786b598681fb71 (patch)
tree04d13ca422bc33ab131f1d4fb82318baa992eaf2
parent8bf774cb76305e00b5540b4222570df862343449 (diff)
downloadvyatta-cfg-qos-cf51e90bfc2d1c3b58192a726e786b598681fb71.tar.gz
vyatta-cfg-qos-cf51e90bfc2d1c3b58192a726e786b598681fb71.zip
Rename limiter class priority field to precedence
Bug 5407 This fixes the confusing usage of priority field in both shaper and limiter class. In limiter, it is renamed to precedence since it controls the order of match rule evaluation.
-rw-r--r--lib/Vyatta/Qos/LimiterClass.pm2
-rw-r--r--templates/traffic-policy/limiter/node.tag/class/node.tag/precedence/node.def7
-rw-r--r--templates/traffic-policy/limiter/node.tag/class/node.tag/priority/node.def8
3 files changed, 8 insertions, 9 deletions
diff --git a/lib/Vyatta/Qos/LimiterClass.pm b/lib/Vyatta/Qos/LimiterClass.pm
index 8622efd..b3aaa31 100644
--- a/lib/Vyatta/Qos/LimiterClass.pm
+++ b/lib/Vyatta/Qos/LimiterClass.pm
@@ -56,7 +56,7 @@ sub _define {
$self->{burst} = $config->returnValue("burst");
defined $self->{burst} or die "burst must be defined for $level\n";
- $self->{priority} = $config->returnValue("priority");
+ $self->{priority} = $config->returnValue("precedence");
foreach my $match ( $config->listNodes("match") ) {
$config->setLevel("$level match $match");
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/precedence/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/precedence/node.def
new file mode 100644
index 0000000..adcb559
--- /dev/null
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/precedence/node.def
@@ -0,0 +1,7 @@
+type: u32
+help: Set ordering for rule evaluation
+default: 20
+syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255 ; \
+ "precedence must be between 0 and 255"
+comp_help: Precedence in traffic limiter rule evaluation
+ <0-255> (default 20)
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/priority/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/priority/node.def
deleted file mode 100644
index a99400d..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/priority/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: u32
-help: Set priority for rule evaluation
-default: 20
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 20 ; \
- "priority must be between 0 and 20"
-help: Priority value
-comp_help: Priority for traffic limiting evaluation
- <0-20> (default 20)