From d96867cd19221810035c48ba4cead516c39116f6 Mon Sep 17 00:00:00 2001
From: kouak <kouak@kouak.org>
Date: Wed, 25 Mar 2015 14:22:37 +0100
Subject: Refactor QoS class match templates

---
 .../limiter/node.tag/class/node.tag/match/node.def    |  4 ----
 .../node.tag/match/node.tag/description/node.def      |  2 --
 .../match/node.tag/ether/destination/node.def         |  2 --
 .../class/node.tag/match/node.tag/ether/node.def      |  1 -
 .../node.tag/match/node.tag/ether/protocol/node.def   | 14 --------------
 .../node.tag/match/node.tag/ether/source/node.def     |  2 --
 .../match/node.tag/ip/destination/address/node.def    |  2 --
 .../node.tag/match/node.tag/ip/destination/node.def   |  1 -
 .../match/node.tag/ip/destination/port/node.def       |  5 -----
 .../class/node.tag/match/node.tag/ip/dscp/node.def    | 19 -------------------
 .../class/node.tag/match/node.tag/ip/node.def         |  2 --
 .../node.tag/match/node.tag/ip/protocol/node.def      | 16 ----------------
 .../match/node.tag/ip/source/address/node.def         |  2 --
 .../class/node.tag/match/node.tag/ip/source/node.def  |  1 -
 .../node.tag/match/node.tag/ip/source/port/node.def   |  6 ------
 .../match/node.tag/ipv6/destination/address/node.def  |  2 --
 .../node.tag/match/node.tag/ipv6/destination/node.def |  1 -
 .../match/node.tag/ipv6/destination/port/node.def     |  5 -----
 .../class/node.tag/match/node.tag/ipv6/dscp/node.def  | 19 -------------------
 .../class/node.tag/match/node.tag/ipv6/node.def       |  1 -
 .../node.tag/match/node.tag/ipv6/protocol/node.def    | 17 -----------------
 .../match/node.tag/ipv6/source/address/node.def       |  2 --
 .../node.tag/match/node.tag/ipv6/source/node.def      |  1 -
 .../node.tag/match/node.tag/ipv6/source/port/node.def |  6 ------
 .../class/node.tag/match/node.tag/vif/node.def        |  5 -----
 .../node.tag/class/node.tag/match/node.def            |  4 ----
 .../node.tag/match/node.tag/description/node.def      |  2 --
 .../match/node.tag/ether/destination/node.def         |  2 --
 .../class/node.tag/match/node.tag/ether/node.def      |  1 -
 .../node.tag/match/node.tag/ether/protocol/node.def   | 15 ---------------
 .../node.tag/match/node.tag/ether/source/node.def     |  2 --
 .../class/node.tag/match/node.tag/interface/node.def  |  7 -------
 .../match/node.tag/ip/destination/address/node.def    |  2 --
 .../node.tag/match/node.tag/ip/destination/node.def   |  1 -
 .../match/node.tag/ip/destination/port/node.def       |  5 -----
 .../class/node.tag/match/node.tag/ip/dscp/node.def    | 18 ------------------
 .../class/node.tag/match/node.tag/ip/node.def         |  2 --
 .../node.tag/match/node.tag/ip/protocol/node.def      | 16 ----------------
 .../match/node.tag/ip/source/address/node.def         |  2 --
 .../class/node.tag/match/node.tag/ip/source/node.def  |  1 -
 .../node.tag/match/node.tag/ip/source/port/node.def   |  6 ------
 .../match/node.tag/ipv6/destination/address/node.def  |  2 --
 .../node.tag/match/node.tag/ipv6/destination/node.def |  1 -
 .../match/node.tag/ipv6/destination/port/node.def     |  5 -----
 .../class/node.tag/match/node.tag/ipv6/dscp/node.def  | 18 ------------------
 .../class/node.tag/match/node.tag/ipv6/node.def       |  1 -
 .../node.tag/match/node.tag/ipv6/protocol/node.def    | 16 ----------------
 .../match/node.tag/ipv6/source/address/node.def       |  2 --
 .../node.tag/match/node.tag/ipv6/source/node.def      |  1 -
 .../node.tag/match/node.tag/ipv6/source/port/node.def |  6 ------
 .../class/node.tag/match/node.tag/mark/node.def       |  2 --
 .../class/node.tag/match/node.tag/vif/node.def        |  5 -----
 .../node.tag/class/node.tag/match/node.def            |  4 ----
 .../node.tag/match/node.tag/description/node.def      |  2 --
 .../match/node.tag/ether/destination/node.def         |  2 --
 .../class/node.tag/match/node.tag/ether/node.def      |  1 -
 .../node.tag/match/node.tag/ether/protocol/node.def   | 14 --------------
 .../node.tag/match/node.tag/ether/source/node.def     |  2 --
 .../class/node.tag/match/node.tag/interface/node.def  |  7 -------
 .../match/node.tag/ip/destination/address/node.def    |  2 --
 .../node.tag/match/node.tag/ip/destination/node.def   |  1 -
 .../match/node.tag/ip/destination/port/node.def       |  5 -----
 .../class/node.tag/match/node.tag/ip/dscp/node.def    | 18 ------------------
 .../class/node.tag/match/node.tag/ip/node.def         |  2 --
 .../node.tag/match/node.tag/ip/protocol/node.def      | 16 ----------------
 .../match/node.tag/ip/source/address/node.def         |  2 --
 .../class/node.tag/match/node.tag/ip/source/node.def  |  1 -
 .../node.tag/match/node.tag/ip/source/port/node.def   |  6 ------
 .../match/node.tag/ipv6/destination/address/node.def  |  2 --
 .../node.tag/match/node.tag/ipv6/destination/node.def |  1 -
 .../match/node.tag/ipv6/destination/port/node.def     |  5 -----
 .../class/node.tag/match/node.tag/ipv6/dscp/node.def  | 18 ------------------
 .../class/node.tag/match/node.tag/ipv6/node.def       |  1 -
 .../node.tag/match/node.tag/ipv6/protocol/node.def    | 16 ----------------
 .../match/node.tag/ipv6/source/address/node.def       |  2 --
 .../node.tag/match/node.tag/ipv6/source/node.def      |  1 -
 .../node.tag/match/node.tag/ipv6/source/port/node.def |  6 ------
 .../class/node.tag/match/node.tag/mark/node.def       |  2 --
 .../class/node.tag/match/node.tag/vif/node.def        |  5 -----
 .../node.tag/class/node.tag/match/node.def            |  4 ----
 .../node.tag/match/node.tag/description/node.def      |  2 --
 .../match/node.tag/ether/destination/node.def         |  2 --
 .../class/node.tag/match/node.tag/ether/node.def      |  1 -
 .../node.tag/match/node.tag/ether/protocol/node.def   | 15 ---------------
 .../node.tag/match/node.tag/ether/source/node.def     |  2 --
 .../class/node.tag/match/node.tag/interface/node.def  |  7 -------
 .../match/node.tag/ip/destination/address/node.def    |  2 --
 .../node.tag/match/node.tag/ip/destination/node.def   |  1 -
 .../match/node.tag/ip/destination/port/node.def       |  5 -----
 .../class/node.tag/match/node.tag/ip/dscp/node.def    | 18 ------------------
 .../class/node.tag/match/node.tag/ip/node.def         |  2 --
 .../node.tag/match/node.tag/ip/protocol/node.def      | 16 ----------------
 .../match/node.tag/ip/source/address/node.def         |  2 --
 .../class/node.tag/match/node.tag/ip/source/node.def  |  1 -
 .../node.tag/match/node.tag/ip/source/port/node.def   |  6 ------
 .../match/node.tag/ipv6/destination/address/node.def  |  2 --
 .../node.tag/match/node.tag/ipv6/destination/node.def |  1 -
 .../match/node.tag/ipv6/destination/port/node.def     |  5 -----
 .../class/node.tag/match/node.tag/ipv6/dscp/node.def  | 18 ------------------
 .../class/node.tag/match/node.tag/ipv6/node.def       |  1 -
 .../node.tag/match/node.tag/ipv6/protocol/node.def    | 16 ----------------
 .../match/node.tag/ipv6/source/address/node.def       |  2 --
 .../node.tag/match/node.tag/ipv6/source/node.def      |  1 -
 .../node.tag/match/node.tag/ipv6/source/port/node.def |  6 ------
 .../class/node.tag/match/node.tag/mark/node.def       |  2 --
 .../class/node.tag/match/node.tag/vif/node.def        |  5 -----
 .../shaper/node.tag/class/node.tag/match/node.def     |  4 ----
 .../node.tag/match/node.tag/description/node.def      |  2 --
 .../match/node.tag/ether/destination/node.def         |  2 --
 .../class/node.tag/match/node.tag/ether/node.def      |  1 -
 .../node.tag/match/node.tag/ether/protocol/node.def   | 15 ---------------
 .../node.tag/match/node.tag/ether/source/node.def     |  2 --
 .../class/node.tag/match/node.tag/interface/node.def  |  7 -------
 .../match/node.tag/ip/destination/address/node.def    |  2 --
 .../node.tag/match/node.tag/ip/destination/node.def   |  1 -
 .../match/node.tag/ip/destination/port/node.def       |  5 -----
 .../class/node.tag/match/node.tag/ip/dscp/node.def    | 18 ------------------
 .../class/node.tag/match/node.tag/ip/node.def         |  2 --
 .../node.tag/match/node.tag/ip/protocol/node.def      | 16 ----------------
 .../match/node.tag/ip/source/address/node.def         |  2 --
 .../class/node.tag/match/node.tag/ip/source/node.def  |  1 -
 .../node.tag/match/node.tag/ip/source/port/node.def   |  6 ------
 .../match/node.tag/ipv6/destination/address/node.def  |  2 --
 .../node.tag/match/node.tag/ipv6/destination/node.def |  1 -
 .../match/node.tag/ipv6/destination/port/node.def     |  5 -----
 .../class/node.tag/match/node.tag/ipv6/dscp/node.def  | 18 ------------------
 .../class/node.tag/match/node.tag/ipv6/node.def       |  1 -
 .../node.tag/match/node.tag/ipv6/protocol/node.def    | 16 ----------------
 .../match/node.tag/ipv6/source/address/node.def       |  2 --
 .../node.tag/match/node.tag/ipv6/source/node.def      |  1 -
 .../node.tag/match/node.tag/ipv6/source/port/node.def |  6 ------
 .../class/node.tag/match/node.tag/mark/node.def       |  2 --
 .../class/node.tag/match/node.tag/vif/node.def        |  5 -----
 133 files changed, 717 deletions(-)
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/description/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/source/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
 delete mode 100644 templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/vif/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/description/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ether/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ether/source/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/interface/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/source/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/mark/node.def
 delete mode 100644 templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/vif/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/description/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/source/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/interface/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/mark/node.def
 delete mode 100644 templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/vif/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/description/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/source/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/interface/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/source/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/mark/node.def
 delete mode 100644 templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/vif/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/description/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/source/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/interface/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/mark/node.def
 delete mode 100644 templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/vif/node.def

