From 591e6f4ff4fa62374b8088e16022affd37db7699 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Sun, 8 Mar 2009 13:29:28 -0700
Subject: Move apply from top level into policy nodes

Makes code simpler and will work better with config system.
Also eliminates need for isChanged() code.
---
 templates/qos-policy/drop-tail/node.def        | 1 +
 templates/qos-policy/fair-queue/node.def       | 1 +
 templates/qos-policy/network-emulator/node.def | 1 +
 templates/qos-policy/node.def                  | 1 -
 templates/qos-policy/rate-limit/node.def       | 1 +
 templates/qos-policy/traffic-limiter/node.def  | 1 +
 templates/qos-policy/traffic-shaper/node.def   | 1 +
 7 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'templates/qos-policy')

diff --git a/templates/qos-policy/drop-tail/node.def b/templates/qos-policy/drop-tail/node.def
index 4cb2ada..ba99edb 100644
--- a/templates/qos-policy/drop-tail/node.def
+++ b/templates/qos-policy/drop-tail/node.def
@@ -5,3 +5,4 @@ syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$"
                    ; "only alpha-numeric policy name allowed"
 update: /opt/vyatta/sbin/vyatta-qos.pl --create-policy "$VAR(.)" "$VAR(@)"
 delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy "$VAR(@)"
+end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy "$VAR(@)"
diff --git a/templates/qos-policy/fair-queue/node.def b/templates/qos-policy/fair-queue/node.def
index aee9aa3..ebe6274 100644
--- a/templates/qos-policy/fair-queue/node.def
+++ b/templates/qos-policy/fair-queue/node.def
@@ -5,3 +5,4 @@ syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$"
                    ; "only alpha-numeric policy name allowed"
 update: /opt/vyatta/sbin/vyatta-qos.pl --create-policy "$VAR(.)" "$VAR(@)"
 delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy "$VAR(@)"
+end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy "$VAR(@)"
diff --git a/templates/qos-policy/network-emulator/node.def b/templates/qos-policy/network-emulator/node.def
index 0139490..9da2744 100644
--- a/templates/qos-policy/network-emulator/node.def
+++ b/templates/qos-policy/network-emulator/node.def
@@ -5,3 +5,4 @@ syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$"
                    ; "only alpha-numeric policy name allowed"
 update: /opt/vyatta/sbin/vyatta-qos.pl --create-policy "$VAR(.)" "$VAR(@)"
 delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy "$VAR(@)"
+end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy "$VAR(@)"
diff --git a/templates/qos-policy/node.def b/templates/qos-policy/node.def
index 8651fd7..e692c0f 100644
--- a/templates/qos-policy/node.def
+++ b/templates/qos-policy/node.def
@@ -1,2 +1 @@
 help: Configure Quality of Service (QOS) policy type
-end: /opt/vyatta/sbin/vyatta-qos.pl --apply
diff --git a/templates/qos-policy/rate-limit/node.def b/templates/qos-policy/rate-limit/node.def
index 85586db..0466781 100644
--- a/templates/qos-policy/rate-limit/node.def
+++ b/templates/qos-policy/rate-limit/node.def
@@ -5,3 +5,4 @@ syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$"
                    ; "only alpha-numeric policy name allowed"
 update: /opt/vyatta/sbin/vyatta-qos.pl --create-policy "$VAR(.)" "$VAR(@)"
 delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy "$VAR(@)"
+end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy "$VAR(@)"
diff --git a/templates/qos-policy/traffic-limiter/node.def b/templates/qos-policy/traffic-limiter/node.def
index d760acb..9370294 100644
--- a/templates/qos-policy/traffic-limiter/node.def
+++ b/templates/qos-policy/traffic-limiter/node.def
@@ -5,3 +5,4 @@ syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$"
                    ; "only alpha-numeric policy name allowed"
 update: /opt/vyatta/sbin/vyatta-qos.pl --create-policy "$VAR(.)" "$VAR(@)"
 delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy "$VAR(@)"
+end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy "$VAR(@)"
diff --git a/templates/qos-policy/traffic-shaper/node.def b/templates/qos-policy/traffic-shaper/node.def
index b0b209d..11b91fe 100644
--- a/templates/qos-policy/traffic-shaper/node.def
+++ b/templates/qos-policy/traffic-shaper/node.def
@@ -5,3 +5,4 @@ syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$"
                    ; "only alpha-numeric policy name allowed"
 update: /opt/vyatta/sbin/vyatta-qos.pl --create-policy "$VAR(.)" "$VAR(@)"
 delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy "$VAR(@)"
+end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy "$VAR(@)"
-- 
cgit v1.2.3