summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-07-23 15:31:04 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-07-23 15:34:02 -0700
commit7e1f92bfd89c768cae638001cac37a14561c7622 (patch)
treea4f91bb4c62eb4f75d5e7b5970c67c4e35380c9e
parent1b45ea6d0b2e5de99e8ac3d35ed6fb6096057188 (diff)
downloadvyatta-cfg-qos-7e1f92bfd89c768cae638001cac37a14561c7622.tar.gz
vyatta-cfg-qos-7e1f92bfd89c768cae638001cac37a14561c7622.zip
Revert "Rename limiter class priority field to precedence"
This reverts commit cf51e90bfc2d1c3b58192a726e786b598681fb71. Conflicts: templates/traffic-policy/limiter/node.tag/class/node.tag/precedence/node.def
-rw-r--r--lib/Vyatta/Qos/LimiterClass.pm2
-rw-r--r--templates/traffic-policy/limiter/node.tag/class/node.tag/precedence/node.def6
-rw-r--r--templates/traffic-policy/limiter/node.tag/class/node.tag/priority/node.def8
3 files changed, 9 insertions, 7 deletions
diff --git a/lib/Vyatta/Qos/LimiterClass.pm b/lib/Vyatta/Qos/LimiterClass.pm
index b3aaa31..8622efd 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("precedence");
+ $self->{priority} = $config->returnValue("priority");
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
deleted file mode 100644
index 24f3b8b..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/precedence/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: u32
-help: Ordering for rule evaluation
-default: 20
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255 ; \
- "precedence must be between 0 and 255"
-val_help: u32:0-255; Rule evaluation order
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
new file mode 100644
index 0000000..a99400d
--- /dev/null
+++ b/templates/traffic-policy/limiter/node.tag/class/node.tag/priority/node.def
@@ -0,0 +1,8 @@
+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)