From eacbdd4f0b986b9598cf7f5b38dcac01aabbdab3 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon, 27 Oct 2008 09:39:12 -0700
Subject: Fix QoS on Vif

Handle Vif on serial.
Can't have update and create tag.
---
 templates/interfaces/bonding/node.tag/qos-policy/out/node.def       | 4 ++--
 .../bonding/node.tag/vif/node.tag/qos-policy/out/node.def           | 4 ++--
 .../ethernet/node.tag/vif/node.tag/qos-policy/out/node.def          | 6 +++---
 .../serial/node.tag/cisco-hdlc/vif/node.tag/qos-policy/out/node.def | 5 +++--
 .../node.tag/frame-relay/vif/node.tag/qos-policy/out/node.def       | 5 +++--
 .../serial/node.tag/ppp/vif/node.tag/qos-policy/out/node.def        | 5 +++--
 templates/interfaces/tunnel/node.tag/qos-policy/out/node.def        | 5 +++--
 7 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'templates')

diff --git a/templates/interfaces/bonding/node.tag/qos-policy/out/node.def b/templates/interfaces/bonding/node.tag/qos-policy/out/node.def
index ec96f0f..c7d6ad2 100644
--- a/templates/interfaces/bonding/node.tag/qos-policy/out/node.def
+++ b/templates/interfaces/bonding/node.tag/qos-policy/out/node.def
@@ -1,6 +1,6 @@
 type: txt
 help: Set output QOS policy for specified bonding interface
 allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out
-create: sudo ip link set dev $VAR(../../../@).$VAR(../../@) txqueuelen 100
-update: /opt/vyatta/sbin/vyatta-qos.pl --update-interface $VAR(../../@) $VAR(.) $VAR(@)
+update: sudo ip link set dev $VAR(../../../@).$VAR(../../@) txqueuelen 100
+        /opt/vyatta/sbin/vyatta-qos.pl --update-interface $VAR(../../@) $VAR(.) $VAR(@)
 delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-interface $VAR(../../@) $VAR(.)
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/qos-policy/out/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/qos-policy/out/node.def
index df0ea43..729fa7c 100644
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/qos-policy/out/node.def
+++ b/templates/interfaces/bonding/node.tag/vif/node.tag/qos-policy/out/node.def
@@ -1,8 +1,8 @@
 type: txt
 help: Set outbound QOS policy
 allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out
-create: sudo ip link set dev $VAR(../../../@).$VAR(../../@) txqueuelen 100
-update: /opt/vyatta/sbin/vyatta-qos.pl \
+update: sudo ip link set dev $VAR(../../../@).$VAR(../../@) txqueuelen 100
+    /opt/vyatta/sbin/vyatta-qos.pl \
 	--update-interface $VAR(../../../@).$VAR(../../@) $VAR(.) $VAR(@)
 delete: /opt/vyatta/sbin/vyatta-qos.pl \
 	--delete-interface $VAR(../../../@).$VAR(../../@) $VAR(.)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/qos-policy/out/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/qos-policy/out/node.def
index df0ea43..548cc8c 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/qos-policy/out/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/qos-policy/out/node.def
@@ -1,9 +1,9 @@
 type: txt
 help: Set outbound QOS policy
 allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out
-create: sudo ip link set dev $VAR(../../../@).$VAR(../../@) txqueuelen 100
-update: /opt/vyatta/sbin/vyatta-qos.pl \
-	--update-interface $VAR(../../../@).$VAR(../../@) $VAR(.) $VAR(@)
+update: sudo ip link set dev $VAR(../../../@).$VAR(../../@) txqueuelen 100
+    /opt/vyatta/sbin/vyatta-qos.pl \
+       --update-interface $VAR(../../../@).$VAR(../../@) $VAR(.) $VAR(@)
 delete: /opt/vyatta/sbin/vyatta-qos.pl \
 	--delete-interface $VAR(../../../@).$VAR(../../@) $VAR(.)
     sudo ip link set dev $VAR(../../../@).$VAR(../../@) txqueuelen 0
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/qos-policy/out/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/qos-policy/out/node.def
index f4b7221..2f92a3b 100644
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/qos-policy/out/node.def
+++ b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/qos-policy/out/node.def
@@ -1,9 +1,10 @@
 type: txt
 help: Set outbound QOS policy
 allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out
