summaryrefslogtreecommitdiff
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
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.
-rw-r--r--.gitignore1
-rw-r--r--Makefile.am10
-rwxr-xr-xgen-interface-templates.pl116
-rw-r--r--interface-templates/disable-link-detect/node.def3
-rw-r--r--interface-templates/ip/node.def (renamed from templates/interfaces/ethernet/node.tag/ip/node.def)0
-rw-r--r--interface-templates/ip/ospf/authentication/md5/key-id/node.def16
-rw-r--r--interface-templates/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def (renamed from templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def)0
-rw-r--r--interface-templates/ip/ospf/authentication/md5/key-id/node.tag/node.def (renamed from templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/md5/key-id/node.tag/node.def)0
-rw-r--r--interface-templates/ip/ospf/authentication/md5/node.def5
-rw-r--r--interface-templates/ip/ospf/authentication/node.def (renamed from templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/node.def)0
-rw-r--r--interface-templates/ip/ospf/authentication/plaintext-password/node.def10
-rw-r--r--interface-templates/ip/ospf/bandwidth/node.def7
-rw-r--r--interface-templates/ip/ospf/cost/node.def11
-rw-r--r--interface-templates/ip/ospf/dead-interval/node.def (renamed from templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/dead-interval/node.def)5
-rw-r--r--interface-templates/ip/ospf/hello-interval/node.def (renamed from templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/hello-interval/node.def)5
-rw-r--r--interface-templates/ip/ospf/mtu-ignore/node.def3
-rw-r--r--interface-templates/ip/ospf/network/node.def (renamed from templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def)13
-rw-r--r--interface-templates/ip/ospf/node.def (renamed from templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/node.def)0
-rw-r--r--interface-templates/ip/ospf/priority/node.def (renamed from templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/priority/node.def)5
-rw-r--r--interface-templates/ip/ospf/retransmit-interval/node.def (renamed from templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/retransmit-interval/node.def)7
-rw-r--r--interface-templates/ip/ospf/transmit-delay/node.def (renamed from templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/transmit-delay/node.def)5
-rw-r--r--interface-templates/ip/rip/authentication/md5/node.def (renamed from templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.def)0
-rw-r--r--interface-templates/ip/rip/authentication/md5/node.tag/node.def (renamed from templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/md5/node.tag/node.def)0
-rw-r--r--interface-templates/ip/rip/authentication/md5/node.tag/password/node.def19
-rw-r--r--interface-templates/ip/rip/authentication/node.def (renamed from templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/node.def)0
-rw-r--r--interface-templates/ip/rip/authentication/plaintext-password/node.def13
-rw-r--r--interface-templates/ip/rip/node.def (renamed from templates/interfaces/ethernet/node.tag/ip/rip/node.def)0
-rw-r--r--interface-templates/ip/rip/split-horizon/disable/node.def6
-rw-r--r--interface-templates/ip/rip/split-horizon/node.def (renamed from templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/node.def)0
-rw-r--r--interface-templates/ip/rip/split-horizon/poison-reverse/node.def9
-rw-r--r--interface-templates/ipv6/node.def (renamed from templates/interfaces/ethernet/node.tag/ipv6/node.def)0
-rw-r--r--interface-templates/ipv6/ospfv3/cost/node.def7
-rw-r--r--interface-templates/ipv6/ospfv3/dead-interval/node.def (renamed from templates/interfaces/ethernet/node.tag/ipv6/ospfv3/dead-interval/node.def)8
-rw-r--r--interface-templates/ipv6/ospfv3/hello-interval/node.def (renamed from templates/interfaces/ethernet/node.tag/ipv6/ospfv3/hello-interval/node.def)8
-rw-r--r--interface-templates/ipv6/ospfv3/ifmtu/node.def7
-rw-r--r--interface-templates/ipv6/ospfv3/instance-id/node.def8
-rw-r--r--interface-templates/ipv6/ospfv3/node.def (renamed from templates/interfaces/ethernet/node.tag/ipv6/ospfv3/node.def)0
-rw-r--r--interface-templates/ipv6/ospfv3/passive/node.def3
-rw-r--r--interface-templates/ipv6/ospfv3/priority/node.def8
-rw-r--r--interface-templates/ipv6/ospfv3/retransmit-interval/node.def (renamed from templates/interfaces/ethernet/node.tag/ipv6/ospfv3/retransmit-interval/node.def)8
-rw-r--r--interface-templates/ipv6/ospfv3/transmit-delay/node.def (renamed from templates/interfaces/ethernet/node.tag/ipv6/ospfv3/transmit-delay/node.def)8
-rw-r--r--interface-templates/ipv6/ripng/node.def (renamed from templates/interfaces/ethernet/node.tag/ipv6/ripng/node.def)0
-rw-r--r--interface-templates/ipv6/ripng/split-horizon/disable/node.def6
-rw-r--r--interface-templates/ipv6/ripng/split-horizon/node.def (renamed from templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/node.def)0
-rw-r--r--interface-templates/ipv6/ripng/split-horizon/poison-reverse/node.def9
-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/node.def11
-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/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/password/node.def23
-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/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/poison-reverse/node.def13
l---------templates/interfaces/bonding/node.tag/disable-link-detect1
l---------templates/interfaces/bonding/node.tag/ip1
l---------templates/interfaces/bonding/node.tag/ipv61
l---------templates/interfaces/bonding/node.tag/vif/node.tag/disable-link-detect1
l---------templates/interfaces/bonding/node.tag/vif/node.tag/ip1
l---------templates/interfaces/bonding/node.tag/vif/node.tag/ipv61
l---------templates/interfaces/bonding/node.tag/vif/node.tag/pppoe1
l---------templates/interfaces/bridge/node.tag/disable-link-detect1
l---------templates/interfaces/bridge/node.tag/ip1
l---------templates/interfaces/bridge/node.tag/ipv61
l---------templates/interfaces/bridge/node.tag/vif1
l---------templates/interfaces/bridge/vif/node.tag/*1
-rw-r--r--templates/interfaces/ethernet/node.tag/disable-link-detect/node.def3
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def23
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/node.def11
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/authentication/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/authentication/plaintext-password/node.def23
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/bandwidth/node.def16
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/cost/node.def11
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def12
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def12
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/mtu-ignore/node.def10
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def12
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def12
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def12
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/password/node.def23
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/rip/authentication/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/rip/authentication/plaintext-password/node.def22
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/disable/node.def12
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def14
-rw-r--r--templates/interfaces/ethernet/node.tag/ipv6/ospfv3/cost/node.def13
-rw-r--r--templates/interfaces/ethernet/node.tag/ipv6/ospfv3/ifmtu/node.def13
-rw-r--r--templates/interfaces/ethernet/node.tag/ipv6/ospfv3/instance-id/node.def14
-rw-r--r--templates/interfaces/ethernet/node.tag/ipv6/ospfv3/passive/node.def9
-rw-r--r--templates/interfaces/ethernet/node.tag/ipv6/ospfv3/priority/node.def14
-rw-r--r--templates/interfaces/ethernet/node.tag/ipv6/ripng/split-horizon/disable/node.def12
-rw-r--r--templates/interfaces/ethernet/node.tag/ipv6/ripng/split-horizon/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def13
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def23
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def9
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def11
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def23
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def16
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/cost/node.def11
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def12
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def12
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def10
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/network/node.def20
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/priority/node.def12
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def12
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def12
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.def5
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def23
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def20
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def13
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def13
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/cost/node.def8
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/ifmtu/node.def11
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/instance-id/node.def9
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/passive/node.def7
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def3
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def23
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def9
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/node.def11
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def23
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/bandwidth/node.def17
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/cost/node.def16
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/dead-interval/node.def17
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/hello-interval/node.def17
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/mtu-ignore/node.def10
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/network/node.def20
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/priority/node.def17
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/retransmit-interval/node.def17
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/transmit-delay/node.def17
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.def8
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def29
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/plaintext-password/node.def24
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/disable/node.def13
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def12
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/cost/node.def13
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/dead-interval/node.def14
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/hello-interval/node.def14
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/ifmtu/node.def13
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/instance-id/node.def14
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/passive/node.def9
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/priority/node.def14
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/retransmit-interval/node.def14
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/transmit-delay/node.def14
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ripng/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ripng/split-horizon/disable/node.def12
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ripng/split-horizon/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def13
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def23
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def9
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def11
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/authentication/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def23
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def16
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/cost/node.def11
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def12
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def12
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def10
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/network/node.def20
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/priority/node.def12
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def12
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def12
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.def5
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def23
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/authentication/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def20
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/node.def2
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def13
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/split-horizon/node.def1
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def13
-rw-r--r--templates/interfaces/loopback/node.tag/ip/node.def1
-rw-r--r--templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.def23
-rw-r--r--templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def9
-rw-r--r--templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def1
-rw-r--r--templates/interfaces/loopback/node.tag/ip/ospf/authentication/md5/node.def12
-rw-r--r--templates/interfaces/loopback/node.tag/ip/ospf/authentication/node.def2
-rw-r--r--templates/interfaces/loopback/node.tag/ip/ospf/authentication/plaintext-password/node.def23
-rw-r--r--templates/interfaces/loopback/node.tag/ip/ospf/cost/node.def9
-rw-r--r--templates/interfaces/loopback/node.tag/ip/ospf/dead-interval/node.def9
-rw-r--r--templates/interfaces/loopback/node.tag/ip/ospf/hello-interval/node.def8
-rw-r--r--templates/interfaces/loopback/node.tag/ip/ospf/mtu-ignore/node.def5
-rw-r--r--templates/interfaces/loopback/node.tag/ip/ospf/network/node.def17
-rw-r--r--templates/interfaces/loopback/node.tag/ip/ospf/node.def2
-rw-r--r--templates/interfaces/loopback/node.tag/ip/ospf/priority/node.def8
-rw-r--r--templates/interfaces/loopback/node.tag/ip/ospf/retransmit-interval/node.def8
-rw-r--r--templates/interfaces/loopback/node.tag/ip/ospf/transmit-delay/node.def8
-rw-r--r--templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.def8
-rw-r--r--templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/node.def1
-rw-r--r--templates/interfaces/loopback/node.tag/ip/rip/authentication/md5/node.tag/password/node.def23
-rw-r--r--templates/interfaces/loopback/node.tag/ip/rip/authentication/node.def1
-rw-r--r--templates/interfaces/loopback/node.tag/ip/rip/authentication/plaintext-password/node.def22
-rw-r--r--templates/interfaces/loopback/node.tag/ip/rip/node.def2
-rw-r--r--templates/interfaces/loopback/node.tag/ip/rip/split-horizon/disable/node.def13
-rw-r--r--templates/interfaces/loopback/node.tag/ip/rip/split-horizon/node.def3
-rw-r--r--templates/interfaces/loopback/node.tag/ip/rip/split-horizon/poison-reverse/node.def10
-rw-r--r--templates/interfaces/loopback/node.tag/ipv6/node.def1
-rw-r--r--templates/interfaces/loopback/node.tag/ipv6/ospfv3/cost/node.def8
-rw-r--r--templates/interfaces/loopback/node.tag/ipv6/ospfv3/dead-interval/node.def9
-rw-r--r--templates/interfaces/loopback/node.tag/ipv6/ospfv3/hello-interval/node.def9
-rw-r--r--templates/interfaces/loopback/node.tag/ipv6/ospfv3/ifmtu/node.def11
-rw-r--r--templates/interfaces/loopback/node.tag/ipv6/ospfv3/instance-id/node.def9
-rw-r--r--templates/interfaces/loopback/node.tag/ipv6/ospfv3/node.def2
-rw-r--r--templates/interfaces/loopback/node.tag/ipv6/ospfv3/passive/node.def7
-rw-r--r--templates/interfaces/loopback/node.tag/ipv6/ospfv3/priority/node.def9
-rw-r--r--templates/interfaces/loopback/node.tag/ipv6/ospfv3/retransmit-interval/node.def9
-rw-r--r--templates/interfaces/loopback/node.tag/ipv6/ospfv3/transmit-delay/node.def9
-rw-r--r--templates/interfaces/loopback/node.tag/ipv6/ripng/node.def2
-rw-r--r--templates/interfaces/loopback/node.tag/ipv6/ripng/split-horizon/disable/node.def12
-rw-r--r--templates/interfaces/loopback/node.tag/ipv6/ripng/split-horizon/node.def1
-rw-r--r--templates/interfaces/loopback/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def13
l---------templates/interfaces/multilink/node.tag/ip1
l---------templates/interfaces/multilink/node.tag/ipv61
l---------templates/interfaces/multilink/node.tag/vif/node.tag/disable-link-detect1
l---------templates/interfaces/multilink/node.tag/vif/node.tag/ip1
l---------templates/interfaces/multilink/node.tag/vif/node.tag/ipv61
l---------templates/interfaces/multilink/node.tag/vif/node.tag/pppoe1
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def3
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/node.def1
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def23
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def9
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def1
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/node.def11
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/node.def2
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def23
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/bandwidth/node.def17
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/cost/node.def16
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/dead-interval/node.def17
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/hello-interval/node.def17
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/mtu-ignore/node.def10
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/network/node.def20
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/node.def2
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/priority/node.def17
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/retransmit-interval/node.def17
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/transmit-delay/node.def17
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.def8
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def1
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def29
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/node.def1
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def22
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/node.def2
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/disable/node.def13
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/node.def3
-rw-r--r--templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def11
-rw-r--r--templates/interfaces/serial/node.tag/disable-link-detect/node.def3
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def3
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/node.def1
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def23
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def9
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def1
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/node.def11
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/node.def2
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def23
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/bandwidth/node.def17
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/cost/node.def16
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/dead-interval/node.def17
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/hello-interval/node.def17
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/mtu-ignore/node.def10
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/network/node.def20
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/node.def2
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/priority/node.def17
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/retransmit-interval/node.def17
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/transmit-delay/node.def17
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.def8
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def1
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def29
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/node.def1
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def24
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/node.def2
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/disable/node.def13
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/node.def2
-rw-r--r--templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def11
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def3
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/node.def1
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def23
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def9
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def1
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/node.def11
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/node.def2
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def23
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/bandwidth/node.def17
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/cost/node.def16
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/dead-interval/node.def17
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/hello-interval/node.def17
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/mtu-ignore/node.def10
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/network/node.def20
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/node.def2
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/priority/node.def17
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/retransmit-interval/node.def17
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/transmit-delay/node.def17
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.def8
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def1
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def29
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/node.def1
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def24
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/node.def2
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/disable/node.def13
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/node.def2
-rw-r--r--templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def11
l---------templates/interfaces/tunnel/node.tag/ip1
l---------templates/interfaces/tunnel/node.tag/ipv61
l---------templates/interfaces/wirelessmodem/node.tag/disable-link-detect1
l---------templates/interfaces/wirelessmodem/node.tag/ip1
l---------templates/interfaces/wirelessmodem/node.tag/ipv61
417 files changed, 299 insertions, 3800 deletions
diff --git a/.gitignore b/.gitignore
index 114d0896..53a7c34b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
/src/.deps/
/src/.dirstamp
+generated-templates
diff --git a/Makefile.am b/Makefile.am
index acff766f..bd49e36d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
cfgdir = $(datadir)/vyatta-cfg/templates
curverdir = $(sysconfdir)/config-migrate/current
+gentmpdir = generated-templates
bin_SCRIPTS = scripts/vyatta-show-protocols
@@ -21,6 +22,15 @@ curver_DATA = cfg-version/quagga@1
cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \
cpio -0pd
+all-local:
+ rm -rf $(gentmpdir)
+ ./gen-interface-templates.pl $(gentmpdir)
+ rm -r $(gentmpdir)/interfaces/loopback/node.tag/disable-link-detect
+
+clean-local:
+ rm -rf $(gentmpdir)
+
install-exec-hook:
mkdir -p $(DESTDIR)$(cfgdir)
cd templates; $(cpiop) $(DESTDIR)$(cfgdir)
+ cd $(gentmpdir); $(cpiop) $(DESTDIR)$(cfgdir)
diff --git a/gen-interface-templates.pl b/gen-interface-templates.pl
new file mode 100755
index 00000000..d31b53ed
--- /dev/null
+++ b/gen-interface-templates.pl
@@ -0,0 +1,116 @@
+#!/usr/bin/perl
+#
+# **** License ****
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# This code was originally developed by Vyatta, Inc.
+# Portions created by Vyatta are Copyright (C) 2009 Vyatta, Inc.
+# All Rights Reserved.
+#
+# Author: Stephen Hemminger
+# Date: March 2009
+# Description: Script to automatically generate per-interface quagga
+# templates.
+#
+# **** End License ****
+
+use strict;
+use warnings;
+
+# set DEBUG in environment to test script
+my $debug = $ENV{'DEBUG'};
+
+# Mapping from configuration level to ifname used AT THAT LEVEL
+my %interface_hash = (
+ 'loopback/node.tag' => '$VAR(@)',
+ 'ethernet/node.tag' => '$VAR(@)',
+ 'ethernet/node.tag/pppoe/node.tag' => 'pppoe$VAR(@)',
+ 'ethernet/node.tag/vif/node.tag' => '$VAR(../@).$VAR(@)',
+ 'ethernet/node.tag/vif/node.tag/pppoe/node.tag' => 'pppoe$VAR(@)',
+ 'bonding/node.tag' => '$VAR(@)',
+ 'bonding/node.tag/vif/node.tag' => '$VAR(../@).$VAR(@)',
+ 'tunnel/node.tag' => '$VAR(@)',
+ 'bridge/node.tag' => '$VAR(@)',
+ 'openvpn/node.tag' => '$VAR(@)',
+ 'wirelessmodem/node.tag' => '$VAR(@)',
+ 'multilink/node.tag/vif/node.tag' => '$VAR(../@)',
+
+ 'adsl/node.tag/pvc/node.tag/bridged-ethernet' => '$VAR(../../@)',
+ 'adsl/node.tag/pvc/node.tag/classical-ipoa' => '$VAR(../../@)',
+ 'adsl/node.tag/pvc/node.tag/pppoa/node.tag' => '$VAR(../../@)',
+ 'adsl/node.tag/pvc/node.tag/pppoe/node.tag' => '$VAR(../../@)',
+
+ 'serial/node.tag/cisco-hdlc/vif/node.tag' => '$VAR(../../@).$VAR(@)',
+ 'serial/node.tag/frame-relay/vif/node.tag' => '$VAR(../../@).$VAR(@)',
+ 'serial/node.tag/ppp/vif/node.tag' => '$VAR(../../@).$VAR(@)',
+);
+
+sub gen_template {
+ my ( $inpath, $outpath, $ifname ) = @_;
+
+ print $outpath, "\n" if ($debug);
+ opendir my $d, $inpath
+ or die "Can't open: $inpath:$!";
+
+ # walk through sample templates
+ foreach my $name ( grep { !/^\./ } readdir $d ) {
+ my $in = "$inpath/$name";
+ my $out = "$outpath/$name";
+
+ if ( -d $in ) {
+ my $subif = $ifname;
+ $subif =~ s#@\)#../@)#g;
+
+ ( -d $out )
+ or mkdir($out)
+ or die "Can't create $out: $!";
+
+ gen_template( $in, $out, $subif );
+ next;
+ }
+
+ print "in: $in out: $out\n" if ($debug);
+ open my $inf, '<', $in or die "Can't open $in: $!";
+ open my $outf, '>', $out or die "Can't open $out: $!";
+
+ while ( my $line = <$inf> ) {
+ $line =~ s#\$IFNAME#$ifname#;
+ print $outf $line;
+ }
+ close $inf;
+ close $outf or die "Close error $out:$!";
+ }
+ closedir $d;
+}
+
+sub mkdir_p {
+ my $path = shift;
+
+ return 1 if ( mkdir($path) );
+
+ my $pos = rindex( $path, "/" );
+ return unless $pos != -1;
+ return unless mkdir_p( substr( $path, 0, $pos ) );
+ return mkdir($path);
+}
+
+die "Usage: $0 output_directory\n" if ($#ARGV < 0);
+
+my $outdir = $ARGV[0];
+
+foreach my $if_tree ( keys %interface_hash ) {
+ my $inpath = "interface-templates";
+ my $outpath = "$outdir/interfaces/$if_tree";
+ ( -d $outpath )
+ or mkdir_p($outpath)
+ or die "Can't create $outpath:$!";
+
+ gen_template( $inpath, $outpath, $interface_hash{$if_tree} );
+}
diff --git a/interface-templates/disable-link-detect/node.def b/interface-templates/disable-link-detect/node.def
new file mode 100644
index 00000000..4f9d0668
--- /dev/null
+++ b/interface-templates/disable-link-detect/node.def
@@ -0,0 +1,3 @@
+help: Set to ignore link state changes on this interface
+update:/opt/vyatta/sbin/vyatta-link-detect $IFNAME on
+delete:/opt/vyatta/sbin/vyatta-link-detect $IFNAME off
diff --git a/templates/interfaces/ethernet/node.tag/ip/node.def b/interface-templates/ip/node.def
index 92e252e1..92e252e1 100644
--- a/templates/interfaces/ethernet/node.tag/ip/node.def
+++ b/interface-templates/ip/node.def
diff --git a/interface-templates/ip/ospf/authentication/md5/key-id/node.def b/interface-templates/ip/ospf/authentication/md5/key-id/node.def
new file mode 100644
index 00000000..630bd3f0
--- /dev/null
+++ b/interface-templates/ip/ospf/authentication/md5/key-id/node.def
@@ -0,0 +1,16 @@
+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:touch /tmp/ospf-md5.$PPID
+
+end: if [ -f /tmp/ospf-md5.$PPID ]
+ then vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
+ -c "no ip ospf message-digest-key $VAR(@)"
+ rm /tmp/ospf-md5.$PPID \
+ else vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
+ -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/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/interface-templates/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
index 5efd3ef7..5efd3ef7 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
+++ b/interface-templates/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/md5/key-id/node.tag/node.def b/interface-templates/ip/ospf/authentication/md5/key-id/node.tag/node.def
index d14a2583..d14a2583 100644
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/md5/key-id/node.tag/node.def
+++ b/interface-templates/ip/ospf/authentication/md5/key-id/node.tag/node.def
diff --git a/interface-templates/ip/ospf/authentication/md5/node.def b/interface-templates/ip/ospf/authentication/md5/node.def
new file mode 100644
index 00000000..9389c838
--- /dev/null
+++ b/interface-templates/ip/ospf/authentication/md5/node.def
@@ -0,0 +1,5 @@
+help: Set MD5 key id
+update:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
+ -c "no ip ospf authentication" -c "ip ospf authentication message-digest"
+delete:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME"
+ -c "no ip ospf authentication"
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/node.def b/interface-templates/ip/ospf/authentication/node.def
index ff352a01..ff352a01 100644
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/authentication/node.def
+++ b/interface-templates/ip/ospf/authentication/node.def
diff --git a/interface-templates/ip/ospf/authentication/plaintext-password/node.def b/interface-templates/ip/ospf/authentication/plaintext-password/node.def
new file mode 100644
index 00000000..4b31f0d8
--- /dev/null
+++ b/interface-templates/ip/ospf/authentication/plaintext-password/node.def
@@ -0,0 +1,10 @@
+type: txt
+help: Configure plain text password
+syntax:expression: pattern $VAR(@) "^[^[:space:]]{1,8}$" ; "Password must be 8 characters or less"
+update:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
+ -c "no ip ospf authentication " -c "ip ospf authentication " \
+ -c "ip ospf authentication-key $VAR(@)"
+delete:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
+ -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/interface-templates/ip/ospf/bandwidth/node.def b/interface-templates/ip/ospf/bandwidth/node.def
new file mode 100644
index 00000000..1f77079f
--- /dev/null
+++ b/interface-templates/ip/ospf/bandwidth/node.def
@@ -0,0 +1,7 @@
+type: u32
+help: Set bandwidth for specified interface (kilobits/sec)
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; "Must be between 1-10000000"
+update: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "bandwidth $VAR(@)"
+delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no bandwidth"
+comp_help: possible completions:
+ <1-10000000> Set bandwidth in kilobits/sec (for calculating OSPF cost)
diff --git a/interface-templates/ip/ospf/cost/node.def b/interface-templates/ip/ospf/cost/node.def
new file mode 100644
index 00000000..da8b545e
--- /dev/null
+++ b/interface-templates/ip/ospf/cost/node.def
@@ -0,0 +1,11 @@
+type: u32
+help: Set interface cost
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update:vyatta-vtysh -c "configure terminal" \
+ -c "interface $IFNAME" \
+ -c "ip ospf cost $VAR(@)"
+delete:vyatta-vtysh -c "configure terminal" \
+ -c "interface $IFNAME" \
+ -c "no ip ospf cost"
+comp_help: possible completions:
+ <1-65535> Set Cost
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/dead-interval/node.def b/interface-templates/ip/ospf/dead-interval/node.def
index fcc3be00..72988f9c 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/dead-interval/node.def
+++ b/interface-templates/ip/ospf/dead-interval/node.def
@@ -2,8 +2,7 @@ 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(@)\"; "
+update:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf dead-interval $VAR(@)"
+delete:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf dead-interval "; "
comp_help: possible completions:
<1-65535> Seconds (default 40)
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/hello-interval/node.def b/interface-templates/ip/ospf/hello-interval/node.def
index ae277b4c..9da68fb1 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/hello-interval/node.def
+++ b/interface-templates/ip/ospf/hello-interval/node.def
@@ -2,8 +2,7 @@ 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(@)\"; "
+update:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf hello-interval $VAR(@)"
+delete:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf hello-interval"
comp_help: possible completions:
<1-65535> Seconds (default 10)
diff --git a/interface-templates/ip/ospf/mtu-ignore/node.def b/interface-templates/ip/ospf/mtu-ignore/node.def
new file mode 100644
index 00000000..e2c897e7
--- /dev/null
+++ b/interface-templates/ip/ospf/mtu-ignore/node.def
@@ -0,0 +1,3 @@
+help: Disable Maximum Transmission Unit (MTU) mismatch detection
+create:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf mtu-ignore"
+delete:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf mtu-ignore"
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def b/interface-templates/ip/ospf/network/node.def
index 347aee8a..bac9d333 100644
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/network/node.def
+++ b/interface-templates/ip/ospf/network/node.def
@@ -2,17 +2,8 @@ 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 \"; "
-
+update:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf network $VAR(@)"
+delete:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf network"
comp_help: possible completions:
broadcast Set broadcast network type
non-broadcast Set non-broadcast network type
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/node.def b/interface-templates/ip/ospf/node.def
index 31980774..31980774 100644
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/ospf/node.def
+++ b/interface-templates/ip/ospf/node.def
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/priority/node.def b/interface-templates/ip/ospf/priority/node.def
index efd10574..152cff9a 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/priority/node.def
+++ b/interface-templates/ip/ospf/priority/node.def
@@ -2,8 +2,7 @@ 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(@)\"; "
+update:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf priority $VAR(@)"
+delete:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf priority "
comp_help: possible completions:
<0-255> Priority (default 1)
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/retransmit-interval/node.def b/interface-templates/ip/ospf/retransmit-interval/node.def
index 34651d7a..41dbe810 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/retransmit-interval/node.def
+++ b/interface-templates/ip/ospf/retransmit-interval/node.def
@@ -2,8 +2,9 @@ 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(@)\"; "
+update: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
+ -c "ip ospf retransmit-interval $VAR(@)"
+delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
+ -c "no ip ospf retransmit-interval"
comp_help: possible completions:
<3-65535> Seconds (default 5)
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/transmit-delay/node.def b/interface-templates/ip/ospf/transmit-delay/node.def
index 0b623a42..761424da 100644
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/transmit-delay/node.def
+++ b/interface-templates/ip/ospf/transmit-delay/node.def
@@ -2,8 +2,7 @@ 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(@)\"; "
+update:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip ospf transmit-delay $VAR(@)"
+delete:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip ospf transmit-delay"
comp_help: possible completions:
<1-65535> Seconds (default 1)
diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.def b/interface-templates/ip/rip/authentication/md5/node.def
index 8d165fe6..8d165fe6 100644
--- a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.def
+++ b/interface-templates/ip/rip/authentication/md5/node.def
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/md5/node.tag/node.def b/interface-templates/ip/rip/authentication/md5/node.tag/node.def
index 488acd8c..488acd8c 100644
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/md5/node.tag/node.def
+++ b/interface-templates/ip/rip/authentication/md5/node.tag/node.def
diff --git a/interface-templates/ip/rip/authentication/md5/node.tag/password/node.def b/interface-templates/ip/rip/authentication/md5/node.tag/password/node.def
new file mode 100644
index 00000000..1d675b0b
--- /dev/null
+++ b/interface-templates/ip/rip/authentication/md5/node.tag/password/node.def
@@ -0,0 +1,19 @@
+type: txt
+help: Set authentication password
+syntax:expression: pattern $VAR(@) "^[^[:space:]]{1,16}" ; "MD5 key must be 16 characters or less"
+
+update:vyatta-vtysh \
+ -c "configure terminal" -c "interface $IFNAME" \
+ -c "ip rip authentication mode md5" \
+ -c "ip rip authentication key-chain $IFNAME-rip" \
+ -c "key chain $IFNAME-rip" -c "key $VAR(../@)" \
+ -c "key-string $VAR(@)"
+
+delete:vyatta-vtysh --noerror \
+ -c "configure terminal" -c "interface $IFNAME" \
+ -c "no ip rip authentication mode md5" \
+ -c "no ip rip authentication key-chain $IFNAME-rip" \
+ -c "no key chain $IFNAME-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/interface-templates/ip/rip/authentication/node.def
index 8756de35..8756de35 100644
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/ip/rip/authentication/node.def
+++ b/interface-templates/ip/rip/authentication/node.def
diff --git a/interface-templates/ip/rip/authentication/plaintext-password/node.def b/interface-templates/ip/rip/authentication/plaintext-password/node.def
new file mode 100644
index 00000000..f4fefb78
--- /dev/null
+++ b/interface-templates/ip/rip/authentication/plaintext-password/node.def
@@ -0,0 +1,13 @@
+type: txt
+help: Set plain text password
+syntax:expression: pattern $VAR(@) "^[^[:space:]{1,16}$" ; "Password must be 16 characters or less"
+commit:expression: $VAR(../md5/) == "" ; "md5 password already set"
+
+update: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
+ -c "ip rip authentication mode text" -c "ip rip authentication string $VAR(@)";
+
+delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
+ -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/ethernet/node.tag/ip/rip/node.def b/interface-templates/ip/rip/node.def
index b01a779f..b01a779f 100644
--- a/templates/interfaces/ethernet/node.tag/ip/rip/node.def
+++ b/interface-templates/ip/rip/node.def
diff --git a/interface-templates/ip/rip/split-horizon/disable/node.def b/interface-templates/ip/rip/split-horizon/disable/node.def
new file mode 100644
index 00000000..10c57ba4
--- /dev/null
+++ b/interface-templates/ip/rip/split-horizon/disable/node.def
@@ -0,0 +1,6 @@
+help: Disable split horizon on specified interface
+create:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ip rip split-horizon "
+delete:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ip rip split-horizon " "
+
+commit:expression: ($VAR(../poison-reverse/) == ""); \
+ "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for $IFNAME"
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/node.def b/interface-templates/ip/rip/split-horizon/node.def
index ba39b616..ba39b616 100644
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/ip/rip/split-horizon/node.def
+++ b/interface-templates/ip/rip/split-horizon/node.def
diff --git a/interface-templates/ip/rip/split-horizon/poison-reverse/node.def b/interface-templates/ip/rip/split-horizon/poison-reverse/node.def
new file mode 100644
index 00000000..07cb8944
--- /dev/null
+++ b/interface-templates/ip/rip/split-horizon/poison-reverse/node.def
@@ -0,0 +1,9 @@
+help: Enable poison reverse for split-horizon
+create:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
+ -c "ip rip split-horizon poisoned-reverse"
+
+delete:vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
+ -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 $IFNAME"
diff --git a/templates/interfaces/ethernet/node.tag/ipv6/node.def b/interface-templates/ipv6/node.def
index 6ad8bff4..6ad8bff4 100644
--- a/templates/interfaces/ethernet/node.tag/ipv6/node.def
+++ b/interface-templates/ipv6/node.def
diff --git a/interface-templates/ipv6/ospfv3/cost/node.def b/interface-templates/ipv6/ospfv3/cost/node.def
new file mode 100644
index 00000000..cee09b44
--- /dev/null
+++ b/interface-templates/ipv6/ospfv3/cost/node.def
@@ -0,0 +1,7 @@
+type: u32
+help: Set interface cost
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ipv6 ospf6 cost $VAR(@)"
+delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ipv6 ospf6 cost"
+comp_help: possible completions:
+ <1-65535> Set cost
diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/dead-interval/node.def b/interface-templates/ipv6/ospfv3/dead-interval/node.def
index f870aec0..41c0e624 100644
--- a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/dead-interval/node.def
+++ b/interface-templates/ipv6/ospfv3/dead-interval/node.def
@@ -2,13 +2,9 @@ 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: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
-c "ipv6 ospf6 dead-interval $VAR(@)"
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
-c "no ipv6 ospf6 dead-interval"
comp_help: possible completions:
<1-65535> Seconds (default 40)
diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/hello-interval/node.def b/interface-templates/ipv6/ospfv3/hello-interval/node.def
index c2fa4198..81a4d624 100644
--- a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/hello-interval/node.def
+++ b/interface-templates/ipv6/ospfv3/hello-interval/node.def
@@ -2,13 +2,9 @@ type: u32
help: Set interval between hello packets
default: 10
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
-c "ipv6 ospf6 hello-interval $VAR(@)"
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
-c "no ipv6 ospf6 hello-interval"
comp_help: possible completions:
<1-65535> Seconds (default 10)
diff --git a/interface-templates/ipv6/ospfv3/ifmtu/node.def b/interface-templates/ipv6/ospfv3/ifmtu/node.def
new file mode 100644
index 00000000..c9455838
--- /dev/null
+++ b/interface-templates/ipv6/ospfv3/ifmtu/node.def
@@ -0,0 +1,7 @@
+type: u32
+help: Set interface MTU
+syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
+update: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ipv6 ospf6 ifmtu $VAR(@)"
+delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ipv6 ospf6 ifmtu"
+comp_help: possible completions:
+ <1-65535> Set interface MTU
diff --git a/interface-templates/ipv6/ospfv3/instance-id/node.def b/interface-templates/ipv6/ospfv3/instance-id/node.def
new file mode 100644
index 00000000..aab2ee2a
--- /dev/null
+++ b/interface-templates/ipv6/ospfv3/instance-id/node.def
@@ -0,0 +1,8 @@
+type: u32
+help: Set instance-id for this interface
+default: 0
+syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
+update: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ipv6 ospf6 instance-id $VAR(@)"
+delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ipv6 ospf6 instance-id"
+comp_help: possible completions:
+ <0-255> Instance Id (default 0)
diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/node.def b/interface-templates/ipv6/ospfv3/node.def
index 3e8380e6..3e8380e6 100644
--- a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/node.def
+++ b/interface-templates/ipv6/ospfv3/node.def
diff --git a/interface-templates/ipv6/ospfv3/passive/node.def b/interface-templates/ipv6/ospfv3/passive/node.def
new file mode 100644
index 00000000..a01ee538
--- /dev/null
+++ b/interface-templates/ipv6/ospfv3/passive/node.def
@@ -0,0 +1,3 @@
+help: Disable forming of adjacency on this interface
+create: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ipv6 ospf6 passive"
+delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ipv6 ospf6 passive"
diff --git a/interface-templates/ipv6/ospfv3/priority/node.def b/interface-templates/ipv6/ospfv3/priority/node.def
new file mode 100644
index 00000000..89484918
--- /dev/null
+++ b/interface-templates/ipv6/ospfv3/priority/node.def
@@ -0,0 +1,8 @@
+type: u32
+help: Set router priority
+default: 1
+syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
+update: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ipv6 ospf6 priority $VAR(@)"
+delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ipv6 ospf6 priority"
+comp_help: possible completions:
+ <0-255> Priority (default 1)
diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/retransmit-interval/node.def b/interface-templates/ipv6/ospfv3/retransmit-interval/node.def
index 5ca7b677..073294ac 100644
--- a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/retransmit-interval/node.def
+++ b/interface-templates/ipv6/ospfv3/retransmit-interval/node.def
@@ -2,13 +2,9 @@ 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: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
-c "ipv6 ospf6 retransmit-interval $VAR(@)"
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
-c "no ipv6 ospf6 retransmit-interval"
comp_help: possible completions:
<3-65535> Seconds (default 5)
diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/transmit-delay/node.def b/interface-templates/ipv6/ospfv3/transmit-delay/node.def
index cc3e67ca..a8469f57 100644
--- a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/transmit-delay/node.def
+++ b/interface-templates/ipv6/ospfv3/transmit-delay/node.def
@@ -2,13 +2,9 @@ type: u32
help: Set link state transmit delay
default: 1
syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../@)" \
+update: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
-c "ipv6 ospf6 transmit-delay $VAR(@)"
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../@)" \
+delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
-c "no ipv6 ospf6 transmit-delay"
comp_help: possible completions:
<1-65535> Seconds (default 1)
diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ripng/node.def b/interface-templates/ipv6/ripng/node.def
index d59da359..d59da359 100644
--- a/templates/interfaces/ethernet/node.tag/ipv6/ripng/node.def
+++ b/interface-templates/ipv6/ripng/node.def
diff --git a/interface-templates/ipv6/ripng/split-horizon/disable/node.def b/interface-templates/ipv6/ripng/split-horizon/disable/node.def
new file mode 100644
index 00000000..817ae8e2
--- /dev/null
+++ b/interface-templates/ipv6/ripng/split-horizon/disable/node.def
@@ -0,0 +1,6 @@
+help: Disable split horizon on specified interface
+create: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "no ipv6 ripng split-horizon"
+delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" -c "ipv6 ripng split-horizon"
+
+commit:expression: ($VAR(../poison-reverse/) == ""); \
+ "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for $IFNAME"
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/node.def b/interface-templates/ipv6/ripng/split-horizon/node.def
index ba39b616..ba39b616 100644
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/ip/rip/split-horizon/node.def
+++ b/interface-templates/ipv6/ripng/split-horizon/node.def
diff --git a/interface-templates/ipv6/ripng/split-horizon/poison-reverse/node.def b/interface-templates/ipv6/ripng/split-horizon/poison-reverse/node.def
new file mode 100644
index 00000000..8f17f99e
--- /dev/null
+++ b/interface-templates/ipv6/ripng/split-horizon/poison-reverse/node.def
@@ -0,0 +1,9 @@
+help: Enable poison reverse for split-horizon
+create: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
+ -c "ipv6 ripng split-horizon poisoned-reverse"
+
+delete: vyatta-vtysh -c "configure terminal" -c "interface $IFNAME" \
+ -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 $IFNAME"
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/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/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/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/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/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/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/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(../../../../@)"
-
diff --git a/templates/interfaces/bonding/node.tag/disable-link-detect b/templates/interfaces/bonding/node.tag/disable-link-detect
deleted file mode 120000
index 59b5fca4..00000000
--- a/templates/interfaces/bonding/node.tag/disable-link-detect
+++ /dev/null
@@ -1 +0,0 @@
-../../ethernet/node.tag/disable-link-detect \ No newline at end of file
diff --git a/templates/interfaces/bonding/node.tag/ip b/templates/interfaces/bonding/node.tag/ip
deleted file mode 120000
index 82a3eddd..00000000
--- a/templates/interfaces/bonding/node.tag/ip
+++ /dev/null
@@ -1 +0,0 @@
-../../ethernet/node.tag/ip \ No newline at end of file
diff --git a/templates/interfaces/bonding/node.tag/ipv6 b/templates/interfaces/bonding/node.tag/ipv6
deleted file mode 120000
index 5ee688a7..00000000
--- a/templates/interfaces/bonding/node.tag/ipv6
+++ /dev/null
@@ -1 +0,0 @@
-../../ethernet/node.tag/ipv6 \ No newline at end of file
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/disable-link-detect b/templates/interfaces/bonding/node.tag/vif/node.tag/disable-link-detect
deleted file mode 120000
index 17c50daa..00000000
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/disable-link-detect
+++ /dev/null
@@ -1 +0,0 @@
-../../../../ethernet/node.tag/vif/node.tag/disable-link-detect \ No newline at end of file
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/ip b/templates/interfaces/bonding/node.tag/vif/node.tag/ip
deleted file mode 120000
index 40672f0a..00000000
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/ip
+++ /dev/null
@@ -1 +0,0 @@
-../../../../ethernet/node.tag/vif/node.tag/ip \ No newline at end of file
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/ipv6 b/templates/interfaces/bonding/node.tag/vif/node.tag/ipv6
deleted file mode 120000
index d07a60a7..00000000
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/ipv6
+++ /dev/null
@@ -1 +0,0 @@
-../../../../ethernet/node.tag/vif/node.tag/ipv6 \ No newline at end of file
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/pppoe b/templates/interfaces/bonding/node.tag/vif/node.tag/pppoe
deleted file mode 120000
index 51397d10..00000000
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/pppoe
+++ /dev/null
@@ -1 +0,0 @@
-../../../../ethernet/node.tag/vif/node.tag/pppoe \ No newline at end of file
diff --git a/templates/interfaces/bridge/node.tag/disable-link-detect b/templates/interfaces/bridge/node.tag/disable-link-detect
deleted file mode 120000
index 59b5fca4..00000000
--- a/templates/interfaces/bridge/node.tag/disable-link-detect
+++ /dev/null
@@ -1 +0,0 @@
-../../ethernet/node.tag/disable-link-detect \ No newline at end of file
diff --git a/templates/interfaces/bridge/node.tag/ip b/templates/interfaces/bridge/node.tag/ip
deleted file mode 120000
index 82a3eddd..00000000
--- a/templates/interfaces/bridge/node.tag/ip
+++ /dev/null
@@ -1 +0,0 @@
-../../ethernet/node.tag/ip \ No newline at end of file
diff --git a/templates/interfaces/bridge/node.tag/ipv6 b/templates/interfaces/bridge/node.tag/ipv6
deleted file mode 120000
index 5ee688a7..00000000
--- a/templates/interfaces/bridge/node.tag/ipv6
+++ /dev/null
@@ -1 +0,0 @@
-../../ethernet/node.tag/ipv6 \ No newline at end of file
diff --git a/templates/interfaces/bridge/node.tag/vif b/templates/interfaces/bridge/node.tag/vif
deleted file mode 120000
index 4ce2e47c..00000000
--- a/templates/interfaces/bridge/node.tag/vif
+++ /dev/null
@@ -1 +0,0 @@
-../../ethernet/node.tag/vif \ No newline at end of file
diff --git a/templates/interfaces/bridge/vif/node.tag/* b/templates/interfaces/bridge/vif/node.tag/*
deleted file mode 120000
index ce99840b..00000000
--- a/templates/interfaces/bridge/vif/node.tag/*
+++ /dev/null
@@ -1 +0,0 @@
-../../../../ethernet/node.tag/vif/node.tag/* \ No newline at end of file
diff --git a/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def b/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def
deleted file mode 100644
index 83858ec1..00000000
--- a/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Set to ignore link state changes on this interface
-update:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) on
-delete:/opt/vyatta/sbin/vyatta-link-detect $VAR(../@) off
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.def
deleted file mode 100644
index 0d156a55..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def
deleted file mode 100644
index d14a2583..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/md5/node.def
deleted file mode 100644
index 341af509..00000000
--- a/templates/interfaces/ethernet/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 $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/ethernet/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/node.def
deleted file mode 100644
index ff352a01..00000000
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set OSPF interface authentication
-
diff --git a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/plaintext-password/node.def
deleted file mode 100644
index 9e522952..00000000
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,23 +0,0 @@
-type: txt
-help: Configure 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/ethernet/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/bandwidth/node.def
deleted file mode 100644
index 309d2f17..00000000
--- a/templates/interfaces/ethernet/node.tag/ip/ospf/bandwidth/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-type: u32
-help: Set bandwidth for specified interface (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/ethernet/node.tag/ip/ospf/cost/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/cost/node.def
deleted file mode 100644
index d57876cd..00000000
--- a/templates/interfaces/ethernet/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 $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/ethernet/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/dead-interval/node.def
deleted file mode 100644
index 5e4170cb..00000000
--- a/templates/interfaces/ethernet/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 $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/ethernet/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/hello-interval/node.def
deleted file mode 100644
index 885ccb43..00000000
--- a/templates/interfaces/ethernet/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 $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/ethernet/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/mtu-ignore/node.def
deleted file mode 100644
index 1bce2ca9..00000000
--- a/templates/interfaces/ethernet/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 $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/ethernet/node.tag/ip/ospf/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/node.def
deleted file mode 100644
index 31980774..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/ip/ospf/priority/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/priority/node.def
deleted file mode 100644
index 32321e3b..00000000
--- a/templates/interfaces/ethernet/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 $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/ethernet/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/retransmit-interval/node.def
deleted file mode 100644
index a325fe38..00000000
--- a/templates/interfaces/ethernet/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 $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/ethernet/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/ethernet/node.tag/ip/ospf/transmit-delay/node.def
deleted file mode 100644
index 2c64ca30..00000000
--- a/templates/interfaces/ethernet/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 $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/ethernet/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/node.def
deleted file mode 100644
index 488acd8c..00000000
--- a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication password
diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
deleted file mode 100644
index 02275ea7..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/ip/rip/authentication/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/node.def
deleted file mode 100644
index 8756de35..00000000
--- a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication method
diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/authentication/plaintext-password/node.def
deleted file mode 100644
index cdeb2523..00000000
--- a/templates/interfaces/ethernet/node.tag/ip/rip/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,22 +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 ; "
-
-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/ethernet/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/disable/node.def
deleted file mode 100644
index f40e77d1..00000000
--- a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/disable/node.def
+++ /dev/null
@@ -1,12 +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 ethernet interface $VAR(../../../../@)"
diff --git a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/node.def
deleted file mode 100644
index ba39b616..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def
deleted file mode 100644
index f608d9c3..00000000
--- a/templates/interfaces/ethernet/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ /dev/null
@@ -1,14 +0,0 @@
-help: Enable poison reverse for split-horizon
-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 ethernet interface $VAR(../../../../@)"
-
diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/cost/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/cost/node.def
deleted file mode 100644
index 939f5c5e..00000000
--- a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/cost/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-type: u32
-help: Set interface cost
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../@)" \
- -c "ipv6 ospf6 cost $VAR(@)"
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../@)" \
- -c "no ipv6 ospf6 cost"
-comp_help: possible completions:
- <1-65535> Set cost
diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/ifmtu/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/ifmtu/node.def
deleted file mode 100644
index 12c48bf3..00000000
--- a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/ifmtu/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-type: u32
-help: Set interface MTU
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../@)" \
- -c "ipv6 ospf6 ifmtu $VAR(@)"
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../@)" \
- -c "no ipv6 ospf6 ifmtu"
-comp_help: possible completions:
- <1-65535> Set interface MTU
diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/instance-id/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/instance-id/node.def
deleted file mode 100644
index 89505635..00000000
--- a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/instance-id/node.def
+++ /dev/null
@@ -1,14 +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: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../@)" \
- -c "ipv6 ospf6 instance-id $VAR(@)"
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../@)" \
- -c "no ipv6 ospf6 instance-id"
-comp_help: possible completions:
- <0-255> Instance Id (default 0)
diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/passive/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/passive/node.def
deleted file mode 100644
index 64d79e0c..00000000
--- a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/passive/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-help: Disable forming of adjacency on this interface
-create: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../@)" \
- -c "ipv6 ospf6 passive"
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../@)" \
- -c "no ipv6 ospf6 passive"
diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/priority/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/priority/node.def
deleted file mode 100644
index 1755a61d..00000000
--- a/templates/interfaces/ethernet/node.tag/ipv6/ospfv3/priority/node.def
+++ /dev/null
@@ -1,14 +0,0 @@
-type: u32
-help: Set router priority
-default: 1
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
-update: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../@)" \
- -c "ipv6 ospf6 priority $VAR(@)"
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../@)" \
- -c "no ipv6 ospf6 priority"
-comp_help: possible completions:
- <0-255> Priority (default 1)
diff --git a/templates/interfaces/ethernet/node.tag/ipv6/ripng/split-horizon/disable/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ripng/split-horizon/disable/node.def
deleted file mode 100644
index 825f24ab..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/ipv6/ripng/split-horizon/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ripng/split-horizon/node.def
deleted file mode 100644
index ba39b616..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def b/templates/interfaces/ethernet/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def
deleted file mode 100644
index e3b1663b..00000000
--- a/templates/interfaces/ethernet/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(../../../../@)"
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/node.def
deleted file mode 100644
index 624c74dc..00000000
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set interface IPv4 parameters
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def
deleted file mode 100644
index 1b70a938..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
deleted file mode 100644
index ef35f7da..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/ethernet/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/ethernet/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/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def
deleted file mode 100644
index 2814e66b..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/node.def
deleted file mode 100644
index ff352a01..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def
deleted file mode 100644
index f8432137..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def
deleted file mode 100644
index c2660d09..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/pppoe/node.tag/ip/ospf/cost/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/cost/node.def
deleted file mode 100644
index f9459d6a..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def
deleted file mode 100644
index 8edaca26..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def
deleted file mode 100644
index 93e2d7a1..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def
deleted file mode 100644
index 966566a4..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/pppoe/node.tag/ip/ospf/network/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/network/node.def
deleted file mode 100644
index 132c663a..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/pppoe/node.tag/ip/ospf/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/node.def
deleted file mode 100644
index 31980774..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/pppoe/node.tag/ip/ospf/priority/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/priority/node.def
deleted file mode 100644
index acc84ac0..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def
deleted file mode 100644
index 92884596..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def
deleted file mode 100644
index 78fd0e10..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.def
deleted file mode 100644
index e1819c01..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/node.def
deleted file mode 100644
index 488acd8c..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
deleted file mode 100644
index c7b1cfe5..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/node.def
deleted file mode 100644
index 8756de35..00000000
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication method
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def
deleted file mode 100644
index 9d147205..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/pppoe/node.tag/ip/rip/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/node.def
deleted file mode 100644
index 16241372..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def
deleted file mode 100644
index 1ca1dd11..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/node.def
deleted file mode 100644
index ba39b616..00000000
--- a/templates/interfaces/ethernet/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/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def
deleted file mode 100644
index 76b03e21..00000000
--- a/templates/interfaces/ethernet/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(../../../../@)"
-
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/node.def
deleted file mode 100644
index 6ad8bff4..00000000
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set IPv6 parameters for specified interface
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/cost/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/cost/node.def
deleted file mode 100644
index 2c653c8f..00000000
--- a/templates/interfaces/ethernet/node.tag/pppoe/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/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/ifmtu/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/ifmtu/node.def
deleted file mode 100644
index b6b84a87..00000000
--- a/templates/interfaces/ethernet/node.tag/pppoe/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/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/instance-id/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/instance-id/node.def
deleted file mode 100644
index 4df3aea7..00000000
--- a/templates/interfaces/ethernet/node.tag/pppoe/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/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/node.def
deleted file mode 100644
index 3e8380e6..00000000
--- a/templates/interfaces/ethernet/node.tag/pppoe/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/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/passive/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/ipv6/ospfv3/passive/node.def
deleted file mode 100644
index d5a43377..00000000
--- a/templates/interfaces/ethernet/node.tag/pppoe/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/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def
deleted file mode 100644
index 92222182..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Set to ignore link state changes on this interface
-update:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../@).$VAR(../@)" on
-delete:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../@).$VAR(../@)" off
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/node.def
deleted file mode 100644
index 92e252e1..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set IPv4 parameters for specified interface
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def
deleted file mode 100644
index 54628133..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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(../../../../../../@).$VAR(../../../../../@) \" \
- -c \"no ip ospf message-digest-key $VAR(@)\"; \
- rm /tmp/ospf-md5.$PPID; \
- else \
- vyatta-vtysh -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../../@).$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/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
deleted file mode 100644
index c985099d..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def
deleted file mode 100644
index 3d83feec..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/md5/node.def
deleted file mode 100644
index 8f0d87de..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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 $VAR(../../../../../@).$VAR(../../../../@) \" \
- -c \"no ip ospf authentication \" \
- -c \"ip ospf authentication message-digest\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \
- -c \"no ip ospf authentication \"; "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/node.def
deleted file mode 100644
index ff352a01..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set OSPF interface authentication
-
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
deleted file mode 100644
index 69d87f27..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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(../../../../../@).$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(../../../../../@).$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/ethernet/node.tag/vif/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/bandwidth/node.def
deleted file mode 100644
index 25ef0e1e..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/bandwidth/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Set bandwidth (kilobits/sec)
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \
- "Must be between 1-10000000"
-
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../@).$VAR(../../../@)\" \
- -c \"bandwidth $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../@).$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/ethernet/node.tag/vif/node.tag/ip/ospf/cost/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/cost/node.def
deleted file mode 100644
index bf48e818..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/cost/node.def
+++ /dev/null
@@ -1,16 +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(../../../../@).$VAR(../../../@)\" \
- -c \"ip ospf cost $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../@).$VAR(../../../@)\" \
- -c \"no ip ospf cost \"; "
-
-comp_help: possible completions:
- <1-65535> Set Cost
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/dead-interval/node.def
deleted file mode 100644
index 2ed57960..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/dead-interval/node.def
+++ /dev/null
@@ -1,17 +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(../../../../@).$VAR(../../../@)\" \
- -c \"ip ospf dead-interval $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../@).$VAR(../../../@)\" \
- -c \"no ip ospf dead-interval \"; "
-
-comp_help: possible completions:
- <1-65535> Seconds (default 40)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/hello-interval/node.def
deleted file mode 100644
index e5a0de68..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/hello-interval/node.def
+++ /dev/null
@@ -1,17 +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(../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf hello-interval $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \
- -c \"no ip ospf hello-interval \"; "
-
-comp_help: possible completions:
- <1-65535> Seconds (default 10)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/mtu-ignore/node.def
deleted file mode 100644
index 8636b767..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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 $VAR(../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf mtu-ignore\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \
- -c \"no ip ospf mtu-ignore\"; "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/network/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/network/node.def
deleted file mode 100644
index 92c0d77d..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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 $VAR(../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf network $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../@).$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/ethernet/node.tag/vif/node.tag/ip/ospf/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/node.def
deleted file mode 100644
index 31980774..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/ip/ospf/priority/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/priority/node.def
deleted file mode 100644
index 01db7f60..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/priority/node.def
+++ /dev/null
@@ -1,17 +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(../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf priority $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \
- -c \"no ip ospf priority \"; "
-
-comp_help: possible completions:
- <0-255> Priority (default 1)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/retransmit-interval/node.def
deleted file mode 100644
index 6b3c8e38..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/retransmit-interval/node.def
+++ /dev/null
@@ -1,17 +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(../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf retransmit-interval $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \
- -c \"no ip ospf retransmit-interval \"; "
-
-comp_help: possible completions:
- <3-65535> Seconds (default 5)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/transmit-delay/node.def
deleted file mode 100644
index cbb93986..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/ospf/transmit-delay/node.def
+++ /dev/null
@@ -1,17 +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(../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf transmit-delay $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../@).$VAR(../../../@) \" \
- -c \"no ip ospf transmit-delay \"; "
-
-comp_help: possible completions:
- <1-65535> Seconds (default 1)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.def
deleted file mode 100644
index 8d165fe6..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def
deleted file mode 100644
index 488acd8c..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication password
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
deleted file mode 100644
index 936801a4..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
+++ /dev/null
@@ -1,29 +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(../../../../../../@).$VAR(../../../../../@) \" \
- -c \"ip rip authentication mode md5 \" \
- -c \"ip rip authentication \
- key-chain $VAR(../../../../../../@).$VAR(../../../../../@)-rip \" \
- -c \"key chain $VAR(../../../../../../@).$VAR(../../../../../@)-rip \" \
- -c \"key $VAR(../@) \" \
- -c \"key-string $VAR(@) \" "
-
-delete:expression: "vyatta-vtysh --noerror \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../../@).$VAR(../../../../../@) \" \
- -c \"no ip rip authentication mode md5 \" \
- -c \"no ip rip authentication key-chain \
- $VAR(../../../../../../@).$VAR(../../../../../@)-rip \" \
- -c \"no \
- key chain $VAR(../../../../../../@).$VAR(../../../../../@)-rip\" "
-
-comp_help: possible completions:
- <text> MD5 Key (16 characters or less)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/node.def
deleted file mode 100644
index 8756de35..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication method
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
deleted file mode 100644
index d1f09277..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,24 +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(../../../../../@).$VAR(../../../../@)" \
- -c "ip rip authentication mode text" \
- -c "ip rip authentication string $VAR(@)"
-
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../../@).$VAR(../../../../@)" \
- -c "no ip rip authentication mode" \
- -c "no ip rip authentication string $VAR(@)"
-
-comp_help: possible completions:
- <text> Plain text password (16 characters or less)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/node.def
deleted file mode 100644
index fd6064d5..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set Routing Inforamtion Protocol (RIP) parameters for specified interface
-create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/disable/node.def
deleted file mode 100644
index d38e883e..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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(../../../../../@).$VAR(../../../../@) \" \
- -c \"no ip rip split-horizon \" "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \
- -c \"ip rip split-horizon \" "
-
-commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for ethernet Virtual InterFace $VAR(../../../../@)"
-
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/node.def
deleted file mode 100644
index ba39b616..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
deleted file mode 100644
index 24b76c23..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-help: Enable split-horizon with poison reverse
-create:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../../@) \" \
- -c \"ip rip split-horizon poisoned-reverse \" "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../@).$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 ethernet Virtual InterFace $VAR(../../../../@)"
-
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/node.def
deleted file mode 100644
index 6ad8bff4..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set IPv6 parameters for specified interface
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/cost/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/cost/node.def
deleted file mode 100644
index 7bae7638..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/cost/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-type: u32
-help: Set interface cost
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../@).$VAR(../../../@)" \
- -c "ipv6 ospf6 cost $VAR(@)"
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../@).$VAR(../../../@)" \
- -c "no ipv6 ospf6 cost"
-comp_help: possible completions:
- <1-65535> Set cost
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/dead-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/dead-interval/node.def
deleted file mode 100644
index d6967b69..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/dead-interval/node.def
+++ /dev/null
@@ -1,14 +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: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../@).$VAR(../../../@)" \
- -c "ipv6 ospf6 dead-interval $VAR(@)"
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../@).$VAR(../../../@)" \
- -c "no ipv6 ospf6 dead-interval"
-comp_help: possible completions:
- <1-65535> Seconds (default 40)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/hello-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/hello-interval/node.def
deleted file mode 100644
index 450d2b4b..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/hello-interval/node.def
+++ /dev/null
@@ -1,14 +0,0 @@
-type: u32
-help: Set interval between hello packets
-default: 10
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../@).$VAR(../../../@)" \
- -c "ipv6 ospf6 hello-interval $VAR(@)"
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../@).$VAR(../../../@)" \
- -c "no ipv6 ospf6 hello-interval"
-comp_help: possible completions:
- <1-65535> Seconds (default 10)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/ifmtu/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/ifmtu/node.def
deleted file mode 100644
index 5f66af6f..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/ifmtu/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-type: u32
-help: Set interface MTU
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../@).$VAR(../../../@)" \
- -c "ipv6 ospf6 ifmtu $VAR(@)"
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../@).$VAR(../../../@)" \
- -c "no ipv6 ospf6 ifmtu"
-comp_help: possible completions:
- <1-65535> Set interface MTU
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/instance-id/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/instance-id/node.def
deleted file mode 100644
index 9cd33f16..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/instance-id/node.def
+++ /dev/null
@@ -1,14 +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: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../@).$VAR(../../../@)" \
- -c "ipv6 ospf6 instance-id $VAR(@)"
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../@).$VAR(../../../@)" \
- -c "no ipv6 ospf6 instance-id"
-comp_help: possible completions:
- <0-255> Instance Id (default 0)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/node.def
deleted file mode 100644
index 3e8380e6..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/passive/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/passive/node.def
deleted file mode 100644
index c40b17de..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/passive/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-help: Disable forming of adjacency on this interface
-create: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../@).$VAR(../../../@)" \
- -c "ipv6 ospf6 passive"
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../@).$VAR(../../../@)" \
- -c "no ipv6 ospf6 passive"
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/priority/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/priority/node.def
deleted file mode 100644
index d459e07f..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/priority/node.def
+++ /dev/null
@@ -1,14 +0,0 @@
-type: u32
-help: Set router priority
-default: 1
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
-update: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../@).$VAR(../../../@)" \
- -c "ipv6 ospf6 priority $VAR(@)"
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../@).$VAR(../../../@)" \
- -c "no ipv6 ospf6 priority"
-comp_help: possible completions:
- <0-255> Priority (default 1)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/retransmit-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/retransmit-interval/node.def
deleted file mode 100644
index acc85823..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/retransmit-interval/node.def
+++ /dev/null
@@ -1,14 +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: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../@).$VAR(../../../@)" \
- -c "ipv6 ospf6 retransmit-interval $VAR(@)"
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../@).$VAR(../../../@)" \
- -c "no ipv6 ospf6 retransmit-interval"
-comp_help: possible completions:
- <3-65535> Seconds (default 5)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/transmit-delay/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/transmit-delay/node.def
deleted file mode 100644
index 0fc8a699..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ospfv3/transmit-delay/node.def
+++ /dev/null
@@ -1,14 +0,0 @@
-type: u32
-help: Set link state transmit delay
-default: 1
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-update: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../@).$VAR(../../../@)" \
- -c "ipv6 ospf6 transmit-delay $VAR(@)"
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../@).$VAR(../../../@)" \
- -c "no ipv6 ospf6 transmit-delay"
-comp_help: possible completions:
- <1-65535> Seconds (default 1)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ripng/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ripng/node.def
deleted file mode 100644
index d59da359..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/ipv6/ripng/split-horizon/disable/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ripng/split-horizon/disable/node.def
deleted file mode 100644
index c2dbb4f3..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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(../../../../../@).$VAR(../../../../@)" \
- -c "no ipv6 ripng split-horizon"
-
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../../@).$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/ethernet/node.tag/vif/node.tag/ipv6/ripng/split-horizon/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ripng/split-horizon/node.def
deleted file mode 100644
index ba39b616..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def
deleted file mode 100644
index dc6fc0e6..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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(../../../../../@).$VAR(../../../../@)" \
- -c "ipv6 ripng split-horizon poisoned-reverse"
-
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../../@).$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(../../../../@)"
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/node.def
deleted file mode 100644
index 624c74dc..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set interface IPv4 parameters
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.def
deleted file mode 100644
index 1b70a938..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
deleted file mode 100644
index ef35f7da..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/authentication/md5/node.def
deleted file mode 100644
index 2814e66b..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/authentication/node.def
deleted file mode 100644
index ff352a01..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/authentication/plaintext-password/node.def
deleted file mode 100644
index f8432137..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/bandwidth/node.def
deleted file mode 100644
index c2660d09..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/cost/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/cost/node.def
deleted file mode 100644
index f9459d6a..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/dead-interval/node.def
deleted file mode 100644
index 8edaca26..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/hello-interval/node.def
deleted file mode 100644
index 93e2d7a1..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/mtu-ignore/node.def
deleted file mode 100644
index 966566a4..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/network/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/network/node.def
deleted file mode 100644
index 132c663a..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/node.def
deleted file mode 100644
index 31980774..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/priority/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/priority/node.def
deleted file mode 100644
index acc84ac0..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/retransmit-interval/node.def
deleted file mode 100644
index 92884596..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/ospf/transmit-delay/node.def
deleted file mode 100644
index 78fd0e10..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.def
deleted file mode 100644
index e1819c01..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/node.def
deleted file mode 100644
index 488acd8c..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
deleted file mode 100644
index c7b1cfe5..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/authentication/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/authentication/node.def
deleted file mode 100644
index 8756de35..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/authentication/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication method
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/authentication/plaintext-password/node.def
deleted file mode 100644
index 9d147205..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/node.def
deleted file mode 100644
index 16241372..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/split-horizon/disable/node.def
deleted file mode 100644
index 1ca1dd11..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/split-horizon/node.def
deleted file mode 100644
index ba39b616..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/ip/rip/split-horizon/poison-reverse/node.def
deleted file mode 100644
index 76b03e21..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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(../../../../@)"
-
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(../../../../@)"
diff --git a/templates/interfaces/multilink/node.tag/ip b/templates/interfaces/multilink/node.tag/ip
deleted file mode 120000
index 82a3eddd..00000000
--- a/templates/interfaces/multilink/node.tag/ip
+++ /dev/null
@@ -1 +0,0 @@
-../../ethernet/node.tag/ip \ No newline at end of file
diff --git a/templates/interfaces/multilink/node.tag/ipv6 b/templates/interfaces/multilink/node.tag/ipv6
deleted file mode 120000
index 5ee688a7..00000000
--- a/templates/interfaces/multilink/node.tag/ipv6
+++ /dev/null
@@ -1 +0,0 @@
-../../ethernet/node.tag/ipv6 \ No newline at end of file
diff --git a/templates/interfaces/multilink/node.tag/vif/node.tag/disable-link-detect b/templates/interfaces/multilink/node.tag/vif/node.tag/disable-link-detect
deleted file mode 120000
index 17c50daa..00000000
--- a/templates/interfaces/multilink/node.tag/vif/node.tag/disable-link-detect
+++ /dev/null
@@ -1 +0,0 @@
-../../../../ethernet/node.tag/vif/node.tag/disable-link-detect \ No newline at end of file
diff --git a/templates/interfaces/multilink/node.tag/vif/node.tag/ip b/templates/interfaces/multilink/node.tag/vif/node.tag/ip
deleted file mode 120000
index 40672f0a..00000000
--- a/templates/interfaces/multilink/node.tag/vif/node.tag/ip
+++ /dev/null
@@ -1 +0,0 @@
-../../../../ethernet/node.tag/vif/node.tag/ip \ No newline at end of file
diff --git a/templates/interfaces/multilink/node.tag/vif/node.tag/ipv6 b/templates/interfaces/multilink/node.tag/vif/node.tag/ipv6
deleted file mode 120000
index d07a60a7..00000000
--- a/templates/interfaces/multilink/node.tag/vif/node.tag/ipv6
+++ /dev/null
@@ -1 +0,0 @@
-../../../../ethernet/node.tag/vif/node.tag/ipv6 \ No newline at end of file
diff --git a/templates/interfaces/multilink/node.tag/vif/node.tag/pppoe b/templates/interfaces/multilink/node.tag/vif/node.tag/pppoe
deleted file mode 120000
index 51397d10..00000000
--- a/templates/interfaces/multilink/node.tag/vif/node.tag/pppoe
+++ /dev/null
@@ -1 +0,0 @@
-../../../../ethernet/node.tag/vif/node.tag/pppoe \ No newline at end of file
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def
deleted file mode 100644
index 907db627..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: ignore link state changes on this interface
-update:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../../@).$VAR(../@)" on
-delete:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../../@).$VAR(../@)" off
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/node.def
deleted file mode 100644
index 92e252e1..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set IPv4 parameters for specified interface
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def
deleted file mode 100644
index c65bc8cb..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/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(../../../../../../../@).$VAR(../../../../../@) \" \
- -c \"no ip ospf message-digest-key $VAR(@)\"; \
- rm /tmp/ospf-md5.$PPID; \
- else \
- vyatta-vtysh -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../../../@).$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/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
deleted file mode 100644
index c985099d..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/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/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def
deleted file mode 100644
index 3d83feec..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/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/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/node.def
deleted file mode 100644
index f4834d9e..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/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 $VAR(../../../../../../@).$VAR(../../../../@) \" \
- -c \"no ip ospf authentication \" \
- -c \"ip ospf authentication message-digest\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
- -c \"no ip ospf authentication \"; "
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/node.def
deleted file mode 100644
index ff352a01..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set OSPF interface authentication
-
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
deleted file mode 100644
index 38113997..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/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(../../../../../../@).$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(../../../../../../@).$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/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/bandwidth/node.def
deleted file mode 100644
index 69d9c930..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/bandwidth/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Set bandwidth (kilobits/sec)
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \
- "Must be between 1-10000000"
-
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
- -c \"bandwidth $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$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/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/cost/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/cost/node.def
deleted file mode 100644
index 923a7e10..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/cost/node.def
+++ /dev/null
@@ -1,16 +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(../../../../../@).$VAR(../../../@)\" \
- -c \"ip ospf cost $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
- -c \"no ip ospf cost \"; "
-
-comp_help: possible completions:
- <1-65535> Set Cost
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/dead-interval/node.def
deleted file mode 100644
index d42350f4..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/dead-interval/node.def
+++ /dev/null
@@ -1,17 +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(../../../../../@).$VAR(../../../@)\" \
- -c \"ip ospf dead-interval $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
- -c \"no ip ospf dead-interval \"; "
-
-comp_help: possible completions:
- <1-65535> Seconds (default 40)
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/hello-interval/node.def
deleted file mode 100644
index 49f22b82..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/hello-interval/node.def
+++ /dev/null
@@ -1,17 +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(../../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf hello-interval $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
- -c \"no ip ospf hello-interval \"; "
-
-comp_help: possible completions:
- <1-65535> Seconds (default 10)
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/mtu-ignore/node.def
deleted file mode 100644
index 95a7d46e..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/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 $VAR(../../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf mtu-ignore\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
- -c \"no ip ospf mtu-ignore\"; "
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/network/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/network/node.def
deleted file mode 100644
index 8a04c078..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/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 $VAR(../../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf network $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$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/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/node.def
deleted file mode 100644
index 31980774..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/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/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/priority/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/priority/node.def
deleted file mode 100644
index c3de8ff8..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/priority/node.def
+++ /dev/null
@@ -1,17 +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(../../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf priority $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
- -c \"no ip ospf priority \"; "
-
-comp_help: possible completions:
- <0-255> Priority (default 1)
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/retransmit-interval/node.def
deleted file mode 100644
index c3fc9439..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/retransmit-interval/node.def
+++ /dev/null
@@ -1,17 +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(../../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf retransmit-interval $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
- -c \"no ip ospf retransmit-interval \"; "
-
-comp_help: possible completions:
- <3-65535> Seconds (default 5)
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/transmit-delay/node.def
deleted file mode 100644
index ff0464f0..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/transmit-delay/node.def
+++ /dev/null
@@ -1,17 +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(../../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf transmit-delay $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
- -c \"no ip ospf transmit-delay \"; "
-
-comp_help: possible completions:
- <1-65535> Seconds (default 1)
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.def
deleted file mode 100644
index 8d165fe6..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/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/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def
deleted file mode 100644
index 488acd8c..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication password
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
deleted file mode 100644
index 403b1571..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
+++ /dev/null
@@ -1,29 +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(../../../../../../../@).$VAR(../../../../../@) \" \
- -c \"ip rip authentication mode md5 \" \
- -c \"ip rip authentication \
- key-chain $VAR(../../../../../../../@).$VAR(../../../../../@)-rip \" \
- -c \"key chain $VAR(../../../../../../../@).$VAR(../../../../../@)-rip \" \
- -c \"key $VAR(../@) \" \
- -c \"key-string $VAR(@) \" "
-
-delete:expression: "vyatta-vtysh --noerror \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \
- -c \"no ip rip authentication mode md5 \" \
- -c \"no ip rip authentication key-chain \
- $VAR(../../../../../../../@).$VAR(../../../../../@)-rip \" \
- -c \"no \
- key chain $VAR(../../../../../../../@).$VAR(../../../../../@)-rip\" "
-
-comp_help: possible completions:
- <text> MD5 Key (16 characters or less)
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/node.def
deleted file mode 100644
index 8756de35..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication method
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
deleted file mode 100644
index d56e6131..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,22 +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: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \
- -c "ip rip authentication mode text" \
- -c "ip rip authentication string $VAR(@)"
-
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \
- -c "no ip rip authentication mode" \
- -c "no ip rip authentication string $VAR(@)"
-
-comp_help: possible completions:
- <text> Plain text password (16 characters or less)
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/node.def
deleted file mode 100644
index 16241372..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/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/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/disable/node.def
deleted file mode 100644
index 4079f73e..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/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(../../../../../../@).$VAR(../../../../@) \" \
- -c \"no ip rip split-horizon \" "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
- -c \"ip rip split-horizon \" "
-
-commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for serial Virtual InterFace $VAR(../../../../@)"
-
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/node.def
deleted file mode 100644
index 598c6dc5..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/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/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
deleted file mode 100644
index 49119ec2..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-help: Enable split-horizon with poison reverse
-create:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
- -c \"ip rip split-horizon poisoned-reverse \" "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../../@).$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 serial Virtual InterFace $VAR(../../../../@)"
diff --git a/templates/interfaces/serial/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/disable-link-detect/node.def
deleted file mode 100644
index e0c0b3a7..00000000
--- a/templates/interfaces/serial/node.tag/disable-link-detect/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: ignore link state changes on this interface
-update: /opt/vyatta/sbin/vyatta-link-detect $VAR(../@) off
-delete: /opt/vyatta/sbin/vyatta-link-detect $VAR(../@) on
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def
deleted file mode 100644
index 907db627..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: ignore link state changes on this interface
-update:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../../@).$VAR(../@)" on
-delete:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../../@).$VAR(../@)" off
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/node.def
deleted file mode 100644
index 92e252e1..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set IPv4 parameters for specified interface
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def
deleted file mode 100644
index c65bc8cb..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/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(../../../../../../../@).$VAR(../../../../../@) \" \
- -c \"no ip ospf message-digest-key $VAR(@)\"; \
- rm /tmp/ospf-md5.$PPID; \
- else \
- vyatta-vtysh -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../../../@).$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/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
deleted file mode 100644
index c985099d..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/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/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def
deleted file mode 100644
index 3d83feec..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/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/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/node.def
deleted file mode 100644
index f4834d9e..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/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 $VAR(../../../../../../@).$VAR(../../../../@) \" \
- -c \"no ip ospf authentication \" \
- -c \"ip ospf authentication message-digest\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
- -c \"no ip ospf authentication \"; "
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/node.def
deleted file mode 100644
index ff352a01..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set OSPF interface authentication
-
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
deleted file mode 100644
index 38113997..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/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(../../../../../../@).$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(../../../../../../@).$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/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/bandwidth/node.def
deleted file mode 100644
index 69d9c930..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/bandwidth/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Set bandwidth (kilobits/sec)
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \
- "Must be between 1-10000000"
-
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
- -c \"bandwidth $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$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/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/cost/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/cost/node.def
deleted file mode 100644
index 923a7e10..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/cost/node.def
+++ /dev/null
@@ -1,16 +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(../../../../../@).$VAR(../../../@)\" \
- -c \"ip ospf cost $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
- -c \"no ip ospf cost \"; "
-
-comp_help: possible completions:
- <1-65535> Set Cost
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/dead-interval/node.def
deleted file mode 100644
index d42350f4..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/dead-interval/node.def
+++ /dev/null
@@ -1,17 +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(../../../../../@).$VAR(../../../@)\" \
- -c \"ip ospf dead-interval $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
- -c \"no ip ospf dead-interval \"; "
-
-comp_help: possible completions:
- <1-65535> Seconds (default 40)
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/hello-interval/node.def
deleted file mode 100644
index 49f22b82..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/hello-interval/node.def
+++ /dev/null
@@ -1,17 +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(../../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf hello-interval $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
- -c \"no ip ospf hello-interval \"; "
-
-comp_help: possible completions:
- <1-65535> Seconds (default 10)
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/mtu-ignore/node.def
deleted file mode 100644
index 95a7d46e..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/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 $VAR(../../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf mtu-ignore\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
- -c \"no ip ospf mtu-ignore\"; "
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/network/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/network/node.def
deleted file mode 100644
index 8a04c078..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/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 $VAR(../../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf network $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$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/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/node.def
deleted file mode 100644
index 31980774..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/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/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/priority/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/priority/node.def
deleted file mode 100644
index c3de8ff8..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/priority/node.def
+++ /dev/null
@@ -1,17 +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(../../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf priority $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
- -c \"no ip ospf priority \"; "
-
-comp_help: possible completions:
- <0-255> Priority (default 1)
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/retransmit-interval/node.def
deleted file mode 100644
index c3fc9439..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/retransmit-interval/node.def
+++ /dev/null
@@ -1,17 +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(../../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf retransmit-interval $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
- -c \"no ip ospf retransmit-interval \"; "
-
-comp_help: possible completions:
- <3-65535> Seconds (default 5)
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/transmit-delay/node.def
deleted file mode 100644
index ff0464f0..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/transmit-delay/node.def
+++ /dev/null
@@ -1,17 +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(../../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf transmit-delay $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
- -c \"no ip ospf transmit-delay \"; "
-
-comp_help: possible completions:
- <1-65535> Seconds (default 1)
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.def
deleted file mode 100644
index 8d165fe6..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/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/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def
deleted file mode 100644
index 488acd8c..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication password
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
deleted file mode 100644
index 403b1571..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
+++ /dev/null
@@ -1,29 +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(../../../../../../../@).$VAR(../../../../../@) \" \
- -c \"ip rip authentication mode md5 \" \
- -c \"ip rip authentication \
- key-chain $VAR(../../../../../../../@).$VAR(../../../../../@)-rip \" \
- -c \"key chain $VAR(../../../../../../../@).$VAR(../../../../../@)-rip \" \
- -c \"key $VAR(../@) \" \
- -c \"key-string $VAR(@) \" "
-
-delete:expression: "vyatta-vtysh --noerror \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \
- -c \"no ip rip authentication mode md5 \" \
- -c \"no ip rip authentication key-chain \
- $VAR(../../../../../../../@).$VAR(../../../../../@)-rip \" \
- -c \"no \
- key chain $VAR(../../../../../../../@).$VAR(../../../../../@)-rip\" "
-
-comp_help: possible completions:
- <text> MD5 Key (16 characters or less)
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/node.def
deleted file mode 100644
index 8756de35..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication method
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
deleted file mode 100644
index 55bf6159..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,24 +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(../../../../../../@).$VAR(../../../../@)" \
- -c "ip rip authentication mode text" \
- -c "ip rip authentication string $VAR(@)"
-
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \
- -c "no ip rip authentication mode" \
- -c "no ip rip authentication string $VAR(@)"
-
-comp_help: possible completions:
- <text> Plain text password (16 characters or less)
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/node.def
deleted file mode 100644
index 16241372..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/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/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/disable/node.def
deleted file mode 100644
index 4079f73e..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/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(../../../../../../@).$VAR(../../../../@) \" \
- -c \"no ip rip split-horizon \" "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
- -c \"ip rip split-horizon \" "
-
-commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for serial Virtual InterFace $VAR(../../../../@)"
-
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/node.def
deleted file mode 100644
index a013a2bb..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set to control split horizon parameters on this interface
-
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
deleted file mode 100644
index 49119ec2..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-help: Enable split-horizon with poison reverse
-create:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
- -c \"ip rip split-horizon poisoned-reverse \" "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../../@).$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 serial Virtual InterFace $VAR(../../../../@)"
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def
deleted file mode 100644
index eecd80ba..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: ignore link state changes on this interface
-update:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../../@).$VAR(../@)" on
-delete:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../@).$VAR(../@)" off
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/node.def
deleted file mode 100644
index 92e252e1..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set IPv4 parameters for specified interface
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def
deleted file mode 100644
index c65bc8cb..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/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(../../../../../../../@).$VAR(../../../../../@) \" \
- -c \"no ip ospf message-digest-key $VAR(@)\"; \
- rm /tmp/ospf-md5.$PPID; \
- else \
- vyatta-vtysh -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../../../@).$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/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
deleted file mode 100644
index c985099d..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/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/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def
deleted file mode 100644
index 3d83feec..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/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/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/node.def
deleted file mode 100644
index f4834d9e..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/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 $VAR(../../../../../../@).$VAR(../../../../@) \" \
- -c \"no ip ospf authentication \" \
- -c \"ip ospf authentication message-digest\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
- -c \"no ip ospf authentication \"; "
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/node.def
deleted file mode 100644
index ff352a01..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set OSPF interface authentication
-
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
deleted file mode 100644
index 38113997..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/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(../../../../../../@).$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(../../../../../../@).$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/serial/node.tag/ppp/vif/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/bandwidth/node.def
deleted file mode 100644
index 69d9c930..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/bandwidth/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Set bandwidth (kilobits/sec)
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \
- "Must be between 1-10000000"
-
-update:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
- -c \"bandwidth $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$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/serial/node.tag/ppp/vif/node.tag/ip/ospf/cost/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/cost/node.def
deleted file mode 100644
index 923a7e10..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/cost/node.def
+++ /dev/null
@@ -1,16 +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(../../../../../@).$VAR(../../../@)\" \
- -c \"ip ospf cost $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
- -c \"no ip ospf cost \"; "
-
-comp_help: possible completions:
- <1-65535> Set Cost
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/dead-interval/node.def
deleted file mode 100644
index d42350f4..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/dead-interval/node.def
+++ /dev/null
@@ -1,17 +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(../../../../../@).$VAR(../../../@)\" \
- -c \"ip ospf dead-interval $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
- -c \"no ip ospf dead-interval \"; "
-
-comp_help: possible completions:
- <1-65535> Seconds (default 40)
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/hello-interval/node.def
deleted file mode 100644
index 49f22b82..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/hello-interval/node.def
+++ /dev/null
@@ -1,17 +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(../../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf hello-interval $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
- -c \"no ip ospf hello-interval \"; "
-
-comp_help: possible completions:
- <1-65535> Seconds (default 10)
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/mtu-ignore/node.def
deleted file mode 100644
index 95a7d46e..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/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 $VAR(../../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf mtu-ignore\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
- -c \"no ip ospf mtu-ignore\"; "
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/network/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/network/node.def
deleted file mode 100644
index 8a04c078..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/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 $VAR(../../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf network $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$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/serial/node.tag/ppp/vif/node.tag/ip/ospf/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/node.def
deleted file mode 100644
index 31980774..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/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/serial/node.tag/ppp/vif/node.tag/ip/ospf/priority/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/priority/node.def
deleted file mode 100644
index c3de8ff8..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/priority/node.def
+++ /dev/null
@@ -1,17 +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(../../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf priority $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
- -c \"no ip ospf priority \"; "
-
-comp_help: possible completions:
- <0-255> Priority (default 1)
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/retransmit-interval/node.def
deleted file mode 100644
index c3fc9439..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/retransmit-interval/node.def
+++ /dev/null
@@ -1,17 +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(../../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf retransmit-interval $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
- -c \"no ip ospf retransmit-interval \"; "
-
-comp_help: possible completions:
- <3-65535> Seconds (default 5)
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/transmit-delay/node.def
deleted file mode 100644
index ff0464f0..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/transmit-delay/node.def
+++ /dev/null
@@ -1,17 +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(../../../../../@).$VAR(../../../@) \" \
- -c \"ip ospf transmit-delay $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal\" \
- -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
- -c \"no ip ospf transmit-delay \"; "
-
-comp_help: possible completions:
- <1-65535> Seconds (default 1)
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.def
deleted file mode 100644
index 8d165fe6..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/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/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def
deleted file mode 100644
index 488acd8c..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication password
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
deleted file mode 100644
index 403b1571..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
+++ /dev/null
@@ -1,29 +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(../../../../../../../@).$VAR(../../../../../@) \" \
- -c \"ip rip authentication mode md5 \" \
- -c \"ip rip authentication \
- key-chain $VAR(../../../../../../../@).$VAR(../../../../../@)-rip \" \
- -c \"key chain $VAR(../../../../../../../@).$VAR(../../../../../@)-rip \" \
- -c \"key $VAR(../@) \" \
- -c \"key-string $VAR(@) \" "
-
-delete:expression: "vyatta-vtysh --noerror \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \
- -c \"no ip rip authentication mode md5 \" \
- -c \"no ip rip authentication key-chain \
- $VAR(../../../../../../../@).$VAR(../../../../../@)-rip \" \
- -c \"no \
- key chain $VAR(../../../../../../../@).$VAR(../../../../../@)-rip\" "
-
-comp_help: possible completions:
- <text> MD5 Key (16 characters or less)
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/node.def
deleted file mode 100644
index 8756de35..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication method
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
deleted file mode 100644
index 596613ec..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,24 +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 ; "
-
-commit:expression: $VAR(../md5/) == "" ; "md5 password already set"
-
-update: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \
- -c "ip rip authentication mode text" \
- -c "ip rip authentication string $VAR(@)"
-
-delete: vyatta-vtysh \
- -c "configure terminal" \
- -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \
- -c "no ip rip authentication mode" \
- -c "no ip rip authentication string $VAR(@)"
-
-comp_help: possible completions:
- <text> Plain text password (16 characters or less)
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/node.def
deleted file mode 100644
index 16241372..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/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/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/disable/node.def
deleted file mode 100644
index 3c4def9e..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/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(../../../../../../@).$VAR(../../../../@) \" \
- -c \"no ip rip split-horizon \" "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
- -c \"ip rip split-horizon \" "
-
-commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for serial Virtual InterFace $VAR(../../../../@)"
-
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/node.def
deleted file mode 100644
index a013a2bb..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set to control split horizon parameters on this interface
-
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
deleted file mode 100644
index 49119ec2..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-help: Enable split-horizon with poison reverse
-create:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
- -c \"ip rip split-horizon poisoned-reverse \" "
-
-delete:expression: "vyatta-vtysh \
- -c \"configure terminal \" \
- -c \"interface $VAR(../../../../../../@).$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 serial Virtual InterFace $VAR(../../../../@)"
diff --git a/templates/interfaces/tunnel/node.tag/ip b/templates/interfaces/tunnel/node.tag/ip
deleted file mode 120000
index 82a3eddd..00000000
--- a/templates/interfaces/tunnel/node.tag/ip
+++ /dev/null
@@ -1 +0,0 @@
-../../ethernet/node.tag/ip \ No newline at end of file
diff --git a/templates/interfaces/tunnel/node.tag/ipv6 b/templates/interfaces/tunnel/node.tag/ipv6
deleted file mode 120000
index 5ee688a7..00000000
--- a/templates/interfaces/tunnel/node.tag/ipv6
+++ /dev/null
@@ -1 +0,0 @@
-../../ethernet/node.tag/ipv6 \ No newline at end of file
diff --git a/templates/interfaces/wirelessmodem/node.tag/disable-link-detect b/templates/interfaces/wirelessmodem/node.tag/disable-link-detect
deleted file mode 120000
index 59b5fca4..00000000
--- a/templates/interfaces/wirelessmodem/node.tag/disable-link-detect
+++ /dev/null
@@ -1 +0,0 @@
-../../ethernet/node.tag/disable-link-detect \ No newline at end of file
diff --git a/templates/interfaces/wirelessmodem/node.tag/ip b/templates/interfaces/wirelessmodem/node.tag/ip
deleted file mode 120000
index 82a3eddd..00000000
--- a/templates/interfaces/wirelessmodem/node.tag/ip
+++ /dev/null
@@ -1 +0,0 @@
-../../ethernet/node.tag/ip \ No newline at end of file
diff --git a/templates/interfaces/wirelessmodem/node.tag/ipv6 b/templates/interfaces/wirelessmodem/node.tag/ipv6
deleted file mode 120000
index 5ee688a7..00000000
--- a/templates/interfaces/wirelessmodem/node.tag/ipv6
+++ /dev/null
@@ -1 +0,0 @@
-../../ethernet/node.tag/ipv6 \ No newline at end of file