From cf51e90bfc2d1c3b58192a726e786b598681fb71 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon, 12 Jul 2010 09:24:19 -0700
Subject: 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.
---
 lib/Vyatta/Qos/LimiterClass.pm                                    | 2 +-
 .../limiter/node.tag/class/node.tag/precedence/node.def           | 7 +++++++
 .../limiter/node.tag/class/node.tag/priority/node.def             | 8 --------
 3 files changed, 8 insertions(+), 9 deletions(-)
 create mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/precedence/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/priority/node.def

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)
-- 
cgit v1.2.3