(limited to 'templates/traffic-policy')

diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.def
deleted file mode 100644
index cde128f..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-tag:
-type: txt
-syntax:expression: pattern $VAR(@) "^[^-]" ; "Match queue name cannot start with \"-\""
-help: Class matching rule name
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/description/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/description/node.def
deleted file mode 100644
index 903f260..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/description/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: Description for this match
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/destination/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
deleted file mode 100644
index 92fb9a9..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: macaddr
-help: Ethernet destination address for this match
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/node.def
deleted file mode 100644
index 454c1ed..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Ethernet header match
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
deleted file mode 100644
index ceadb5b..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
+++ /dev/null
@@ -1,14 +0,0 @@
-type: txt
-help: Ethernet protocol for this match
-allowed: echo \
-    all 802.1Q 802_2 802_3 aarp aoe arp atalk \
-    dec ip ipv6 ipx lat localtalk rarp snap x25
-val_help: u32:0-65535; Ethernet protocol number
-val_help: txt; Ethernet protocol name
-val_help: all; Any protocol
-val_help: ip; Internet IP (IPv4)
-val_help: _ipv6; Internet IP (IPv6)
-val_help: arp; Address Resolution Protocol
-val_help: atalk; Appletalk
-val_help: ipx; Novell Internet Packet Exchange
-val_help: 802.1Q; 802.1Q VLAN tag
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/source/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/source/node.def
deleted file mode 100644
index 3094167..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ether/source/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: macaddr
-help: Ethernet source address for this match
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
deleted file mode 100644
index 8d02285..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv4net
-help: IP destination address for this match
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
deleted file mode 100644
index 54eef5b..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on destination port or address
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
deleted file mode 100644
index fc85c5f..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: txt
-help: TCP (or UDP) destination port for this match
-
-val_help: u32:1-65535; Numeric IP port
-val_help: txt; Assigned TCP (or UDP) port name
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
deleted file mode 100644
index c55127c..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
+++ /dev/null
@@ -1,19 +0,0 @@
-type: txt
-help: Match on Differentiated Services Codepoint (DSCP)
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
-allowed: awk '
-	/^#/ { next }
-	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
-
-val_help: u32:0-63;Differentiated Services Codepoint (DSCP) value 
-val_help: default; match DSCP (000000)
-val_help: reliability; match; DSCP (000001)
-val_help: throughput; match; DSCP (000010)
-val_help: lowdelay; match; DSCP (000100)
-val_help: priority; match; DSCP (001000)
-val_help: immediate; match; DSCP (010000)
-val_help: flash; match DSCP (011000)
-val_help: flash-override; match DSCP (100000)
-val_help: critical; match DSCP (101000)
-val_help: internet; match; DSCP (110000)
-val_help: network; match; DSCP (111000)
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/node.def
deleted file mode 100644
index 517dc71..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Match IP protocol header
-
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
deleted file mode 100644
index 355c6a6..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-type: txt
-help: Match IP protocol name or number
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)" 
-allowed: awk '
-	/^#/ { next }
-	     { printf "%s ", $1 }' </etc/protocols
-val_help: u32:0-255; IP protocol value
-val_help: icmp; Internet Control Message Protocol
-val_help: igmp; Internet Group Management Protocol
-val_help: ggp; Gateway-Gateway protocol
-val_help: tcp; Transmission Control Protocol
-val_help: egp; Exterior Gateway Protocol
-val_help: udp; User Datagram Protocol
-val_help: gre; General Routing Encapsulation
-val_help: ospf; Open Shortest Path First IGP
-val_help: sctp; Stream Control Transmission Protocol
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
deleted file mode 100644
index 6053344..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv4net
-help: IP source address for this match
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/node.def
deleted file mode 100644
index 4271b94..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on source port or address
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
deleted file mode 100644
index 6d211d1..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: TCP (or UDP) source port for this match
-
-val_help: u32:1-65535; Numeric IP port
-val_help: txt; Assigned TCP (or UDP) port name
-
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
deleted file mode 100644
index 3fbbc31..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv6net
-help: IP destination address for this match
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
deleted file mode 100644
index 54eef5b..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on destination port or address
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
deleted file mode 100644
index fc85c5f..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: txt
-help: TCP (or UDP) destination port for this match
-
-val_help: u32:1-65535; Numeric IP port
-val_help: txt; Assigned TCP (or UDP) port name
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
deleted file mode 100644
index f358023..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
+++ /dev/null
@@ -1,19 +0,0 @@
-type: txt
-help: Match on Differentiated Services Codepoint (DSCP)
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
-allowed: awk '
-	/^#/ { next }
-	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
-
-val_help: u32:0-63; Differentiated Services Codepoint (DSCP) value
-val_help: default; match DSCP (000000)
-val_help: reliability; match DSCP (000001)
-val_help: throughput; match DSCP (000010)
-val_help: lowdelay; match DSCP (000100)
-val_help: priority; match DSCP (001000)
-val_help: immediate; match DSCP (010000)
-val_help: flash; match DSCP (011000)
-val_help: flash; -override 	match DSCP (100000)
-val_help: critical; match DSCP (101000)
-val_help: internet; match DSCP (110000)
-val_help: network; match DSCP (111000)
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/node.def
deleted file mode 100644
index 8ff47bb..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match IPV6 header
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
deleted file mode 100644
index 66451c8..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: txt
-help: Match IP protocol name or number
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)" 
-allowed: awk '
-	/^#/ { next }
-	     { printf "%s ", $1 }' </etc/protocols
-
-val_help: u32:0-255; IP protocol value
-val_help: icmp; Internet Control Message Protocol
-val_help: igmp; Internet Group Management Protocol
-val_help: ggp; Gateway-Gateway protocol
-val_help: tcp; Transmission Control Protocol
-val_help: egp; Exterior Gateway Protocol
-val_help: udp; User Datagram Protocol
-val_help: gre; General Routing Encapsulation
-val_help: ospf; Open Shortest Path First IGP
-val_help: sctp; Stream Control Transmission Protocol
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
deleted file mode 100644
index 9071a74..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv6net
-help: IP source address for this match
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
deleted file mode 100644
index 4271b94..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on source port or address
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
deleted file mode 100644
index 6d211d1..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: TCP (or UDP) source port for this match
-
-val_help: u32:1-65535; Numeric IP port
-val_help: txt; Assigned TCP (or UDP) port name
-
diff --git a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/vif/node.def b/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/vif/node.def
deleted file mode 100644
index be93225..0000000
--- a/templates/traffic-policy/limiter/node.tag/class/node.tag/match/node.tag/vif/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: u32
-help: Virtual Local Area Network (VLAN) ID for this match
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4095; "VLAN ID must be between 0 and 4095"
-
-val_help: u32:0-4095; Virtual Local Area Network (VLAN) tag 
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.def
deleted file mode 100644
index cde128f..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-tag:
-type: txt
-syntax:expression: pattern $VAR(@) "^[^-]" ; "Match queue name cannot start with \"-\""
-help: Class matching rule name
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/description/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/description/node.def
deleted file mode 100644
index 903f260..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/description/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: Description for this match
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ether/destination/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
deleted file mode 100644
index 92fb9a9..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: macaddr
-help: Ethernet destination address for this match
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ether/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ether/node.def
deleted file mode 100644
index 454c1ed..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ether/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Ethernet header match
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
deleted file mode 100644
index 9da50a6..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
+++ /dev/null
@@ -1,15 +0,0 @@
-type: txt
-help: Ethernet protocol for this match
-allowed: echo \
-    all 802.1Q 802_2 802_3 aarp aoe arp atalk \
-    dec ip ipv6 ipx lat localtalk rarp snap x25
-
-val_help: u32:0-65535; Ethernet protocol number
-val_help: txt; Ethernet protocol name
-val_help: all; Any protocol
-val_help: ip; Internet IP (IPv4)
-val_help: _ipv6; Internet IP (IPv6)
-val_help: arp; Address Resolution Protocol
-val_help: atalk; Appletalk
-val_help: ipx; Novell Internet Packet Exchange
-val_help: 802.1Q; 802.1Q VLAN tag
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ether/source/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ether/source/node.def
deleted file mode 100644
index 3094167..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ether/source/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: macaddr
-help: Ethernet source address for this match
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/interface/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/interface/node.def
deleted file mode 100644
index f12c59c..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/interface/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: Interface name for this match
-syntax:expression: exec "[ -f /sys/class/net/$VAR(@)/ifindex ]" ; "Interface must already exist"
-allowed: local -a array
-	 array=( /sys/class/net/* )
-         echo -n ${array[@]##*/}
-
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
deleted file mode 100644
index 8d02285..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv4net
-help: IP destination address for this match
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/destination/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
deleted file mode 100644
index 54eef5b..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on destination port or address
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
deleted file mode 100644
index fc85c5f..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: txt
-help: TCP (or UDP) destination port for this match
-
-val_help: u32:1-65535; Numeric IP port
-val_help: txt; Assigned TCP (or UDP) port name
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
deleted file mode 100644
index 224b002..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-help: Match on Differentiated Services Codepoint (DSCP)
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
-allowed: awk '
-	/^#/ { next }
-	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
-val_help: u32:0-63;Differentiated Services Codepoint (DSCP) value 
-val_help: default; match DSCP (000000)
-val_help: reliability; match; DSCP (000001)
-val_help: throughput; match; DSCP (000010)
-val_help: lowdelay; match; DSCP (000100)
-val_help: priority; match; DSCP (001000)
-val_help: immediate; match; DSCP (010000)
-val_help: flash; match DSCP (011000)
-val_help: flash-override; match DSCP (100000)
-val_help: critical; match DSCP (101000)
-val_help: internet; match; DSCP (110000)
-val_help: network; match; DSCP (111000)
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/node.def
deleted file mode 100644
index 517dc71..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Match IP protocol header
-
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
deleted file mode 100644
index b0ef59f..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-type: txt
-help: Match IP protocol name or number
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)" 
-allowed: awk '
-	/^#/ { next }
-	     { if($1 != "ip") printf "%s ", $1 }' </etc/protocols
-val_help: u32:0-255; IP protocol value
-val_help: icmp; Internet Control Message Protocol
-val_help: igmp; Internet Group Management Protocol
-val_help: ggp; Gateway-Gateway protocol
-val_help: tcp; Transmission Control Protocol
-val_help: egp; Exterior Gateway Protocol
-val_help: udp; User Datagram Protocol
-val_help: gre; General Routing Encapsulation
-val_help: ospf; Open Shortest Path First IGP
-val_help: sctp; Stream Control Transmission Protocol
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
deleted file mode 100644
index 6053344..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv4net
-help: IP source address for this match
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/source/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/source/node.def
deleted file mode 100644
index 4271b94..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/source/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on source port or address
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
deleted file mode 100644
index 6d211d1..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: TCP (or UDP) source port for this match
-
-val_help: u32:1-65535; Numeric IP port
-val_help: txt; Assigned TCP (or UDP) port name
-
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
deleted file mode 100644
index 3fbbc31..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv6net
-help: IP destination address for this match
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
deleted file mode 100644
index 54eef5b..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on destination port or address
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
deleted file mode 100644
index fc85c5f..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: txt
-help: TCP (or UDP) destination port for this match
-
-val_help: u32:1-65535; Numeric IP port
-val_help: txt; Assigned TCP (or UDP) port name
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
deleted file mode 100644
index 224b002..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-help: Match on Differentiated Services Codepoint (DSCP)
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
-allowed: awk '
-	/^#/ { next }
-	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
-val_help: u32:0-63;Differentiated Services Codepoint (DSCP) value 
-val_help: default; match DSCP (000000)
-val_help: reliability; match; DSCP (000001)
-val_help: throughput; match; DSCP (000010)
-val_help: lowdelay; match; DSCP (000100)
-val_help: priority; match; DSCP (001000)
-val_help: immediate; match; DSCP (010000)
-val_help: flash; match DSCP (011000)
-val_help: flash-override; match DSCP (100000)
-val_help: critical; match DSCP (101000)
-val_help: internet; match; DSCP (110000)
-val_help: network; match; DSCP (111000)
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/node.def
deleted file mode 100644
index 8ff47bb..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match IPV6 header
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
deleted file mode 100644
index 355c6a6..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-type: txt
-help: Match IP protocol name or number
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)" 
-allowed: awk '
-	/^#/ { next }
-	     { printf "%s ", $1 }' </etc/protocols
-val_help: u32:0-255; IP protocol value
-val_help: icmp; Internet Control Message Protocol
-val_help: igmp; Internet Group Management Protocol
-val_help: ggp; Gateway-Gateway protocol
-val_help: tcp; Transmission Control Protocol
-val_help: egp; Exterior Gateway Protocol
-val_help: udp; User Datagram Protocol
-val_help: gre; General Routing Encapsulation
-val_help: ospf; Open Shortest Path First IGP
-val_help: sctp; Stream Control Transmission Protocol
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
deleted file mode 100644
index 9071a74..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv6net
-help: IP source address for this match
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
deleted file mode 100644
index 4271b94..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on source port or address
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
deleted file mode 100644
index 6d211d1..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: TCP (or UDP) source port for this match
-
-val_help: u32:1-65535; Numeric IP port
-val_help: txt; Assigned TCP (or UDP) port name
-
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/mark/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/mark/node.def
deleted file mode 100644
index a3a805e..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/mark/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: u32
-help: Match on mark applied by firewall
diff --git a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/vif/node.def b/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/vif/node.def
deleted file mode 100644
index d975074..0000000
--- a/templates/traffic-policy/priority-queue/node.tag/class/node.tag/match/node.tag/vif/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: u32
-help: Virtual Local Area Network (VLAN) ID for this match
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4095; \
-                  "VLAN ID must be between 0 and 4095"
-val_help: u32:0-4095; Virtual Local Area Network (VLAN) tag 
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.def
deleted file mode 100644
index cde128f..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-tag:
-type: txt
-syntax:expression: pattern $VAR(@) "^[^-]" ; "Match queue name cannot start with \"-\""
-help: Class matching rule name
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/description/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/description/node.def
deleted file mode 100644
index 903f260..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/description/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: Description for this match
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/destination/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
deleted file mode 100644
index 92fb9a9..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: macaddr
-help: Ethernet destination address for this match
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/node.def
deleted file mode 100644
index 454c1ed..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Ethernet header match
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
deleted file mode 100644
index ceadb5b..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
+++ /dev/null
@@ -1,14 +0,0 @@
-type: txt
-help: Ethernet protocol for this match
-allowed: echo \
-    all 802.1Q 802_2 802_3 aarp aoe arp atalk \
-    dec ip ipv6 ipx lat localtalk rarp snap x25
-val_help: u32:0-65535; Ethernet protocol number
-val_help: txt; Ethernet protocol name
-val_help: all; Any protocol
-val_help: ip; Internet IP (IPv4)
-val_help: _ipv6; Internet IP (IPv6)
-val_help: arp; Address Resolution Protocol
-val_help: atalk; Appletalk
-val_help: ipx; Novell Internet Packet Exchange
-val_help: 802.1Q; 802.1Q VLAN tag
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/source/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/source/node.def
deleted file mode 100644
index 3094167..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ether/source/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: macaddr
-help: Ethernet source address for this match
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/interface/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/interface/node.def
deleted file mode 100644
index f12c59c..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/interface/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: Interface name for this match
-syntax:expression: exec "[ -f /sys/class/net/$VAR(@)/ifindex ]" ; "Interface must already exist"
-allowed: local -a array
-	 array=( /sys/class/net/* )
-         echo -n ${array[@]##*/}
-
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
deleted file mode 100644
index 8d02285..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv4net
-help: IP destination address for this match
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
deleted file mode 100644
index 54eef5b..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on destination port or address
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
deleted file mode 100644
index fc85c5f..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: txt
-help: TCP (or UDP) destination port for this match
-
-val_help: u32:1-65535; Numeric IP port
-val_help: txt; Assigned TCP (or UDP) port name
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
deleted file mode 100644
index 27d880b..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-help: Match on Differentiated Services Codepoint (DSCP)
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
-allowed: awk '
-	/^#/ { next }
-	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
-val_help:u32:0-63;Differentiated Services Codepoint (DSCP) value 
-val_help:default; match DSCP (000000)
-val_help:reliability; match; DSCP (000001)
-val_help:throughput; match; DSCP (000010)
-val_help:lowdelay; match; DSCP (000100)
-val_help:priority; match; DSCP (001000)
-val_help:immediate; match; DSCP (010000)
-val_help:flash; match DSCP (011000)
-val_help:flash-override; match DSCP (100000)
-val_help:critical; match DSCP (101000)
-val_help:internet; match; DSCP (110000)
-val_help:network; match; DSCP (111000)
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/node.def
deleted file mode 100644
index 517dc71..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Match IP protocol header
-
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
deleted file mode 100644
index 355c6a6..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-type: txt
-help: Match IP protocol name or number
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)" 
-allowed: awk '
-	/^#/ { next }
-	     { printf "%s ", $1 }' </etc/protocols
-val_help: u32:0-255; IP protocol value
-val_help: icmp; Internet Control Message Protocol
-val_help: igmp; Internet Group Management Protocol
-val_help: ggp; Gateway-Gateway protocol
-val_help: tcp; Transmission Control Protocol
-val_help: egp; Exterior Gateway Protocol
-val_help: udp; User Datagram Protocol
-val_help: gre; General Routing Encapsulation
-val_help: ospf; Open Shortest Path First IGP
-val_help: sctp; Stream Control Transmission Protocol
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
deleted file mode 100644
index 6053344..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv4net
-help: IP source address for this match
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/node.def
deleted file mode 100644
index 4271b94..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on source port or address
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
deleted file mode 100644
index 6d211d1..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: TCP (or UDP) source port for this match
-
-val_help: u32:1-65535; Numeric IP port
-val_help: txt; Assigned TCP (or UDP) port name
-
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
deleted file mode 100644
index 3fbbc31..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv6net
-help: IP destination address for this match
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
deleted file mode 100644
index 54eef5b..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on destination port or address
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
deleted file mode 100644
index fc85c5f..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: txt
-help: TCP (or UDP) destination port for this match
-
-val_help: u32:1-65535; Numeric IP port
-val_help: txt; Assigned TCP (or UDP) port name
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
deleted file mode 100644
index 224b002..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-help: Match on Differentiated Services Codepoint (DSCP)
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
-allowed: awk '
-	/^#/ { next }
-	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
-val_help: u32:0-63;Differentiated Services Codepoint (DSCP) value 
-val_help: default; match DSCP (000000)
-val_help: reliability; match; DSCP (000001)
-val_help: throughput; match; DSCP (000010)
-val_help: lowdelay; match; DSCP (000100)
-val_help: priority; match; DSCP (001000)
-val_help: immediate; match; DSCP (010000)
-val_help: flash; match DSCP (011000)
-val_help: flash-override; match DSCP (100000)
-val_help: critical; match DSCP (101000)
-val_help: internet; match; DSCP (110000)
-val_help: network; match; DSCP (111000)
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/node.def
deleted file mode 100644
index 8ff47bb..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match IPV6 header
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
deleted file mode 100644
index 355c6a6..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-type: txt
-help: Match IP protocol name or number
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)" 
-allowed: awk '
-	/^#/ { next }
-	     { printf "%s ", $1 }' </etc/protocols
-val_help: u32:0-255; IP protocol value
-val_help: icmp; Internet Control Message Protocol
-val_help: igmp; Internet Group Management Protocol
-val_help: ggp; Gateway-Gateway protocol
-val_help: tcp; Transmission Control Protocol
-val_help: egp; Exterior Gateway Protocol
-val_help: udp; User Datagram Protocol
-val_help: gre; General Routing Encapsulation
-val_help: ospf; Open Shortest Path First IGP
-val_help: sctp; Stream Control Transmission Protocol
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
deleted file mode 100644
index 9071a74..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv6net
-help: IP source address for this match
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
deleted file mode 100644
index 4271b94..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on source port or address
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
deleted file mode 100644
index 6d211d1..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: TCP (or UDP) source port for this match
-
-val_help: u32:1-65535; Numeric IP port
-val_help: txt; Assigned TCP (or UDP) port name
-
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/mark/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/mark/node.def
deleted file mode 100644
index a3a805e..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/mark/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: u32
-help: Match on mark applied by firewall
diff --git a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/vif/node.def b/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/vif/node.def
deleted file mode 100644
index 6d9f82f..0000000
--- a/templates/traffic-policy/round-robin/node.tag/class/node.tag/match/node.tag/vif/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: u32
-help: Virtual Local Area Network (VLAN) ID for this match
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4095; \
-                   "VLAN ID must be between 0 and 4095"
-val_help: u32:0-4095; Virtual Local Area Network (VLAN) tag 
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.def
deleted file mode 100644
index cde128f..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-tag:
-type: txt
-syntax:expression: pattern $VAR(@) "^[^-]" ; "Match queue name cannot start with \"-\""
-help: Class matching rule name
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/description/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/description/node.def
deleted file mode 100644
index 903f260..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/description/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: Description for this match
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/destination/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
deleted file mode 100644
index 92fb9a9..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: macaddr
-help: Ethernet destination address for this match
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/node.def
deleted file mode 100644
index 454c1ed..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Ethernet header match
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
deleted file mode 100644
index 9da50a6..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
+++ /dev/null
@@ -1,15 +0,0 @@
-type: txt
-help: Ethernet protocol for this match
-allowed: echo \
-    all 802.1Q 802_2 802_3 aarp aoe arp atalk \
-    dec ip ipv6 ipx lat localtalk rarp snap x25
-
-val_help: u32:0-65535; Ethernet protocol number
-val_help: txt; Ethernet protocol name
-val_help: all; Any protocol
-val_help: ip; Internet IP (IPv4)
-val_help: _ipv6; Internet IP (IPv6)
-val_help: arp; Address Resolution Protocol
-val_help: atalk; Appletalk
-val_help: ipx; Novell Internet Packet Exchange
-val_help: 802.1Q; 802.1Q VLAN tag
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/source/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/source/node.def
deleted file mode 100644
index 3094167..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ether/source/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: macaddr
-help: Ethernet source address for this match
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/interface/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/interface/node.def
deleted file mode 100644
index f12c59c..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/interface/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: Interface name for this match
-syntax:expression: exec "[ -f /sys/class/net/$VAR(@)/ifindex ]" ; "Interface must already exist"
-allowed: local -a array
-	 array=( /sys/class/net/* )
-         echo -n ${array[@]##*/}
-
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
deleted file mode 100644
index 8d02285..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv4net
-help: IP destination address for this match
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/destination/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
deleted file mode 100644
index 54eef5b..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on destination port or address
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
deleted file mode 100644
index fc85c5f..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: txt
-help: TCP (or UDP) destination port for this match
-
-val_help: u32:1-65535; Numeric IP port
-val_help: txt; Assigned TCP (or UDP) port name
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
deleted file mode 100644
index 224b002..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-help: Match on Differentiated Services Codepoint (DSCP)
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
-allowed: awk '
-	/^#/ { next }
-	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
-val_help: u32:0-63;Differentiated Services Codepoint (DSCP) value 
-val_help: default; match DSCP (000000)
-val_help: reliability; match; DSCP (000001)
-val_help: throughput; match; DSCP (000010)
-val_help: lowdelay; match; DSCP (000100)
-val_help: priority; match; DSCP (001000)
-val_help: immediate; match; DSCP (010000)
-val_help: flash; match DSCP (011000)
-val_help: flash-override; match DSCP (100000)
-val_help: critical; match DSCP (101000)
-val_help: internet; match; DSCP (110000)
-val_help: network; match; DSCP (111000)
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/node.def
deleted file mode 100644
index 517dc71..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Match IP protocol header
-
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
deleted file mode 100644
index b0ef59f..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-type: txt
-help: Match IP protocol name or number
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)" 
-allowed: awk '
-	/^#/ { next }
-	     { if($1 != "ip") printf "%s ", $1 }' </etc/protocols
-val_help: u32:0-255; IP protocol value
-val_help: icmp; Internet Control Message Protocol
-val_help: igmp; Internet Group Management Protocol
-val_help: ggp; Gateway-Gateway protocol
-val_help: tcp; Transmission Control Protocol
-val_help: egp; Exterior Gateway Protocol
-val_help: udp; User Datagram Protocol
-val_help: gre; General Routing Encapsulation
-val_help: ospf; Open Shortest Path First IGP
-val_help: sctp; Stream Control Transmission Protocol
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
deleted file mode 100644
index 6053344..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv4net
-help: IP source address for this match
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/source/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/source/node.def
deleted file mode 100644
index 4271b94..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/source/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on source port or address
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
deleted file mode 100644
index 6d211d1..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: TCP (or UDP) source port for this match
-
-val_help: u32:1-65535; Numeric IP port
-val_help: txt; Assigned TCP (or UDP) port name
-
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
deleted file mode 100644
index 3fbbc31..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv6net
-help: IP destination address for this match
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
deleted file mode 100644
index 54eef5b..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on destination port or address
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
deleted file mode 100644
index fc85c5f..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: txt
-help: TCP (or UDP) destination port for this match
-
-val_help: u32:1-65535; Numeric IP port
-val_help: txt; Assigned TCP (or UDP) port name
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
deleted file mode 100644
index 224b002..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-help: Match on Differentiated Services Codepoint (DSCP)
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
-allowed: awk '
-	/^#/ { next }
-	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
-val_help: u32:0-63;Differentiated Services Codepoint (DSCP) value 
-val_help: default; match DSCP (000000)
-val_help: reliability; match; DSCP (000001)
-val_help: throughput; match; DSCP (000010)
-val_help: lowdelay; match; DSCP (000100)
-val_help: priority; match; DSCP (001000)
-val_help: immediate; match; DSCP (010000)
-val_help: flash; match DSCP (011000)
-val_help: flash-override; match DSCP (100000)
-val_help: critical; match DSCP (101000)
-val_help: internet; match; DSCP (110000)
-val_help: network; match; DSCP (111000)
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/node.def
deleted file mode 100644
index 8ff47bb..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match IPV6 header
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
deleted file mode 100644
index 355c6a6..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-type: txt
-help: Match IP protocol name or number
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)" 
-allowed: awk '
-	/^#/ { next }
-	     { printf "%s ", $1 }' </etc/protocols
-val_help: u32:0-255; IP protocol value
-val_help: icmp; Internet Control Message Protocol
-val_help: igmp; Internet Group Management Protocol
-val_help: ggp; Gateway-Gateway protocol
-val_help: tcp; Transmission Control Protocol
-val_help: egp; Exterior Gateway Protocol
-val_help: udp; User Datagram Protocol
-val_help: gre; General Routing Encapsulation
-val_help: ospf; Open Shortest Path First IGP
-val_help: sctp; Stream Control Transmission Protocol
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
deleted file mode 100644
index 9071a74..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv6net
-help: IP source address for this match
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
deleted file mode 100644
index 4271b94..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on source port or address
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
deleted file mode 100644
index 6d211d1..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: TCP (or UDP) source port for this match
-
-val_help: u32:1-65535; Numeric IP port
-val_help: txt; Assigned TCP (or UDP) port name
-
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/mark/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/mark/node.def
deleted file mode 100644
index a3a805e..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/mark/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: u32
-help: Match on mark applied by firewall
diff --git a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/vif/node.def b/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/vif/node.def
deleted file mode 100644
index d975074..0000000
--- a/templates/traffic-policy/shaper-hfsc/node.tag/class/node.tag/match/node.tag/vif/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: u32
-help: Virtual Local Area Network (VLAN) ID for this match
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4095; \
-                  "VLAN ID must be between 0 and 4095"
-val_help: u32:0-4095; Virtual Local Area Network (VLAN) tag 
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.def
deleted file mode 100644
index cde128f..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-tag:
-type: txt
-syntax:expression: pattern $VAR(@) "^[^-]" ; "Match queue name cannot start with \"-\""
-help: Class matching rule name
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/description/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/description/node.def
deleted file mode 100644
index 903f260..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/description/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: Description for this match
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/destination/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
deleted file mode 100644
index 92fb9a9..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/destination/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: macaddr
-help: Ethernet destination address for this match
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/node.def
deleted file mode 100644
index 454c1ed..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Ethernet header match
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
deleted file mode 100644
index 9da50a6..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/protocol/node.def
+++ /dev/null
@@ -1,15 +0,0 @@
-type: txt
-help: Ethernet protocol for this match
-allowed: echo \
-    all 802.1Q 802_2 802_3 aarp aoe arp atalk \
-    dec ip ipv6 ipx lat localtalk rarp snap x25
-
-val_help: u32:0-65535; Ethernet protocol number
-val_help: txt; Ethernet protocol name
-val_help: all; Any protocol
-val_help: ip; Internet IP (IPv4)
-val_help: _ipv6; Internet IP (IPv6)
-val_help: arp; Address Resolution Protocol
-val_help: atalk; Appletalk
-val_help: ipx; Novell Internet Packet Exchange
-val_help: 802.1Q; 802.1Q VLAN tag
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/source/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/source/node.def
deleted file mode 100644
index 3094167..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ether/source/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: macaddr
-help: Ethernet source address for this match
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/interface/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/interface/node.def
deleted file mode 100644
index f12c59c..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/interface/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: txt
-help: Interface name for this match
-syntax:expression: exec "[ -f /sys/class/net/$VAR(@)/ifindex ]" ; "Interface must already exist"
-allowed: local -a array
-	 array=( /sys/class/net/* )
-         echo -n ${array[@]##*/}
-
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
deleted file mode 100644
index 8d02285..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv4net
-help: IP destination address for this match
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
deleted file mode 100644
index 54eef5b..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on destination port or address
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
deleted file mode 100644
index fc85c5f..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/destination/port/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: txt
-help: TCP (or UDP) destination port for this match
-
-val_help: u32:1-65535; Numeric IP port
-val_help: txt; Assigned TCP (or UDP) port name
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
deleted file mode 100644
index 224b002..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/dscp/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-help: Match on Differentiated Services Codepoint (DSCP)
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
-allowed: awk '
-	/^#/ { next }
-	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
-val_help: u32:0-63;Differentiated Services Codepoint (DSCP) value 
-val_help: default; match DSCP (000000)
-val_help: reliability; match; DSCP (000001)
-val_help: throughput; match; DSCP (000010)
-val_help: lowdelay; match; DSCP (000100)
-val_help: priority; match; DSCP (001000)
-val_help: immediate; match; DSCP (010000)
-val_help: flash; match DSCP (011000)
-val_help: flash-override; match DSCP (100000)
-val_help: critical; match DSCP (101000)
-val_help: internet; match; DSCP (110000)
-val_help: network; match; DSCP (111000)
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/node.def
deleted file mode 100644
index 517dc71..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Match IP protocol header
-
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
deleted file mode 100644
index b0ef59f..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/protocol/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-type: txt
-help: Match IP protocol name or number
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)" 
-allowed: awk '
-	/^#/ { next }
-	     { if($1 != "ip") printf "%s ", $1 }' </etc/protocols
-val_help: u32:0-255; IP protocol value
-val_help: icmp; Internet Control Message Protocol
-val_help: igmp; Internet Group Management Protocol
-val_help: ggp; Gateway-Gateway protocol
-val_help: tcp; Transmission Control Protocol
-val_help: egp; Exterior Gateway Protocol
-val_help: udp; User Datagram Protocol
-val_help: gre; General Routing Encapsulation
-val_help: ospf; Open Shortest Path First IGP
-val_help: sctp; Stream Control Transmission Protocol
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
deleted file mode 100644
index 6053344..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv4net
-help: IP source address for this match
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/node.def
deleted file mode 100644
index 4271b94..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on source port or address
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
deleted file mode 100644
index 6d211d1..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ip/source/port/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: TCP (or UDP) source port for this match
-
-val_help: u32:1-65535; Numeric IP port
-val_help: txt; Assigned TCP (or UDP) port name
-
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
deleted file mode 100644
index 3fbbc31..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv6net
-help: IP destination address for this match
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
deleted file mode 100644
index 54eef5b..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on destination port or address
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
deleted file mode 100644
index fc85c5f..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/destination/port/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: txt
-help: TCP (or UDP) destination port for this match
-
-val_help: u32:1-65535; Numeric IP port
-val_help: txt; Assigned TCP (or UDP) port name
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
deleted file mode 100644
index 224b002..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/dscp/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-help: Match on Differentiated Services Codepoint (DSCP)
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --dscp $VAR(@)"
-allowed: awk '
-	/^#/ { next }
-	     { printf "%s ", $2 }' </etc/iproute2/rt_dsfield
-val_help: u32:0-63;Differentiated Services Codepoint (DSCP) value 
-val_help: default; match DSCP (000000)
-val_help: reliability; match; DSCP (000001)
-val_help: throughput; match; DSCP (000010)
-val_help: lowdelay; match; DSCP (000100)
-val_help: priority; match; DSCP (001000)
-val_help: immediate; match; DSCP (010000)
-val_help: flash; match DSCP (011000)
-val_help: flash-override; match DSCP (100000)
-val_help: critical; match DSCP (101000)
-val_help: internet; match; DSCP (110000)
-val_help: network; match; DSCP (111000)
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/node.def
deleted file mode 100644
index 8ff47bb..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match IPV6 header
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
deleted file mode 100644
index 355c6a6..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/protocol/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-type: txt
-help: Match IP protocol name or number
-syntax:expression: exec "/opt/vyatta/sbin/vyatta-qos-util.pl --protocol $VAR(@)" 
-allowed: awk '
-	/^#/ { next }
-	     { printf "%s ", $1 }' </etc/protocols
-val_help: u32:0-255; IP protocol value
-val_help: icmp; Internet Control Message Protocol
-val_help: igmp; Internet Group Management Protocol
-val_help: ggp; Gateway-Gateway protocol
-val_help: tcp; Transmission Control Protocol
-val_help: egp; Exterior Gateway Protocol
-val_help: udp; User Datagram Protocol
-val_help: gre; General Routing Encapsulation
-val_help: ospf; Open Shortest Path First IGP
-val_help: sctp; Stream Control Transmission Protocol
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
deleted file mode 100644
index 9071a74..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/address/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: ipv6net
-help: IP source address for this match
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
deleted file mode 100644
index 4271b94..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Match on source port or address
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
deleted file mode 100644
index 6d211d1..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/ipv6/source/port/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: txt
-help: TCP (or UDP) source port for this match
-
-val_help: u32:1-65535; Numeric IP port
-val_help: txt; Assigned TCP (or UDP) port name
-
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/mark/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/mark/node.def
deleted file mode 100644
index a3a805e..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/mark/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: u32
-help: Match on mark applied by firewall
diff --git a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/vif/node.def b/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/vif/node.def
deleted file mode 100644
index d975074..0000000
--- a/templates/traffic-policy/shaper/node.tag/class/node.tag/match/node.tag/vif/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: u32
-help: Virtual Local Area Network (VLAN) ID for this match
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4095; \
-                  "VLAN ID must be between 0 and 4095"
-val_help: u32:0-4095; Virtual Local Area Network (VLAN) tag 
-- 
cgit v1.2.3