-create: sudo ip link set dev $VAR(../../../../@).$VAR(../../@) txqueuelen 100
-update: /opt/vyatta/sbin/vyatta-qos.pl \
+update: sudo ip link set dev $VAR(../../../../@).$VAR(../../@) txqueuelen 100
+    /opt/vyatta/sbin/vyatta-qos.pl \
 	--update-interface $VAR(../../../../@).$VAR(../../@) $VAR(.) $VAR(@)
 delete: /opt/vyatta/sbin/vyatta-qos.pl \
 	--delete-interface $VAR(../../../../@).$VAR(../../@) $VAR(.)
+    sudo ip link set dev $VAR(../../../../@).$VAR(../../@) txqueuelen 0
 
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/qos-policy/out/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/qos-policy/out/node.def
index 905c3b5..67482aa 100644
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/qos-policy/out/node.def
+++ b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/qos-policy/out/node.def
@@ -1,8 +1,9 @@
 type: txt
 help: Set outbound QOS policy
 allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out
-create: sudo ip link set dev $VAR(../../../../@).$VAR(../../@) txqueuelen 100
-update: /opt/vyatta/sbin/vyatta-qos.pl \
+update: sudo ip link set dev $VAR(../../../../@).$VAR(../../@) txqueuelen 100
+    /opt/vyatta/sbin/vyatta-qos.pl \
 	--update-interface $VAR(../../../../@).$VAR(../../@) $VAR(.) $VAR(@)
 delete: /opt/vyatta/sbin/vyatta-qos.pl \
 	--delete-interface $VAR(../../../../@).$VAR(../../@) $VAR(.)
+    sudo ip link set dev $VAR(../../../../@).$VAR(../../@) txqueuelen 0
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/qos-policy/out/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/qos-policy/out/node.def
index 905c3b5..67482aa 100644
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/qos-policy/out/node.def
+++ b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/qos-policy/out/node.def
@@ -1,8 +1,9 @@
 type: txt
 help: Set outbound QOS policy
 allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out
-create: sudo ip link set dev $VAR(../../../../@).$VAR(../../@) txqueuelen 100
-update: /opt/vyatta/sbin/vyatta-qos.pl \
+update: sudo ip link set dev $VAR(../../../../@).$VAR(../../@) txqueuelen 100
+    /opt/vyatta/sbin/vyatta-qos.pl \
 	--update-interface $VAR(../../../../@).$VAR(../../@) $VAR(.) $VAR(@)
 delete: /opt/vyatta/sbin/vyatta-qos.pl \
 	--delete-interface $VAR(../../../../@).$VAR(../../@) $VAR(.)
+    sudo ip link set dev $VAR(../../../../@).$VAR(../../@) txqueuelen 0
diff --git a/templates/interfaces/tunnel/node.tag/qos-policy/out/node.def b/templates/interfaces/tunnel/node.tag/qos-policy/out/node.def
index 063fe58..13c78af 100644
--- a/templates/interfaces/tunnel/node.tag/qos-policy/out/node.def
+++ b/templates/interfaces/tunnel/node.tag/qos-policy/out/node.def
@@ -1,6 +1,7 @@
 type: txt
 help: Set the tunnel QoS policy
 allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out
-create: sudo ip link set dev $VAR(../../../@).$VAR(../../@) txqueuelen 100
-update: /opt/vyatta/sbin/vyatta-qos.pl --update-interface $VAR(../../@) $VAR(.) $VAR(@)
+update: sudo ip link set dev $VAR(../../../@).$VAR(../../@) txqueuelen 100
+    /opt/vyatta/sbin/vyatta-qos.pl --update-interface $VAR(../../@) $VAR(.) $VAR(@)
 delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-interface $VAR(../../@) $VAR(.)
+    sudo ip link set dev $VAR(../../../@).$VAR(../../@) txqueuelen 0
-- 
cgit v1.2.3