rename rate to bandwidth

Make qos syntax more familar to IOS users.

5 files changed, 23 insertions, 13 deletions

diff --git a/templates/qos-policy/traffic-shaper/node.tag/rate/node.def b/templates/qos-policy/traffic-shaper/node.tag/bandwidth/node.def
index 1dc02ad..76fa6e2 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/rate/node.def
+++ b/templates/qos-policy/traffic-shaper/node.tag/bandwidth/node.def
@@ -1,10 +1,11 @@
 type: txt
-help: Set the base rate for this policy
+help: Set the available bandwidth for this policy
 default: "auto"
 syntax:expression: exec "[[ \"$VAR(@)\" == \"auto\" ]] || \
 	      /opt/vyatta/sbin/vyatta-qos-util.pl --rate \"$VAR(@)\""
 comp_help: Allowed values:
- auto              Set rate based on interface speed (default)
- <number><suffix>  Bitrate with scaling suffix
+ auto              Set bandwidth based on interface speed (default)
+ <number>          Bandwidth in Kbps
+ <number><suffix>  Value with scaling suffix
                    bits per sec (kbit, mbit, gbit)
                    bytes per sec (kbps, mbps, gbps)
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/rate/node.def b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/bandwidth/node.def
index 94fdd42..839cb0f 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/rate/node.def
+++ b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/bandwidth/node.def
@@ -1,11 +1,11 @@
 type: txt
 default: "100%"
-help: Set the base rate for this class
+help: Set the bandwidth used for this class
 syntax:expression: exec "[[ \"$VAR(@)\" =~  '^[0-9]+(\.[0-9]*)?%$' ]] || \
 	      /opt/vyatta/sbin/vyatta-qos-util.pl --rate \"$VAR(@)\""
 comp_help: Allowed values:
+ <number>          Bandwidth in Kbps
  <number>%         Percentage of overall rate (default 100%)
- <number><suffix>  Bitrate with scaling suffix
+ <number><suffix>  Value with scaling suffix
                    bits per sec (kbit, mbit, gbit)
                    bytes per sec (kbps, mbps, gbps)
-
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/ceiling/node.def b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/ceiling/node.def
index f20191b..65909d0 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/ceiling/node.def
+++ b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/ceiling/node.def
@@ -1,4 +1,9 @@
 type: txt
-help: Set the limit for this class
+help: Set the bandwidth limit for this class
 syntax:expression: exec "[[ \"$VAR(@)\" =~  '^[0-9]+(\.[0-9]*)?%$' ]] || \
 	      /opt/vyatta/sbin/vyatta-qos-util.pl --rate \"$VAR(@)\""
+comp_help: Allowed values:
+ <number>          Limit in Kbps
+ <number>%         Percentage of overall rate (default 100%)
+ <number><suffix>  Value with scaling suffix
+                   bits per sec (kbit, mbit, gbit)
diff --git a/templates/qos-policy/traffic-shaper/node.tag/default/rate/node.def b/templates/qos-policy/traffic-shaper/node.tag/default/bandwidth/node.def
index b206332..d728aa1 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/default/rate/node.def
+++ b/templates/qos-policy/traffic-shaper/node.tag/default/bandwidth/node.def
@@ -1,11 +1,11 @@
 type: txt
-default: "50%"
-help: Set the rate for default traffic
+help: Set the bandwidth used for default traffic
 syntax:expression: exec "[[ \"$VAR(@)\" =~ '^[0-9]+(\.[0-9]*)?%$' ]] || \
 	      /opt/vyatta/sbin/vyatta-qos-util.pl --rate \"$VAR(@)\""
 comp_help: Allowed values:
- <number>%         Percentage of overall rate (default 50%)
- <number><suffix>  Bitrate with scaling suffix
+ <number>	   Bandwidth in Kbps per second
+ <number>%         Percentage of overall rate
+ <number><suffix>  Value with scaling suffix
                    bits per sec (kbit, mbit, gbit)
                    bytes per sec (kbps, mbps, gbps)
 
diff --git a/templates/qos-policy/traffic-shaper/node.tag/default/ceiling/node.def b/templates/qos-policy/traffic-shaper/node.tag/default/ceiling/node.def
index a72de5d..4b8bb3f 100644
--- a/templates/qos-policy/traffic-shaper/node.tag/default/ceiling/node.def
+++ b/templates/qos-policy/traffic-shaper/node.tag/default/ceiling/node.def
@@ -1,6 +1,10 @@
 type: txt
-help: Set the limit for default traffic
+help: Set the bandwidth limit for default traffic
 default: "100%"
 syntax:expression: exec "[[ \"$VAR(@)\" =~  '^[0-9]+(\.[0-9]*)?%$' ]] || \
 	      /opt/vyatta/sbin/vyatta-qos-util.pl --rate \"$VAR(@)\""
-
+comp_help: Allowed values:
+ <number>          Limit in Kbps
+ <number>%         Percentage of overall rate (default 100%)
+ <number><suffix>  Value with scaling suffix
+                   bits per sec (kbit, mbit, gbit)