summaryrefslogtreecommitdiff
path: root/templates/interfaces/adsl
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-03-25 14:15:44 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-03-25 14:15:44 -0700
commiteedd04171ff3c6017e52830e8e07ec437e1c6663 (patch)
tree2e6be92570d53c1e134c806e3de7e0477b11c017 /templates/interfaces/adsl
parent82b2f6abc7b3b5e3164675c28a27506b39eeb9a7 (diff)
downloadvyatta-cfg-quagga-eedd04171ff3c6017e52830e8e07ec437e1c6663.tar.gz
vyatta-cfg-quagga-eedd04171ff3c6017e52830e8e07ec437e1c6663.zip
Generate interface templates as part of build
Rather than 100's of copies of the same template, use the same process as the firewall module to generate the templates. For this, the are meta-templates in interface-templates directory which get processed and $IFNAME is replaced by the appropriate CLI syntax to refer back to the directory name. Changing a quagga template in most cases can be done by fixing the meta-template.
Diffstat (limited to 'templates/interfaces/adsl')
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/node.def1
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/md5/key-id/node.def23
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def9
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/md5/key-id/node.tag/node.def1
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/md5/node.def11
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/node.def2
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/plaintext-password/node.def23
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/bandwidth/node.def16
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/cost/node.def11
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/dead-interval/node.def12
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/hello-interval/node.def12
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/mtu-ignore/node.def10
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/network/node.def20
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/node.def2
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/priority/node.def12
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/retransmit-interval/node.def12
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/transmit-delay/node.def12
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/md5/node.def5
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/md5/node.tag/node.def1
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/md5/node.tag/password/node.def23
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/node.def1
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/plaintext-password/node.def20
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/node.def2
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/split-horizon/disable/node.def13
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/split-horizon/node.def10
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/split-horizon/poison-reverse/node.def13
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/node.def1
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.def23
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def9
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.tag/node.def1
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/node.def11
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/node.def2
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/plaintext-password/node.def23
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/bandwidth/node.def16
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/cost/node.def11
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/dead-interval/node.def12
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/hello-interval/node.def12
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/mtu-ignore/node.def10
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/network/node.def20
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/node.def2
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/priority/node.def12
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/retransmit-interval/node.def12
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/transmit-delay/node.def12
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.def5
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.tag/node.def1
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.tag/password/node.def23
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/node.def1
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/plaintext-password/node.def20
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/node.def2
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/disable/node.def13
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/node.def10
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/poison-reverse/node.def13
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/node.def1
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.def23
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def9
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def1
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/node.def11
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/node.def2
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/plaintext-password/node.def23
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/bandwidth/node.def16
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/cost/node.def11
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/dead-interval/node.def12
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/hello-interval/node.def12
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/mtu-ignore/node.def10
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/network/node.def20
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/node.def2
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/priority/node.def12
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/retransmit-interval/node.def12
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/transmit-delay/node.def12
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.def5
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.tag/node.def1
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.tag/password/node.def23
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/node.def1
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/plaintext-password/node.def20
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/node.def2
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/disable/node.def13
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/node.def1
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/poison-reverse/node.def13
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/node.def1
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def23
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def9
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def1
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def11
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/node.def2
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def23
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def16
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/cost/node.def11
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def12
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def12
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def10
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/network/node.def20
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/node.def2
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/priority/node.def12
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def12
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def12
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.def5
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/node.def1
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def23
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/node.def1
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def20
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/node.def2
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def13
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/node.def1
-rw-r--r--templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def13
104 files changed, 0 insertions, 1090 deletions
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/node.def
deleted file mode 100644
index 624c74dc..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set interface IPv4 parameters
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/md5/key-id/node.def
deleted file mode 100644
index 21b892df..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/md5/key-id/node.def
+++ /dev/null
@@ -1,23 +0,0 @@
-tag:
-type: u32
-help: Set MD5 key id
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)"
-commit:expression: $VAR(md5-key/) != ""; \
- "Must add the md5-key for key-id $VAR(@)"
-
-delete:expression: "touch /tmp/ospf-md5.$PPID"
-
-end:expression: "\
- if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \
- vyatta-vtysh -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../../../@) \" \
- -c \"no ip ospf message-digest-key $VAR(@)\"; \
- rm /tmp/ospf-md5.$PPID; \
- else \
- vyatta-vtysh -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../../../@) \" \
- -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \
- fi; "
-
-comp_help: possible completions:
- <1-255> Set the key id
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
deleted file mode 100644
index c985099d..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: txt
-help: Set MD5 key
-syntax:expression: exec " \
- if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then \
- echo MD5 key must be 16 characters or less ; \
- exit 1 ; \
- fi ; "
-comp_help: possible completions:
- <text> MD5 Key (16 characters or less)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/md5/key-id/node.tag/node.def
deleted file mode 100644
index d14a2583..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/md5/key-id/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set md5 key
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/md5/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/md5/node.def
deleted file mode 100644
index 1b639731..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/md5/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-help: Set MD5 key id
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../../@) \" \
- -c \"no ip ospf authentication \" \
- -c \"ip ospf authentication message-digest\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../../@) \" \
- -c \"no ip ospf authentication \"; "
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/node.def
deleted file mode 100644
index ff352a01..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set OSPF interface authentication
-
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/plaintext-password/node.def
deleted file mode 100644
index ba852378..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,23 +0,0 @@
-type: txt
-help: Set plain text password
-syntax:expression: exec " \
- if [ `echo -n '$VAR(@)' | wc -c` -gt 8 ]; then \
- echo Password must be 8 characters or less ; \
- exit 1 ; \
- fi ; "
-
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../../@) \" \
- -c \"no ip ospf authentication \" \
- -c \"ip ospf authentication \" \
- -c \"ip ospf authentication-key $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../../@) \" \
- -c \"no ip ospf authentication \" \
- -c \"no ip ospf authentication-key \"; "
-
-comp_help: possible completions:
- <text> Plain text password (8 characters or less)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/bandwidth/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/bandwidth/node.def
deleted file mode 100644
index 6cc30c48..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/bandwidth/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-type: u32
-help: Set bandwidth in kilobits/sec
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \
- "Must be between 1-10000000"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../@) \" \
- -c \"bandwidth $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../@) \" \
- -c \"no bandwidth $VAR(@) \"; "
-
-comp_help: possible completions:
- <1-10000000> Set bandwidth in kilobits/sec (for calculating OSPF cost)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/cost/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/cost/node.def
deleted file mode 100644
index 6aef4806..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/cost/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-type: u32
-help: Set interface cost
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vyatta-vtysh -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@)\" \
- -c \"ip ospf cost $VAR(@) \"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@)\" \
- -c \"no ip ospf cost \"; "
-comp_help: possible completions:
- <1-65535> Set Cost
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/dead-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/dead-interval/node.def
deleted file mode 100644
index 04d9d42e..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/dead-interval/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: u32
-help: Set interval after which a neighbor is declared dead
-default: 40
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \
- -c \"ip ospf dead-interval $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \
- -c \"no ip ospf dead-interval \"; "
-comp_help: possible completions:
- <1-65535> Seconds (default 40)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/hello-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/hello-interval/node.def
deleted file mode 100644
index 1d757fa3..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/hello-interval/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: u32
-help: Set interval between HELLO packets
-default: 10
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../@) \" \
- -c \"ip ospf hello-interval $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../@) \" \
- -c \"no ip ospf hello-interval \"; "
-comp_help: possible completions:
- <1-65535> Seconds (default 10)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/mtu-ignore/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/mtu-ignore/node.def
deleted file mode 100644
index 313359f6..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/mtu-ignore/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-help: Disable Maximum Transmission Unit (MTU) mismatch detection
-create:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@)\" \
- -c \"ip ospf mtu-ignore\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@)\" \
- -c \"no ip ospf mtu-ignore\"; "
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/network/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/network/node.def
deleted file mode 100644
index efff9720..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/network/node.def
+++ /dev/null
@@ -1,20 +0,0 @@
-type: txt
-help: Set network type
-syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \
- "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)"
-
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@) \" \
- -c \"ip ospf network $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../@) \" \
- -c \"no ip ospf network \"; "
-
-comp_help: possible completions:
- broadcast Set broadcast network type
- non-broadcast Set non-broadcast network type
- point-to-multipoint Set point-to-multipoint network type
- point-to-point Set point-to-point network type
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/node.def
deleted file mode 100644
index 31980774..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set Open Shortest Path First (OSPF) parameters for specified interface
-create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/priority/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/priority/node.def
deleted file mode 100644
index b66d12cb..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/priority/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: u32
-help: Set router priority
-default: 1
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \
- -c \"ip ospf priority $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \
- -c \"no ip ospf priority \"; "
-comp_help: possible completions:
- <0-255> Priority (default 1)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/retransmit-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/retransmit-interval/node.def
deleted file mode 100644
index 5cfaca50..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/retransmit-interval/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: u32
-help: Set interval between retransmitting lost link state advertisements
-default: 5
-syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \
- -c \"ip ospf retransmit-interval $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \
- -c \"no ip ospf retransmit-interval \"; "
-comp_help: possible completions:
- <3-65535> Seconds (default 5)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/transmit-delay/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/transmit-delay/node.def
deleted file mode 100644
index 8140597a..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/transmit-delay/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: u32
-help: Set link state transmit delay
-default: 1
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \
- -c \"ip ospf transmit-delay $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \
- -c \"no ip ospf transmit-delay \"; "
-comp_help: possible completions:
- <1-65535> Seconds (default 1)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/md5/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/md5/node.def
deleted file mode 100644
index e1819c01..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/md5/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-tag:
-type: u32
-help: Set MD5 authentication key ID
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between 1 and 255"
-
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/md5/node.tag/node.def
deleted file mode 100644
index 488acd8c..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/md5/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication password
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/md5/node.tag/password/node.def
deleted file mode 100644
index 38c9594b..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/md5/node.tag/password/node.def
+++ /dev/null
@@ -1,23 +0,0 @@
-type: txt
-help: Set authentication password
-syntax:expression: exec " \
- if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then \
- echo MD5 key must be 16 characters or less ; \
- exit 1 ; \
- fi ; "
-
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../../../@)\" \
- -c \"ip rip authentication mode md5\" \
- -c \"ip rip authentication key-chain $VAR(../../../../../../../@)-rip\" \
- -c \"key chain $VAR(../../../../../../../@)-rip\" -c \"key $VAR(../@)\" \
- -c \"key-string $VAR(@)\" "
-
-delete:expression: "vyatta-vtysh --noerror \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../../../@)\" \
- -c \"no ip rip authentication mode md5\" \
- -c \"no ip rip authentication key-chain $VAR(../../../../../../../@)-rip\" \
- -c \"no key chain $VAR(../../../../../../../@)-rip\" "
-
-comp_help: possible completions:
- <text> MD5 Key (16 characters or less)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/node.def
deleted file mode 100644
index 8756de35..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication method
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/plaintext-password/node.def
deleted file mode 100644
index bf3c69ef..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,20 +0,0 @@
-type: txt
-help: Set plain text password
-syntax:expression: exec " \
- if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then \
- echo Password must be 16 characters or less ; \
- exit 1 ; \
- fi ; "
-
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../../@)\" \
- -c \"ip rip authentication mode text\" \
- -c \"ip rip authentication string $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../../@)\" \
- -c \"no ip rip authentication mode\" \
- -c \"no ip rip authentication string $VAR(@)\"; "
-
-comp_help: possible completions:
- <text> Password (16 characters or less)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/node.def
deleted file mode 100644
index 16241372..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set Routing Information Protocol (RIP) parameters for specified interface
-create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/split-horizon/disable/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/split-horizon/disable/node.def
deleted file mode 100644
index 1ca1dd11..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/split-horizon/disable/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-help: Disable split horizon on specified interface
-create:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../@) \" \
- -c \"no ip rip split-horizon \" "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../@) \" \
- -c \"ip rip split-horizon \" "
-
-commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for PPPoE interface $VAR(../../../../@)"
-
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/split-horizon/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/split-horizon/node.def
deleted file mode 100644
index 0354d19b..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/split-horizon/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-help: Enable split horizon on this interface
-update:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../@) \" \
- -c \"ip rip split-horizon \" "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../@) \" \
- -c \"no ip rip split-horizon \" "
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/split-horizon/poison-reverse/node.def
deleted file mode 100644
index ceb42582..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/split-horizon/poison-reverse/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-help: Enable split-horizon with poison reverse
-create:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../../@) \" \
- -c \"ip rip split-horizon poisoned-reverse \" "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../../@) \" \
- -c \"no ip rip split-horizon \" \
- -c \"ip rip split-horizon \" "
-commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for PPPoE interface $VAR(../../../../@)"
-
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/node.def
deleted file mode 100644
index 624c74dc..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set interface IPv4 parameters
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.def
deleted file mode 100644
index 21b892df..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.def
+++ /dev/null
@@ -1,23 +0,0 @@
-tag:
-type: u32
-help: Set MD5 key id
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)"
-commit:expression: $VAR(md5-key/) != ""; \
- "Must add the md5-key for key-id $VAR(@)"
-
-delete:expression: "touch /tmp/ospf-md5.$PPID"
-
-end:expression: "\
- if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \
- vyatta-vtysh -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../../../@) \" \
- -c \"no ip ospf message-digest-key $VAR(@)\"; \
- rm /tmp/ospf-md5.$PPID; \
- else \
- vyatta-vtysh -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../../../@) \" \
- -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \
- fi; "
-
-comp_help: possible completions:
- <1-255> Set the key id
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
deleted file mode 100644
index c985099d..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: txt
-help: Set MD5 key
-syntax:expression: exec " \
- if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then \
- echo MD5 key must be 16 characters or less ; \
- exit 1 ; \
- fi ; "
-comp_help: possible completions:
- <text> MD5 Key (16 characters or less)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.tag/node.def
deleted file mode 100644
index d14a2583..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/key-id/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set md5 key
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/node.def
deleted file mode 100644
index 1b639731..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/md5/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-help: Set MD5 key id
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../../@) \" \
- -c \"no ip ospf authentication \" \
- -c \"ip ospf authentication message-digest\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../../@) \" \
- -c \"no ip ospf authentication \"; "
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/node.def
deleted file mode 100644
index ff352a01..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set OSPF interface authentication
-
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/plaintext-password/node.def
deleted file mode 100644
index ba852378..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,23 +0,0 @@
-type: txt
-help: Set plain text password
-syntax:expression: exec " \
- if [ `echo -n '$VAR(@)' | wc -c` -gt 8 ]; then \
- echo Password must be 8 characters or less ; \
- exit 1 ; \
- fi ; "
-
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../../@) \" \
- -c \"no ip ospf authentication \" \
- -c \"ip ospf authentication \" \
- -c \"ip ospf authentication-key $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../../@) \" \
- -c \"no ip ospf authentication \" \
- -c \"no ip ospf authentication-key \"; "
-
-comp_help: possible completions:
- <text> Plain text password (8 characters or less)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/bandwidth/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/bandwidth/node.def
deleted file mode 100644
index 6cc30c48..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/bandwidth/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-type: u32
-help: Set bandwidth in kilobits/sec
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \
- "Must be between 1-10000000"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../@) \" \
- -c \"bandwidth $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../@) \" \
- -c \"no bandwidth $VAR(@) \"; "
-
-comp_help: possible completions:
- <1-10000000> Set bandwidth in kilobits/sec (for calculating OSPF cost)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/cost/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/cost/node.def
deleted file mode 100644
index 6aef4806..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/cost/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-type: u32
-help: Set interface cost
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vyatta-vtysh -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@)\" \
- -c \"ip ospf cost $VAR(@) \"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@)\" \
- -c \"no ip ospf cost \"; "
-comp_help: possible completions:
- <1-65535> Set Cost
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/dead-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/dead-interval/node.def
deleted file mode 100644
index 04d9d42e..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/dead-interval/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: u32
-help: Set interval after which a neighbor is declared dead
-default: 40
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \
- -c \"ip ospf dead-interval $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \
- -c \"no ip ospf dead-interval \"; "
-comp_help: possible completions:
- <1-65535> Seconds (default 40)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/hello-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/hello-interval/node.def
deleted file mode 100644
index 1d757fa3..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/hello-interval/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: u32
-help: Set interval between HELLO packets
-default: 10
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../@) \" \
- -c \"ip ospf hello-interval $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../@) \" \
- -c \"no ip ospf hello-interval \"; "
-comp_help: possible completions:
- <1-65535> Seconds (default 10)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/mtu-ignore/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/mtu-ignore/node.def
deleted file mode 100644
index 313359f6..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/mtu-ignore/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-help: Disable Maximum Transmission Unit (MTU) mismatch detection
-create:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@)\" \
- -c \"ip ospf mtu-ignore\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@)\" \
- -c \"no ip ospf mtu-ignore\"; "
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/network/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/network/node.def
deleted file mode 100644
index efff9720..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/network/node.def
+++ /dev/null
@@ -1,20 +0,0 @@
-type: txt
-help: Set network type
-syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \
- "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)"
-
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@) \" \
- -c \"ip ospf network $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../@) \" \
- -c \"no ip ospf network \"; "
-
-comp_help: possible completions:
- broadcast Set broadcast network type
- non-broadcast Set non-broadcast network type
- point-to-multipoint Set point-to-multipoint network type
- point-to-point Set point-to-point network type
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/node.def
deleted file mode 100644
index 31980774..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set Open Shortest Path First (OSPF) parameters for specified interface
-create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/priority/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/priority/node.def
deleted file mode 100644
index b66d12cb..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/priority/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: u32
-help: Set router priority
-default: 1
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \
- -c \"ip ospf priority $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \
- -c \"no ip ospf priority \"; "
-comp_help: possible completions:
- <0-255> Priority (default 1)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/retransmit-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/retransmit-interval/node.def
deleted file mode 100644
index 5cfaca50..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/retransmit-interval/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: u32
-help: Set interval between retransmitting lost link state advertisements
-default: 5
-syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \
- -c \"ip ospf retransmit-interval $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \
- -c \"no ip ospf retransmit-interval \"; "
-comp_help: possible completions:
- <3-65535> Seconds (default 5)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/transmit-delay/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/transmit-delay/node.def
deleted file mode 100644
index 8140597a..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/ospf/transmit-delay/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: u32
-help: Set link state transmit delay
-default: 1
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \
- -c \"ip ospf transmit-delay $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../@)\" \
- -c \"no ip ospf transmit-delay \"; "
-comp_help: possible completions:
- <1-65535> Seconds (default 1)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.def
deleted file mode 100644
index e1819c01..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-tag:
-type: u32
-help: Set MD5 authentication key ID
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between 1 and 255"
-
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.tag/node.def
deleted file mode 100644
index 488acd8c..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication password
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.tag/password/node.def
deleted file mode 100644
index 38c9594b..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/md5/node.tag/password/node.def
+++ /dev/null
@@ -1,23 +0,0 @@
-type: txt
-help: Set authentication password
-syntax:expression: exec " \
- if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then \
- echo MD5 key must be 16 characters or less ; \
- exit 1 ; \
- fi ; "
-
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../../../@)\" \
- -c \"ip rip authentication mode md5\" \
- -c \"ip rip authentication key-chain $VAR(../../../../../../../@)-rip\" \
- -c \"key chain $VAR(../../../../../../../@)-rip\" -c \"key $VAR(../@)\" \
- -c \"key-string $VAR(@)\" "
-
-delete:expression: "vyatta-vtysh --noerror \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../../../@)\" \
- -c \"no ip rip authentication mode md5\" \
- -c \"no ip rip authentication key-chain $VAR(../../../../../../../@)-rip\" \
- -c \"no key chain $VAR(../../../../../../../@)-rip\" "
-
-comp_help: possible completions:
- <text> MD5 Key (16 characters or less)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/node.def
deleted file mode 100644
index 8756de35..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication method
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/plaintext-password/node.def
deleted file mode 100644
index bf3c69ef..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,20 +0,0 @@
-type: txt
-help: Set plain text password
-syntax:expression: exec " \
- if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then \
- echo Password must be 16 characters or less ; \
- exit 1 ; \
- fi ; "
-
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../../@)\" \
- -c \"ip rip authentication mode text\" \
- -c \"ip rip authentication string $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface $VAR(../../../../../../@)\" \
- -c \"no ip rip authentication mode\" \
- -c \"no ip rip authentication string $VAR(@)\"; "
-
-comp_help: possible completions:
- <text> Password (16 characters or less)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/node.def
deleted file mode 100644
index 16241372..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set Routing Information Protocol (RIP) parameters for specified interface
-create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/disable/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/disable/node.def
deleted file mode 100644
index 1ca1dd11..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/disable/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-help: Disable split horizon on specified interface
-create:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../@) \" \
- -c \"no ip rip split-horizon \" "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../@) \" \
- -c \"ip rip split-horizon \" "
-
-commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for PPPoE interface $VAR(../../../../@)"
-
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/node.def
deleted file mode 100644
index 0354d19b..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-help: Enable split horizon on this interface
-update:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../@) \" \
- -c \"ip rip split-horizon \" "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../@) \" \
- -c \"no ip rip split-horizon \" "
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/poison-reverse/node.def
deleted file mode 100644
index ceb42582..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/ip/rip/split-horizon/poison-reverse/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-help: Enable split-horizon with poison reverse
-create:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../../@) \" \
- -c \"ip rip split-horizon poisoned-reverse \" "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../../@) \" \
- -c \"no ip rip split-horizon \" \
- -c \"ip rip split-horizon \" "
-commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for PPPoE interface $VAR(../../../../@)"
-
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/node.def
deleted file mode 100644
index 624c74dc..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set interface IPv4 parameters
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.def
deleted file mode 100644
index ae3f6c1d..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.def
+++ /dev/null
@@ -1,23 +0,0 @@
-tag:
-type: u32
-help: Set MD5 key id
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)"
-commit:expression: $VAR(md5-key/) != ""; \
- "Must add the md5-key for key-id $VAR(@)"
-
-delete:expression: "touch /tmp/ospf-md5.$PPID"
-
-end:expression: "\
- if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \
- vyatta-vtysh -c \"configure terminal\" \
- -c \"interface pppoa$VAR(../../../../../@) \" \
- -c \"no ip ospf message-digest-key $VAR(@)\"; \
- rm /tmp/ospf-md5.$PPID; \
- else \
- vyatta-vtysh -c \"configure terminal\" \
- -c \"interface pppoa$VAR(../../../../../@) \" \
- -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \
- fi; "
-
-comp_help: possible completions:
- <1-255> Set the key id
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
deleted file mode 100644
index c985099d..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: txt
-help: Set MD5 key
-syntax:expression: exec " \
- if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then \
- echo MD5 key must be 16 characters or less ; \
- exit 1 ; \
- fi ; "
-comp_help: possible completions:
- <text> MD5 Key (16 characters or less)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def
deleted file mode 100644
index d14a2583..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set md5 key
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/node.def
deleted file mode 100644
index f64cd2d2..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/md5/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-help: Set MD5 key id
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface pppoa$VAR(../../../../@) \" \
- -c \"no ip ospf authentication \" \
- -c \"ip ospf authentication message-digest\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface pppoa$VAR(../../../../@) \" \
- -c \"no ip ospf authentication \"; "
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/node.def
deleted file mode 100644
index ff352a01..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set OSPF interface authentication
-
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/plaintext-password/node.def
deleted file mode 100644
index e16bde97..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,23 +0,0 @@
-type: txt
-help: Set plain text password
-syntax:expression: exec " \
- if [ `echo -n '$VAR(@)' | wc -c` -gt 8 ]; then \
- echo Password must be 8 characters or less ; \
- exit 1 ; \
- fi ; "
-
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface pppoa$VAR(../../../../@) \" \
- -c \"no ip ospf authentication \" \
- -c \"ip ospf authentication \" \
- -c \"ip ospf authentication-key $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface pppoa$VAR(../../../../@) \" \
- -c \"no ip ospf authentication \" \
- -c \"no ip ospf authentication-key \"; "
-
-comp_help: possible completions:
- <text> Plain text password (8 characters or less)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/bandwidth/node.def
deleted file mode 100644
index 345283d8..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/bandwidth/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-type: u32
-help: Set bandwidth in kilobits/sec
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \
- "Must be between 1-10000000"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface pppoa$VAR(../../../@) \" \
- -c \"bandwidth $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface pppoa$VAR(../../../@) \" \
- -c \"no bandwidth $VAR(@) \"; "
-
-comp_help: possible completions:
- <1-10000000> Set bandwidth in kilobits/sec (for calculating OSPF cost)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/cost/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/cost/node.def
deleted file mode 100644
index 03524fac..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/cost/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-type: u32
-help: Set interface cost
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vyatta-vtysh -c \"configure terminal\" \
- -c \"interface pppoa$VAR(../../../@)\" \
- -c \"ip ospf cost $VAR(@) \"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
- -c \"interface pppoa$VAR(../../../@)\" \
- -c \"no ip ospf cost \"; "
-comp_help: possible completions:
- <1-65535> Set Cost
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/dead-interval/node.def
deleted file mode 100644
index c68141c6..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/dead-interval/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: u32
-help: Set interval after which a neighbor is declared dead
-default: 40
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \
- -c \"ip ospf dead-interval $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \
- -c \"no ip ospf dead-interval \"; "
-comp_help: possible completions:
- <1-65535> Seconds (default 40)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/hello-interval/node.def
deleted file mode 100644
index b48d3113..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/hello-interval/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: u32
-help: Set interval between HELLO packets
-default: 10
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@) \" \
- -c \"ip ospf hello-interval $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@) \" \
- -c \"no ip ospf hello-interval \"; "
-comp_help: possible completions:
- <1-65535> Seconds (default 10)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/mtu-ignore/node.def
deleted file mode 100644
index 2876bb46..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/mtu-ignore/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-help: Disable Maximum Transmission Unit (MTU) mismatch detection
-create:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface pppoa$VAR(../../../@)\" \
- -c \"ip ospf mtu-ignore\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface pppoa$VAR(../../../@)\" \
- -c \"no ip ospf mtu-ignore\"; "
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/network/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/network/node.def
deleted file mode 100644
index 9d401257..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/network/node.def
+++ /dev/null
@@ -1,20 +0,0 @@
-type: txt
-help: Set network type
-syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \
- "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)"
-
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface pppoa$VAR(../../../@) \" \
- -c \"ip ospf network $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface pppoa$VAR(../../../@) \" \
- -c \"no ip ospf network \"; "
-
-comp_help: possible completions:
- broadcast Set broadcast network type
- non-broadcast Set non-broadcast network type
- point-to-multipoint Set point-to-multipoint network type
- point-to-point Set point-to-point network type
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/node.def
deleted file mode 100644
index 31980774..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set Open Shortest Path First (OSPF) parameters for specified interface
-create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/priority/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/priority/node.def
deleted file mode 100644
index c5ab3dd5..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/priority/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: u32
-help: Set router priority
-default: 1
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \
- -c \"ip ospf priority $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \
- -c \"no ip ospf priority \"; "
-comp_help: possible completions:
- <0-255> Priority (default 1)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/retransmit-interval/node.def
deleted file mode 100644
index 3e4b9318..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/retransmit-interval/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: u32
-help: Set interval between retransmitting lost link state advertisements
-default: 5
-syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \
- -c \"ip ospf retransmit-interval $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \
- -c \"no ip ospf retransmit-interval \"; "
-comp_help: possible completions:
- <3-65535> Seconds (default 5)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/transmit-delay/node.def
deleted file mode 100644
index 7da7bcb4..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/ospf/transmit-delay/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: u32
-help: Set link state transmit delay
-default: 1
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \
- -c \"ip ospf transmit-delay $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoa$VAR(../../../@)\" \
- -c \"no ip ospf transmit-delay \"; "
-comp_help: possible completions:
- <1-65535> Seconds (default 1)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.def
deleted file mode 100644
index e1819c01..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-tag:
-type: u32
-help: Set MD5 authentication key ID
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between 1 and 255"
-
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.tag/node.def
deleted file mode 100644
index 488acd8c..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication password
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
deleted file mode 100644
index e905dc42..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
+++ /dev/null
@@ -1,23 +0,0 @@
-type: txt
-help: Set authentication password
-syntax:expression: exec " \
- if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then \
- echo MD5 key must be 16 characters or less ; \
- exit 1 ; \
- fi ; "
-
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoa$VAR(../../../../../@)\" \
- -c \"ip rip authentication mode md5\" \
- -c \"ip rip authentication key-chain pppoa$VAR(../../../../../@)-rip\" \
- -c \"key chain pppoa$VAR(../../../../../@)-rip\" -c \"key $VAR(../@)\" \
- -c \"key-string $VAR(@)\" "
-
-delete:expression: "vyatta-vtysh --noerror \
- -c \"configure terminal\" -c \"interface pppoa$VAR(../../../../../@)\" \
- -c \"no ip rip authentication mode md5\" \
- -c \"no ip rip authentication key-chain pppoa$VAR(../../../../../@)-rip\" \
- -c \"no key chain pppoa$VAR(../../../../../@)-rip\" "
-
-comp_help: possible completions:
- <text> MD5 Key (16 characters or less)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/node.def
deleted file mode 100644
index 8756de35..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication method
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/plaintext-password/node.def
deleted file mode 100644
index 66bd73b8..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,20 +0,0 @@
-type: txt
-help: Set plain text password
-syntax:expression: exec " \
- if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then \
- echo Password must be 16 characters or less ; \
- exit 1 ; \
- fi ; "
-
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoa$VAR(../../../../@)\" \
- -c \"ip rip authentication mode text\" \
- -c \"ip rip authentication string $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoa$VAR(../../../../@)\" \
- -c \"no ip rip authentication mode\" \
- -c \"no ip rip authentication string $VAR(@)\"; "
-
-comp_help: possible completions:
- <text> Password (16 characters or less)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/node.def
deleted file mode 100644
index 16241372..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set Routing Information Protocol (RIP) parameters for specified interface
-create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/disable/node.def
deleted file mode 100644
index 1ca1dd11..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/disable/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-help: Disable split horizon on specified interface
-create:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../@) \" \
- -c \"no ip rip split-horizon \" "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../@) \" \
- -c \"ip rip split-horizon \" "
-
-commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for PPPoE interface $VAR(../../../../@)"
-
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/node.def
deleted file mode 100644
index ba39b616..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set to control split horizon parameters on this interface
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/poison-reverse/node.def
deleted file mode 100644
index 06161cdd..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-help: Enable split-horizon with poison reverse
-create:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface pppoa$VAR(../../../../@) \" \
- -c \"ip rip split-horizon poisoned-reverse \" "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface pppoa$VAR(../../../../@) \" \
- -c \"no ip rip split-horizon \" \
- -c \"ip rip split-horizon \" "
-commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for PPPoE interface $VAR(../../../../@)"
-
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/node.def
deleted file mode 100644
index 624c74dc..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set interface IPv4 parameters
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def
deleted file mode 100644
index 1b70a938..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def
+++ /dev/null
@@ -1,23 +0,0 @@
-tag:
-type: u32
-help: Set MD5 key id
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)"
-commit:expression: $VAR(md5-key/) != ""; \
- "Must add the md5-key for key-id $VAR(@)"
-
-delete:expression: "touch /tmp/ospf-md5.$PPID"
-
-end:expression: "\
- if [ -f \"/tmp/ospf-md5.$PPID\" ]; then \
- vyatta-vtysh -c \"configure terminal\" \
- -c \"interface pppoe$VAR(../../../../../@) \" \
- -c \"no ip ospf message-digest-key $VAR(@)\"; \
- rm /tmp/ospf-md5.$PPID; \
- else \
- vyatta-vtysh -c \"configure terminal\" \
- -c \"interface pppoe$VAR(../../../../../@) \" \
- -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\"; \
- fi; "
-
-comp_help: possible completions:
- <1-255> Set the key id
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
deleted file mode 100644
index c985099d..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: txt
-help: Set MD5 key
-syntax:expression: exec " \
- if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then \
- echo MD5 key must be 16 characters or less ; \
- exit 1 ; \
- fi ; "
-comp_help: possible completions:
- <text> MD5 Key (16 characters or less)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def
deleted file mode 100644
index d14a2583..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set md5 key
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def
deleted file mode 100644
index 2814e66b..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-help: Set MD5 key id
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface pppoe$VAR(../../../../@) \" \
- -c \"no ip ospf authentication \" \
- -c \"ip ospf authentication message-digest\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface pppoe$VAR(../../../../@) \" \
- -c \"no ip ospf authentication \"; "
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/node.def
deleted file mode 100644
index ff352a01..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set OSPF interface authentication
-
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def
deleted file mode 100644
index 71932540..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,23 +0,0 @@
-type: txt
-help: Set plain text password
-syntax:expression: exec " \
- if [ `echo -n '$VAR(@)' | wc -c` -gt 8 ]; then \
- echo Password must be 8 characters or less ; \
- exit 1 ; \
- fi ; "
-
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface pppoe$VAR(../../../../@) \" \
- -c \"no ip ospf authentication \" \
- -c \"ip ospf authentication \" \
- -c \"ip ospf authentication-key $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface pppoe$VAR(../../../../@) \" \
- -c \"no ip ospf authentication \" \
- -c \"no ip ospf authentication-key \"; "
-
-comp_help: possible completions:
- <text> Plain text password (8 characters or less)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def
deleted file mode 100644
index c2660d09..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-type: u32
-help: Set bandwidth in kilobits/sec
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \
- "Must be between 1-10000000"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface pppoe$VAR(../../../@) \" \
- -c \"bandwidth $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface pppoe$VAR(../../../@) \" \
- -c \"no bandwidth $VAR(@) \"; "
-
-comp_help: possible completions:
- <1-10000000> Set bandwidth in kilobits/sec (for calculating OSPF cost)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/cost/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/cost/node.def
deleted file mode 100644
index f9459d6a..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/cost/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-type: u32
-help: Set interface cost
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vyatta-vtysh -c \"configure terminal\" \
- -c \"interface pppoe$VAR(../../../@)\" \
- -c \"ip ospf cost $VAR(@) \"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
- -c \"interface pppoe$VAR(../../../@)\" \
- -c \"no ip ospf cost \"; "
-comp_help: possible completions:
- <1-65535> Set Cost
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def
deleted file mode 100644
index 8edaca26..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: u32
-help: Set interval after which a neighbor is declared dead
-default: 40
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \
- -c \"ip ospf dead-interval $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \
- -c \"no ip ospf dead-interval \"; "
-comp_help: possible completions:
- <1-65535> Seconds (default 40)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def
deleted file mode 100644
index 93e2d7a1..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: u32
-help: Set interval between HELLO packets
-default: 10
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@) \" \
- -c \"ip ospf hello-interval $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@) \" \
- -c \"no ip ospf hello-interval \"; "
-comp_help: possible completions:
- <1-65535> Seconds (default 10)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def
deleted file mode 100644
index 966566a4..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-help: Disable Maximum Transmission Unit (MTU) mismatch detection
-create:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface pppoe$VAR(../../../@)\" \
- -c \"ip ospf mtu-ignore\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface pppoe$VAR(../../../@)\" \
- -c \"no ip ospf mtu-ignore\"; "
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/network/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/network/node.def
deleted file mode 100644
index 132c663a..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/network/node.def
+++ /dev/null
@@ -1,20 +0,0 @@
-type: txt
-help: Set network type
-syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \
- "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)"
-
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface pppoe$VAR(../../../@) \" \
- -c \"ip ospf network $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface pppoe$VAR(../../../@) \" \
- -c \"no ip ospf network \"; "
-
-comp_help: possible completions:
- broadcast Set broadcast network type
- non-broadcast Set non-broadcast network type
- point-to-multipoint Set point-to-multipoint network type
- point-to-point Set point-to-point network type
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/node.def
deleted file mode 100644
index 31980774..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set Open Shortest Path First (OSPF) parameters for specified interface
-create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/priority/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/priority/node.def
deleted file mode 100644
index acc84ac0..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/priority/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: u32
-help: Set router priority
-default: 1
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \
- -c \"ip ospf priority $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \
- -c \"no ip ospf priority \"; "
-comp_help: possible completions:
- <0-255> Priority (default 1)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def
deleted file mode 100644
index 92884596..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: u32
-help: Set interval between retransmitting lost link state advertisements
-default: 5
-syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \
- -c \"ip ospf retransmit-interval $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \
- -c \"no ip ospf retransmit-interval \"; "
-comp_help: possible completions:
- <3-65535> Seconds (default 5)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def
deleted file mode 100644
index 78fd0e10..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: u32
-help: Set link state transmit delay
-default: 1
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \
- -c \"ip ospf transmit-delay $VAR(@)\"; "
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoe$VAR(../../../@)\" \
- -c \"no ip ospf transmit-delay \"; "
-comp_help: possible completions:
- <1-65535> Seconds (default 1)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.def
deleted file mode 100644
index e1819c01..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-tag:
-type: u32
-help: Set MD5 authentication key ID
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between 1 and 255"
-
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/node.def
deleted file mode 100644
index 488acd8c..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication password
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
deleted file mode 100644
index 8c0f5ef7..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
+++ /dev/null
@@ -1,23 +0,0 @@
-type: txt
-help: Set authentication password
-syntax:expression: exec " \
- if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then \
- echo MD5 key must be 16 characters or less ; \
- exit 1 ; \
- fi ; "
-
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoe$VAR(../../../../../@)\" \
- -c \"ip rip authentication mode md5\" \
- -c \"ip rip authentication key-chain pppoe$VAR(../../../../../@)-rip\" \
- -c \"key chain pppoe$VAR(../../../../../@)-rip\" -c \"key $VAR(../@)\" \
- -c \"key-string $VAR(@)\" "
-
-delete:expression: "vyatta-vtysh --noerror \
- -c \"configure terminal\" -c \"interface pppoe$VAR(../../../../../@)\" \
- -c \"no ip rip authentication mode md5\" \
- -c \"no ip rip authentication key-chain pppoe$VAR(../../../../../@)-rip\" \
- -c \"no key chain pppoe$VAR(../../../../../@)-rip\" "
-
-comp_help: possible completions:
- <text> MD5 Key (16 characters or less)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/node.def
deleted file mode 100644
index 8756de35..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication method
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def
deleted file mode 100644
index 835a0aea..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,20 +0,0 @@
-type: txt
-help: Set plain text password
-syntax:expression: exec " \
- if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then \
- echo Password must be 16 characters or less ; \
- exit 1 ; \
- fi ; "
-
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoe$VAR(../../../../@)\" \
- -c \"ip rip authentication mode text\" \
- -c \"ip rip authentication string $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" -c \"interface pppoe$VAR(../../../../@)\" \
- -c \"no ip rip authentication mode\" \
- -c \"no ip rip authentication string $VAR(@)\"; "
-
-comp_help: possible completions:
- <text> Password (16 characters or less)
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/node.def
deleted file mode 100644
index 16241372..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set Routing Information Protocol (RIP) parameters for specified interface
-create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def
deleted file mode 100644
index 1ca1dd11..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-help: Disable split horizon on specified interface
-create:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../@) \" \
- -c \"no ip rip split-horizon \" "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../@) \" \
- -c \"ip rip split-horizon \" "
-
-commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for PPPoE interface $VAR(../../../../@)"
-
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/node.def
deleted file mode 100644
index ba39b616..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set to control split horizon parameters on this interface
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def
deleted file mode 100644
index 76b03e21..00000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-help: Enable split-horizon with poison reverse
-create:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface pppoe$VAR(../../../../@) \" \
- -c \"ip rip split-horizon poisoned-reverse \" "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface pppoe$VAR(../../../../@) \" \
- -c \"no ip rip split-horizon \" \
- -c \"ip rip split-horizon \" "
-commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for PPPoE interface $VAR(../../../../@)"
-