summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--Makefile.am9
-rwxr-xr-xgen-interface-templates.pl112
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/qos-policy/node.def1
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/qos-policy/out/node.def5
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/qos-policy/node.def1
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/qos-policy/out/node.def5
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/qos-policy/node.def1
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/qos-policy/out/node.def5
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/qos-policy/node.def1
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/qos-policy/out/node.def5
-rw-r--r--templates/interfaces/bonding/node.tag/qos-policy/node.def1
-rw-r--r--templates/interfaces/bonding/node.tag/qos-policy/out/node.def5
-rw-r--r--templates/interfaces/bonding/node.tag/vif/node.tag/qos-policy/node.def1
-rw-r--r--templates/interfaces/bonding/node.tag/vif/node.tag/qos-policy/out/node.def7
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/qos-policy/in/node.def9
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/qos-policy/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/qos-policy/out/node.def9
-rw-r--r--templates/interfaces/ethernet/node.tag/qos-policy/in/node.def5
-rw-r--r--templates/interfaces/ethernet/node.tag/qos-policy/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/qos-policy/out/node.def5
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/qos-policy/in/node.def9
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/qos-policy/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/qos-policy/out/node.def9
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/qos-policy/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/qos-policy/out/node.def7
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/qos-policy/out/node.def8
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/qos-policy/out/node.def7
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/qos-policy/out/node.def7
-rw-r--r--templates/interfaces/serial/node.tag/qos-policy/in/node.def5
-rw-r--r--templates/interfaces/serial/node.tag/qos-policy/node.def1
-rw-r--r--templates/interfaces/serial/node.tag/qos-policy/out/node.def5
-rw-r--r--templates/interfaces/tunnel/node.tag/qos-policy/node.def1
-rw-r--r--templates/interfaces/tunnel/node.tag/qos-policy/out/node.def5
34 files changed, 122 insertions, 134 deletions
diff --git a/.gitignore b/.gitignore
index eb55765..297cfa3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
/Makefile
/scripts/install-system
+generated-templates
diff --git a/Makefile.am b/Makefile.am
index bdd9e11..21b5a63 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
cfgdir = $(datadir)/vyatta-cfg/templates
+gentmpdir = generated-templates
share_perl5dir = /opt/vyatta/share/perl5/Vyatta/Qos
sbin_SCRIPTS = scripts/vyatta-qos.pl
@@ -20,8 +21,16 @@ etc_SCRIPTS =
cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \
cpio -0pd
+all-local:
+ rm -rf $(gentmpdir)
+ ./gen-interface-templates.pl $(gentmpdir)
+
+clean-local:
+ rm -rf $(gentmpdir)
+
install-exec-hook:
mkdir -p $(DESTDIR)$(cfgdir)
mkdir -p $(DESTDIR)/etc/ppp/ip-up.d
cd templates; $(cpiop) $(DESTDIR)$(cfgdir)
+ cd $(gentmpdir); $(cpiop) $(DESTDIR)$(cfgdir)
diff --git a/gen-interface-templates.pl b/gen-interface-templates.pl
new file mode 100755
index 0000000..996455f
--- /dev/null
+++ b/gen-interface-templates.pl
@@ -0,0 +1,112 @@
+#!/usr/bin/perl
+#
+# **** License ****
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# This code was originally developed by Vyatta, Inc.
+# Portions created by Vyatta are Copyright (C) 2009 Vyatta, Inc.
+# All Rights Reserved.
+#
+# Author: Stephen Hemminger
+# Date: March 2009
+# Description: Script to automatically generate per-interface qos templates.
+#
+# **** End License ****
+
+use strict;
+use warnings;
+
+# set DEBUG in environment to test script
+my $debug = $ENV{'DEBUG'};
+
+# Mapping from configuration level to ifname used AT THAT LEVEL
+my %interface_hash = (
+ 'loopback/node.tag' => '$VAR(@)',
+ 'ethernet/node.tag' => '$VAR(@)',
+ 'ethernet/node.tag/pppoe/node.tag' => 'pppoe$VAR(@)',
+ 'ethernet/node.tag/vif/node.tag' => '$VAR(../@).$VAR(@)',
+ 'ethernet/node.tag/vif/node.tag/pppoe/node.tag' => 'pppoe$VAR(@)',
+ 'bonding/node.tag' => '$VAR(@)',
+ 'bonding/node.tag/vif/node.tag' => '$VAR(../@).$VAR(@)',
+ 'tunnel/node.tag' => '$VAR(@)',
+ 'bridge/node.tag' => '$VAR(@)',
+ 'openvpn/node.tag' => '$VAR(@)',
+ 'wirelessmodem/node.tag' => '$VAR(@)',
+ 'multilink/node.tag/vif/node.tag' => '$VAR(../@)',
+
+ 'adsl/node.tag/pvc/node.tag/bridged-ethernet' => '$VAR(../../@)',
+ 'adsl/node.tag/pvc/node.tag/classical-ipoa' => '$VAR(../../@)',
+ 'adsl/node.tag/pvc/node.tag/pppoa/node.tag' => '$VAR(../../@)',
+ 'adsl/node.tag/pvc/node.tag/pppoe/node.tag' => '$VAR(../../@)',
+
+ 'serial/node.tag/cisco-hdlc/vif/node.tag' => '$VAR(../../@).$VAR(@)',
+ 'serial/node.tag/frame-relay/vif/node.tag' => '$VAR(../../@).$VAR(@)',
+ 'serial/node.tag/ppp/vif/node.tag' => '$VAR(../../@).$VAR(@)',
+);
+
+sub gen_template {
+ my ( $outpath, $ifname ) = @_;
+ $ifname =~ s#@\)#..\/..\/@\)#g;
+
+ print $outpath, "\n" if ($debug);
+ $outpath .= "/qos-policy";
+ mkdir $outpath
+ or die "Can't mkdir $outpath: $!";
+
+ open my $node, '>', "$outpath/node.def"
+ or die "Can't open $outpath/node.def: $!";
+ print $node "help: Set Quality of Service (QOS) policy for interface\n";
+ close $node
+ or die "Can't write $outpath/node.def: $!";
+
+ foreach my $dir qw(in out) {
+ my $path = "$outpath/$dir";
+
+ mkdir $path
+ or die "Can't create directory: $path: $!";
+ open my $node, '>', "$path/node.def"
+ or die "Can't open $path/node.def: $!";
+ select $node;
+ print <<EOF;
+type: txt
+help: Set ${dir}bound QOS policy for interface
+allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy $dir
+update: /opt/vyatta/sbin/vyatta-qos.pl --update-interface $ifname $dir \$VAR(@)
+delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-interface $ifname $dir
+EOF
+ select STDOUT;
+ close $node
+ or die "Can't write $path/node.def: $!";
+ }
+}
+
+sub mkdir_p {
+ my $path = shift;
+
+ return 1 if ( mkdir($path) );
+
+ my $pos = rindex( $path, "/" );
+ return unless $pos != -1;
+ return unless mkdir_p( substr( $path, 0, $pos ) );
+ return mkdir($path);
+}
+
+die "Usage: $0 output_directory\n" if ( $#ARGV < 0 );
+
+my $outdir = $ARGV[0];
+
+foreach my $if_tree ( keys %interface_hash ) {
+ my $outpath = "$outdir/interfaces/$if_tree";
+ ( -d $outpath )
+ or mkdir_p($outpath)
+ or die "Can't create $outpath:$!";
+
+ gen_template( $outpath, $interface_hash{$if_tree} );
+}
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/qos-policy/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/qos-policy/node.def
deleted file mode 100644
index 9e54c1c..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/qos-policy/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set Quality of Service (QOS) policy for specified ethernet interface
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/qos-policy/out/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/qos-policy/out/node.def
deleted file mode 100644
index b8c64de..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/qos-policy/out/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: txt
-help: Set outbound QOS policy for specified ethernet interface
-allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out
-update: /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/adsl/node.tag/pvc/node.tag/classical-ipoa/qos-policy/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/qos-policy/node.def
deleted file mode 100644
index 9e54c1c..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/qos-policy/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set Quality of Service (QOS) policy for specified ethernet interface
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/qos-policy/out/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/qos-policy/out/node.def
deleted file mode 100644
index b8c64de..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/qos-policy/out/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: txt
-help: Set outbound QOS policy for specified ethernet interface
-allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out
-update: /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/adsl/node.tag/pvc/node.tag/pppoa/node.tag/qos-policy/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/qos-policy/node.def
deleted file mode 100644
index 9e54c1c..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/qos-policy/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set Quality of Service (QOS) policy for specified ethernet interface
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/qos-policy/out/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/qos-policy/out/node.def
deleted file mode 100644
index 54a968a..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/qos-policy/out/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: txt
-help: Set outbound QOS policy for specified ethernet interface
-allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out
-update: /opt/vyatta/sbin/vyatta-qos.pl --update-interface pppoa$VAR(../../@) $VAR(.) $VAR(@)
-delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-interface pppoa$VAR(../../@) $VAR(.)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/qos-policy/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/qos-policy/node.def
deleted file mode 100644
index 9e54c1c..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/qos-policy/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set Quality of Service (QOS) policy for specified ethernet interface
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/qos-policy/out/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/qos-policy/out/node.def
deleted file mode 100644
index b61939d..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/qos-policy/out/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: txt
-help: Set outbound QOS policy for specified ethernet interface
-allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out
-update: /opt/vyatta/sbin/vyatta-qos.pl --update-interface pppoe$VAR(../../@) $VAR(.) $VAR(@)
-delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-interface pppoe$VAR(../../@) $VAR(.)
diff --git a/templates/interfaces/bonding/node.tag/qos-policy/node.def b/templates/interfaces/bonding/node.tag/qos-policy/node.def
deleted file mode 100644
index 28cffea..0000000
--- a/templates/interfaces/bonding/node.tag/qos-policy/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set Quality of Service (QoS) policy for specified bonding interface
diff --git a/templates/interfaces/bonding/node.tag/qos-policy/out/node.def b/templates/interfaces/bonding/node.tag/qos-policy/out/node.def
deleted file mode 100644
index c5964b3..0000000
--- a/templates/interfaces/bonding/node.tag/qos-policy/out/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: txt
-help: Set output QOS policy for specified bonding interface
-allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out
-update: /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/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/qos-policy/node.def
deleted file mode 100644
index 2c0cf7a..0000000
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/qos-policy/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Configure qos-policy
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
deleted file mode 100644
index c6561d6..0000000
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/qos-policy/out/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: Set outbound QOS policy
-allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out
-update: /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/pppoe/node.tag/qos-policy/in/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/qos-policy/in/node.def
deleted file mode 100644
index f160c90..0000000
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/qos-policy/in/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: txt
-
-help: Set input QOS policy for specified ethernet interface
-
-allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy in
-
-update: /opt/vyatta/sbin/vyatta-qos.pl --update-interface pppoe$VAR(../../@) $VAR(.) $VAR(@)
-
-delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-interface pppoe$VAR(../../@) $VAR(.)
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/qos-policy/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/qos-policy/node.def
deleted file mode 100644
index 9e54c1c..0000000
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/qos-policy/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set Quality of Service (QOS) policy for specified ethernet interface
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/qos-policy/out/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/qos-policy/out/node.def
deleted file mode 100644
index 91670ba..0000000
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/qos-policy/out/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: txt
-
-help: Set outbound QOS policy for specified ethernet interface
-
-allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out
-
-update: /opt/vyatta/sbin/vyatta-qos.pl --update-interface pppoe$VAR(../../@) $VAR(.) $VAR(@)
-
-delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-interface pppoe$VAR(../../@) $VAR(.)
diff --git a/templates/interfaces/ethernet/node.tag/qos-policy/in/node.def b/templates/interfaces/ethernet/node.tag/qos-policy/in/node.def
deleted file mode 100644
index 41f812f..0000000
--- a/templates/interfaces/ethernet/node.tag/qos-policy/in/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: txt
-help: Set input QOS policy for specified ethernet interface
-allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy in
-update: /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/ethernet/node.tag/qos-policy/node.def b/templates/interfaces/ethernet/node.tag/qos-policy/node.def
deleted file mode 100644
index 9e54c1c..0000000
--- a/templates/interfaces/ethernet/node.tag/qos-policy/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set Quality of Service (QOS) policy for specified ethernet interface
diff --git a/templates/interfaces/ethernet/node.tag/qos-policy/out/node.def b/templates/interfaces/ethernet/node.tag/qos-policy/out/node.def
deleted file mode 100644
index 0b3d91a..0000000
--- a/templates/interfaces/ethernet/node.tag/qos-policy/out/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: txt
-help: Set output QOS policy for specified ethernet interface
-allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out
-update: /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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/qos-policy/in/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/qos-policy/in/node.def
deleted file mode 100644
index f160c90..0000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/qos-policy/in/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: txt
-
-help: Set input QOS policy for specified ethernet interface
-
-allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy in
-
-update: /opt/vyatta/sbin/vyatta-qos.pl --update-interface pppoe$VAR(../../@) $VAR(.) $VAR(@)
-
-delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-interface pppoe$VAR(../../@) $VAR(.)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/qos-policy/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/qos-policy/node.def
deleted file mode 100644
index 9e54c1c..0000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/qos-policy/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set Quality of Service (QOS) policy for specified ethernet interface
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/qos-policy/out/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/qos-policy/out/node.def
deleted file mode 100644
index 91670ba..0000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/qos-policy/out/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: txt
-
-help: Set outbound QOS policy for specified ethernet interface
-
-allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out
-
-update: /opt/vyatta/sbin/vyatta-qos.pl --update-interface pppoe$VAR(../../@) $VAR(.) $VAR(@)
-
-delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-interface pppoe$VAR(../../@) $VAR(.)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/qos-policy/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/qos-policy/node.def
deleted file mode 100644
index 2c0cf7a..0000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/qos-policy/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Configure qos-policy
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
deleted file mode 100644
index bfbf897..0000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/qos-policy/out/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: Set outbound QOS policy
-allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out
-update: /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/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
deleted file mode 100644
index dedd303..0000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/qos-policy/out/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-help: Set outbound QOS policy
-allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out
-update: /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/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
deleted file mode 100644
index d1048ab..0000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/qos-policy/out/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: Set outbound QOS policy
-allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out
-update: /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/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
deleted file mode 100644
index d1048ab..0000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/qos-policy/out/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: Set outbound QOS policy
-allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out
-update: /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/serial/node.tag/qos-policy/in/node.def b/templates/interfaces/serial/node.tag/qos-policy/in/node.def
deleted file mode 100644
index de04df8..0000000
--- a/templates/interfaces/serial/node.tag/qos-policy/in/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: txt
-help: Set inbound QOS policy for specified serial interface
-allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy in
-update: /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/serial/node.tag/qos-policy/node.def b/templates/interfaces/serial/node.tag/qos-policy/node.def
deleted file mode 100644
index baec6e6..0000000
--- a/templates/interfaces/serial/node.tag/qos-policy/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set Quality of Service (QOS) policy for specified serial interface
diff --git a/templates/interfaces/serial/node.tag/qos-policy/out/node.def b/templates/interfaces/serial/node.tag/qos-policy/out/node.def
deleted file mode 100644
index f654046..0000000
--- a/templates/interfaces/serial/node.tag/qos-policy/out/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: txt
-help: Set outbound QOS policy for specified serial interface
-allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out
-update: /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/tunnel/node.tag/qos-policy/node.def b/templates/interfaces/tunnel/node.tag/qos-policy/node.def
deleted file mode 100644
index f5ae777..0000000
--- a/templates/interfaces/tunnel/node.tag/qos-policy/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set the tunnel Quality of Service (QOS) policy
diff --git a/templates/interfaces/tunnel/node.tag/qos-policy/out/node.def b/templates/interfaces/tunnel/node.tag/qos-policy/out/node.def
deleted file mode 100644
index c81b651..0000000
--- a/templates/interfaces/tunnel/node.tag/qos-policy/out/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: txt
-help: Set the tunnel QoS policy
-allowed: /opt/vyatta/sbin/vyatta-qos.pl --list-policy out
-update: /opt/vyatta/sbin/vyatta-qos.pl --update-interface $VAR(../../@) $VAR(.) $VAR(@)
-delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-interface $VAR(../../@) $VAR(.)