diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-09-05 15:03:30 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-09-05 15:03:30 -0700 |
| commit | 200fb453f43a3f0406c14b9003ca5a1e6f7587f4 (patch) | |
| tree | 02a1a92a6952afabbb861c15f10ef908fa4b5f4a /templates | |
| parent | dae88a60a1b40555db65f19a417b0600055a4b51 (diff) | |
| download | vyatta-cfg-qos-200fb453f43a3f0406c14b9003ca5a1e6f7587f4.tar.gz vyatta-cfg-qos-200fb453f43a3f0406c14b9003ca5a1e6f7587f4.zip | |
Workaround CLI regex problem
Recent CLI changes seem to have broken working templates that
do regex matching. Workaround this by doing the syntax checking
all in the perl script
Bugfix: 3553
Diffstat (limited to 'templates')
4 files changed, 4 insertions, 8 deletions
diff --git a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/bandwidth/node.def b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/bandwidth/node.def index 2871b23..6f15037 100644 --- a/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/bandwidth/node.def +++ b/templates/qos-policy/traffic-shaper/node.tag/class/node.tag/bandwidth/node.def @@ -1,8 +1,7 @@ type: txt default: "100%" 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(@)\"" +syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate \"$VAR(@)\"" comp_help: Allowed values: <number> Bandwidth in Kbps <number>%% Percentage of overall rate (default 100%%) 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 82c5ff0..11bf6b9 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,7 +1,6 @@ type: txt 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(@)\"" +syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate \"$VAR(@)\"" comp_help: Allowed values: <number> Limit in Kbps <number>%% Percentage of overall rate diff --git a/templates/qos-policy/traffic-shaper/node.tag/default/bandwidth/node.def b/templates/qos-policy/traffic-shaper/node.tag/default/bandwidth/node.def index 21b6e88..4d454d4 100644 --- a/templates/qos-policy/traffic-shaper/node.tag/default/bandwidth/node.def +++ b/templates/qos-policy/traffic-shaper/node.tag/default/bandwidth/node.def @@ -1,7 +1,6 @@ type: txt 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(@)\"" +syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate \"$VAR(@)\"" comp_help: Allowed values: <number> Bandwidth in Kbps per second <number>%% Percentage of overall rate 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 9b3c855..463c6bb 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,8 +1,7 @@ type: txt 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(@)\"" +syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --percent-or-rate \"$VAR(@)\"" comp_help: Allowed values: <number> Limit in Kbps <number>%% Percentage of overall rate (default 100%%) |