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.

40 files changed, 0 insertions, 339 deletions

diff --git a/templates/interfaces/loopback/node.tag/ip/node.def b/templates/interfaces/loopback/node.tag/ip/node.def
deleted file mode 100644
index 92e252e1..00000000
--- a/templates/interfaces/loopback/node.tag/ip/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set IPv4 parameters for specified interface
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def
deleted file mode 100644
index cfb7842b..00000000
--- a/templates/interfaces/loopback/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 $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/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
deleted file mode 100644
index c985099d..00000000
--- a/templates/interfaces/loopback/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/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def
deleted file mode 100644
index 3d83feec..00000000
--- a/templates/interfaces/loopback/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/loopback/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def
deleted file mode 100644
index 85a66781..00000000
--- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def
+++ /dev/null
@@ -1,12 +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/loopback/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/node.def
deleted file mode 100644
index 0f8c7f80..00000000
--- a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set Open Shortest Path First (OSPF) parameters for specified interface
-
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/authentication/plaintext-password/node.def
deleted file mode 100644
index f02b95c5..00000000
--- a/templates/interfaces/loopback/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 $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/loopback/node.tag/ip/ospf/cost/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def
deleted file mode 100644
index 3c256074..00000000
--- a/templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def
+++ /dev/null
@@ -1,9 +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: <1-65535> Cost
-
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def
deleted file mode 100644
index 4bff0b1f..00000000
--- a/templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: u32
-help: Set interval after which a neighbor is declared dead
-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: <1-65535> Seconds
-
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def
deleted file mode 100644
index 6e743064..00000000
--- a/templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: u32
-help: Set interval between hello packets
-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: <1-65535> Seconds
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def
deleted file mode 100644
index ae2f1153..00000000
--- a/templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def
+++ /dev/null
@@ -1,5 +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/loopback/node.tag/ip/ospf/network/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def
deleted file mode 100644
index c7fcc7e7..00000000
--- a/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: txt
-help: Set network type
-syntax:expression: $VAR(@) in "non-broadcast"; \
-       "Must be non-broadcast"
-
-allowed:echo non-broadcast
-
-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:
- non-broadcast          Set non-broadcast network type
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/node.def
deleted file mode 100644
index 31980774..00000000
--- a/templates/interfaces/loopback/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/loopback/node.tag/ip/ospf/priority/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def
deleted file mode 100644
index c19b3f85..00000000
--- a/templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: u32
-help: Set router priority
-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: <0-255> Priority
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def
deleted file mode 100644
index 5dac04e1..00000000
--- a/templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: u32
-help: Set interval between retransmitting lost link state advertisements
-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: <3-65535> Seconds
diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def
deleted file mode 100644
index b60ed78f..00000000
--- a/templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: u32
-help: Set link state transmit delay
-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: <1-65535> Seconds
diff --git a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.def
deleted file mode 100644
index 8d165fe6..00000000
--- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-tag:
-type: u32
-help: Set MD5 authentication key ID
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; \
-                   "ID must be between 1 and 255"
-
-commit:expression: $VAR(../plaintext-password/) == "" ; \
-                   "plaintext-password already set"
diff --git a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/node.def
deleted file mode 100644
index 488acd8c..00000000
--- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication password
diff --git a/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
deleted file mode 100644
index 02275ea7..00000000
--- a/templates/interfaces/loopback/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 $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/loopback/node.tag/ip/rip/authentication/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/node.def
deleted file mode 100644
index 8756de35..00000000
--- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication method
diff --git a/templates/interfaces/loopback/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/loopback/node.tag/ip/rip/authentication/plaintext-password/node.def
deleted file mode 100644
index 9b81dfc5..00000000
--- a/templates/interfaces/loopback/node.tag/ip/rip/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,22 +0,0 @@
-type: txt
-help: 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 ; "
-
-commit:expression: $VAR(../md5/) == "" ; "md5 password already set"
-
-update: vyatta-vtysh                            \
-          -c "configure terminal" -c "interface $VAR(../../../../@)" \
-          -c "ip rip authentication mode text"                       \
-          -c "ip rip authentication string $VAR(@)"
-
-delete: 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/loopback/node.tag/ip/rip/node.def b/templates/interfaces/loopback/node.tag/ip/rip/node.def
deleted file mode 100644
index 16241372..00000000
--- a/templates/interfaces/loopback/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/loopback/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/disable/node.def
deleted file mode 100644
index 4989b867..00000000
--- a/templates/interfaces/loopback/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 loopback interface $VAR(../../../../@)"
-
diff --git a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/node.def
deleted file mode 100644
index 598c6dc5..00000000
--- a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Set to control split horizon parameters on this interface
-
-
diff --git a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def
deleted file mode 100644
index 17438eac..00000000
--- a/templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ /dev/null
@@ -1,10 +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 loopback interface $VAR(../../../../@)"
-
diff --git a/templates/interfaces/loopback/node.tag/ipv6/node.def b/templates/interfaces/loopback/node.tag/ipv6/node.def
deleted file mode 100644
index 6ad8bff4..00000000
--- a/templates/interfaces/loopback/node.tag/ipv6/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set IPv6 parameters for specified interface
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/cost/node.def b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/cost/node.def
deleted file mode 100644
index 2c653c8f..00000000
--- a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/cost/node.def
+++ /dev/null
@@ -1,8 +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 \"ipv6 ospf6 cost $VAR(@) \"; "
-comp_help: possible completions:
- <1-65535>          Set Cost
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/dead-interval/node.def b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/dead-interval/node.def
deleted file mode 100644
index fcc3be00..00000000
--- a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/dead-interval/node.def
+++ /dev/null
@@ -1,9 +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 \"ipv6 ospf6 dead-interval $VAR(@)\"; "
-comp_help: possible completions:
- <1-65535>          Seconds (default 40)
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/hello-interval/node.def b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/hello-interval/node.def
deleted file mode 100644
index ae277b4c..00000000
--- a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/hello-interval/node.def
+++ /dev/null
@@ -1,9 +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 \"ipv6 ospf6 hello-interval $VAR(@)\"; "
-comp_help: possible completions:
- <1-65535>          Seconds (default 10)
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/ifmtu/node.def b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/ifmtu/node.def
deleted file mode 100644
index b6b84a87..00000000
--- a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/ifmtu/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-type: u32
-help: Set interface MTU
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update:expression: "vyatta-vtysh -c \"configure terminal\" \
-        -c \"interface $VAR(../../../@)\" \
-        -c \"ipv6 ospf6 ifmtu $VAR(@) \"; "
-delete:expression: "vyatta-vtysh -c \"configure terminal\" \
-        -c \"interface $VAR(../../../@)\" \
-        -c \"no ipv6 ospf6 ifmtu \"; "
-comp_help: possible completions:
- <1-65535>          Set Cost
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/instance-id/node.def b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/instance-id/node.def
deleted file mode 100644
index 4df3aea7..00000000
--- a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/instance-id/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: u32
-help: Set instance-id for this  interface
-default: 0
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
-update:expression: "vyatta-vtysh              \
-       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
-       -c \"ipv6 ospf6 instance-id $VAR(@)\"; "
-comp_help: possible completions:
- <0-255>            Instance Id (default 0)
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/node.def b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/node.def
deleted file mode 100644
index 3e8380e6..00000000
--- a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set IPv6 Open Shortest Path First (OSPFv3) parameters for specified interface
-create: sudo /opt/vyatta/sbin/quagga-manager check ospf6d
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/passive/node.def b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/passive/node.def
deleted file mode 100644
index d5a43377..00000000
--- a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/passive/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-help: Disable forming of adjacency on this interface
-create:expression: "vyatta-vtysh 
-       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
-       -c \"ipv6 ospf6 passive\"; "
-delete:expression: "vyatta-vtysh 
-       -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \
-       -c \"no ipv6 ospf6 passive\"; "
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/priority/node.def b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/priority/node.def
deleted file mode 100644
index efd10574..00000000
--- a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/priority/node.def
+++ /dev/null
@@ -1,9 +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 \"ipv6 ospf6 priority $VAR(@)\"; "
-comp_help: possible completions:
- <0-255>            Priority (default 1)
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/retransmit-interval/node.def b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/retransmit-interval/node.def
deleted file mode 100644
index 34651d7a..00000000
--- a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/retransmit-interval/node.def
+++ /dev/null
@@ -1,9 +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 \"ipv6 ospf6 retransmit-interval $VAR(@)\"; "
-comp_help: possible completions:
- <3-65535>          Seconds (default 5)
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/transmit-delay/node.def b/templates/interfaces/loopback/node.tag/ipv6/ospfv3/transmit-delay/node.def
deleted file mode 100644
index 0b623a42..00000000
--- a/templates/interfaces/loopback/node.tag/ipv6/ospfv3/transmit-delay/node.def
+++ /dev/null
@@ -1,9 +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 \"ipv6 ospf6 transmit-delay $VAR(@)\"; "
-comp_help: possible completions:
- <1-65535>          Seconds (default 1)
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ripng/node.def b/templates/interfaces/loopback/node.tag/ipv6/ripng/node.def
deleted file mode 100644
index d59da359..00000000
--- a/templates/interfaces/loopback/node.tag/ipv6/ripng/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set Routing Information Protocol (RIPng) for specified interface
-create: sudo /opt/vyatta/sbin/quagga-manager check ripngd
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ripng/split-horizon/disable/node.def b/templates/interfaces/loopback/node.tag/ipv6/ripng/split-horizon/disable/node.def
deleted file mode 100644
index 825f24ab..00000000
--- a/templates/interfaces/loopback/node.tag/ipv6/ripng/split-horizon/disable/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-help: Disable split horizon on specified interface
-create: vyatta-vtysh                         \
-          -c "configure terminal"            \
-          -c "interface $VAR(../../../../@)" \
-          -c "no ipv6 ripng split-horizon"
-
-delete: vyatta-vtysh                         \
-          -c "configure terminal"            \
-          -c "interface $VAR(../../../../@)" \
-          -c "ipv6 ripng split-horizon"
-
-commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet interface $VAR(../../../../@)"
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ripng/split-horizon/node.def b/templates/interfaces/loopback/node.tag/ipv6/ripng/split-horizon/node.def
deleted file mode 100644
index ba39b616..00000000
--- a/templates/interfaces/loopback/node.tag/ipv6/ripng/split-horizon/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set to control split horizon parameters on this interface
diff --git a/templates/interfaces/loopback/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def b/templates/interfaces/loopback/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def
deleted file mode 100644
index e3b1663b..00000000
--- a/templates/interfaces/loopback/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-help: Enable poison reverse for split-horizon
-create: vyatta-vtysh                                     \
-          -c "configure terminal"                        \
-          -c "interface $VAR(../../../../@)"             \
-          -c "ipv6 ripng split-horizon poisoned-reverse"
-
-delete: vyatta-vtysh                                     \
-          -c "configure terminal"                        \
-          -c "interface $VAR(../../../../@)"             \
-          -c "no ipv6 ripng split-horizon"               \
-          -c "ipv6 ripng split-horizon"
-
-commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet interface $VAR(../../../../@)"