Remove VXLAN templates that are supposed to be generated.

69 files changed, 0 insertions, 617 deletions

diff --git a/templates/interfaces/vxlan/node.tag/ip/disable-arp-filter/node.def b/templates/interfaces/vxlan/node.tag/ip/disable-arp-filter/node.def
deleted file mode 100644
index 435998f7..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/disable-arp-filter/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Disable arp-filter on this interface
-create:expression: "sudo sh -c \"echo 0 > /proc/sys/net/ipv4/conf/$VAR(../../@)/arp_filter\" "
-delete:expression: "sudo sh -c \"echo 1 > /proc/sys/net/ipv4/conf/$VAR(../../@)/arp_filter\" "
diff --git a/templates/interfaces/vxlan/node.tag/ip/enable-arp-accept/node.def b/templates/interfaces/vxlan/node.tag/ip/enable-arp-accept/node.def
deleted file mode 100644
index 6ae32491..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/enable-arp-accept/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Enable arp-accept on this interface
-create:expression: "sudo sh -c \"echo 1 > /proc/sys/net/ipv4/conf/$VAR(../../@)/arp_accept\" "
-delete:expression: "sudo sh -c \"echo 0 > /proc/sys/net/ipv4/conf/$VAR(../../@)/arp_accept\" "
diff --git a/templates/interfaces/vxlan/node.tag/ip/enable-arp-announce/node.def b/templates/interfaces/vxlan/node.tag/ip/enable-arp-announce/node.def
deleted file mode 100644
index 7471e799..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/enable-arp-announce/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Enable arp-announce on this interface
-create:expression: "sudo sh -c \"echo 1 > /proc/sys/net/ipv4/conf/$VAR(../../@)/arp_announce\" "
-delete:expression: "sudo sh -c \"echo 0 > /proc/sys/net/ipv4/conf/$VAR(../../@)/arp_announce\" "
diff --git a/templates/interfaces/vxlan/node.tag/ip/enable-arp-ignore/node.def b/templates/interfaces/vxlan/node.tag/ip/enable-arp-ignore/node.def
deleted file mode 100644
index b3ab0a56..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/enable-arp-ignore/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Enable arp-ignore on this interface
-create:expression: "sudo sh -c \"echo 1 > /proc/sys/net/ipv4/conf/$VAR(../../@)/arp_ignore\" "
-delete:expression: "sudo sh -c \"echo 0 > /proc/sys/net/ipv4/conf/$VAR(../../@)/arp_ignore\" "
diff --git a/templates/interfaces/vxlan/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/vxlan/node.tag/ip/ospf/authentication/md5/key-id/node.def
deleted file mode 100644
index bc47e563..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/ospf/authentication/md5/key-id/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-tag:
-type: u32
-help: MD5 key id
-
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)"
-val_help: u32:1-255; MD5 key id
-
-commit:expression: $VAR(md5-key/) != ""; \
-       "Must add the md5-key for key-id $VAR(@)"
-
diff --git a/templates/interfaces/vxlan/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/vxlan/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
deleted file mode 100644
index bb8bed21..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
+++ /dev/null
@@ -1,20 +0,0 @@
-type: txt
-help: MD5 key
-syntax:expression: pattern $VAR(@) "^[^[:space:]]{1,16}$"; "MD5 key must be 16 characters or less"
-val_help: MD5 Key (16 characters or less)
-
-# If this node is created 
-create:
-	vtysh -c "configure terminal" -c "interface $VAR(../../../../../../@)" \
-             -c "ip ospf message-digest-key $VAR(../@) md5 $VAR(@)"
-
-# If the value of this node is changed
-update:
-	vtysh -c "configure terminal" -c "interface $VAR(../../../../../../@)" \
-             -c "no ip ospf message-digest-key $VAR(../@)" \
-             -c "ip ospf message-digest-key $VAR(../@) md5 $VAR(@)"
-
-# If this node is deleted
-delete:
-        vtysh -c "configure terminal" -c "interface $VAR(../../../../../../@)" \
-             -c "no ip ospf message-digest-key $VAR(../@)"
diff --git a/templates/interfaces/vxlan/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/vxlan/node.tag/ip/ospf/authentication/md5/node.def
deleted file mode 100644
index a31bd2ec..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/ospf/authentication/md5/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-help: MD5 parameters
-
-create: vtysh -c "configure terminal" \
-	-c "interface $VAR(../../../../@)" \
-	-c "no ip ospf authentication" \
-	-c "ip ospf authentication message-digest"
-
-delete: vtysh -c "configure terminal" \
-	-c "interface $VAR(../../../../@)" \
-        -c "no ip ospf authentication"
diff --git a/templates/interfaces/vxlan/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/vxlan/node.tag/ip/ospf/authentication/node.def
deleted file mode 100644
index abf04eab..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/ospf/authentication/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: OSPF interface authentication
-
diff --git a/templates/interfaces/vxlan/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/vxlan/node.tag/ip/ospf/authentication/plaintext-password/node.def
deleted file mode 100644
index a2ba2f71..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/ospf/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: txt
-help: Plain text password
-syntax:expression: pattern $VAR(@) "^[^[:space:]]{1,8}$" ; "Password must be 8 characters or less"
-val_help: Plain text password (8 characters or less)
-
-update:vtysh -c "configure terminal" -c "interface $VAR(../../../../@)" \
-	 -c "no ip ospf authentication " -c "ip ospf authentication " \
-	 -c "ip ospf authentication-key $VAR(@)"
-delete:vtysh -c "configure terminal" -c "interface $VAR(../../../../@)" \
-	 -c "no ip ospf authentication " -c "no ip ospf authentication-key"
diff --git a/templates/interfaces/vxlan/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/vxlan/node.tag/ip/ospf/bandwidth/node.def
deleted file mode 100644
index 30a6db86..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/ospf/bandwidth/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: u32
-help: Bandwidth of interface (kilobits/sec)
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; "Must be between 1-10000000"
-val_help: u32:1-10000000; Bandwidth in kilobits/sec (for calculating OSPF cost)
-
-update: vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "bandwidth $VAR(@)" 
-delete: vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "no bandwidth" 
diff --git a/templates/interfaces/vxlan/node.tag/ip/ospf/cost/node.def b/templates/interfaces/vxlan/node.tag/ip/ospf/cost/node.def
deleted file mode 100644
index 9de07739..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/ospf/cost/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-type: u32
-help: Interface cost
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-val_help: u32:1-65535; OSPF interface cost
-
-update:vtysh -c "configure terminal" \
-	-c "interface $VAR(../../../@)" \
-	-c "ip ospf cost $VAR(@)"
-delete:vtysh -c "configure terminal" \
-	-c "interface $VAR(../../../@)" \
-	-c "no ip ospf cost"
diff --git a/templates/interfaces/vxlan/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/vxlan/node.tag/ip/ospf/dead-interval/node.def
deleted file mode 100644
index 434ab8d1..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/ospf/dead-interval/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: u32
-help: Interval after which neighbor is dead
-default: 40
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-val_help: u32:1-65535; OSPF dead interval in seconds (default 40)
-
-update:vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "ip ospf dead-interval $VAR(@)"
-delete:vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "no ip ospf dead-interval"
diff --git a/templates/interfaces/vxlan/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/vxlan/node.tag/ip/ospf/hello-interval/node.def
deleted file mode 100644
index 4178c082..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/ospf/hello-interval/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: u32
-help: Interval between hello packets
-default: 10
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-val_help: u32:1-65535; Interval between OSPF hello packets in seconds (default 10)
-
-update:vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "ip ospf hello-interval $VAR(@)"
-delete:vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "no ip ospf hello-interval"
diff --git a/templates/interfaces/vxlan/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/vxlan/node.tag/ip/ospf/mtu-ignore/node.def
deleted file mode 100644
index 15518da6..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/ospf/mtu-ignore/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Disable Maximum Transmission Unit (MTU) mismatch detection
-create:vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "ip ospf mtu-ignore"
-delete:vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "no ip ospf mtu-ignore"
diff --git a/templates/interfaces/vxlan/node.tag/ip/ospf/network/node.def b/templates/interfaces/vxlan/node.tag/ip/ospf/network/node.def
deleted file mode 100644
index ce36466f..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/ospf/network/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-type: txt
-help: 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:vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "ip ospf network $VAR(@)"
-delete:vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "no ip ospf network"
-
-val_help: broadcast; Broadcast network type
-val_help: non-broadcast; Non-broadcast network type
-val_help: point-to-multipoint; Point-to-multipoint network type
-val_help: point-to-point; Point-to-point network type
diff --git a/templates/interfaces/vxlan/node.tag/ip/ospf/node.def b/templates/interfaces/vxlan/node.tag/ip/ospf/node.def
deleted file mode 100644
index 8eaece24..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/ospf/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Open Shortest Path First (OSPF) parameters
diff --git a/templates/interfaces/vxlan/node.tag/ip/ospf/priority/node.def b/templates/interfaces/vxlan/node.tag/ip/ospf/priority/node.def
deleted file mode 100644
index c4a13909..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/ospf/priority/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: u32
-help: Router priority
-default: 1
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
-val_help: u32:0-255; Priority (default 1)
-
-update:vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "ip ospf priority $VAR(@)"
-delete:vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "no ip ospf priority"
diff --git a/templates/interfaces/vxlan/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/vxlan/node.tag/ip/ospf/retransmit-interval/node.def
deleted file mode 100644
index 6df594fb..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/ospf/retransmit-interval/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: u32
-help: Interval between retransmitting lost link state advertisements
-default: 5
-syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
-val_help: u32: 3-65535; Retransmit interval in seconds (default 5)
-
-update: vtysh -c "configure terminal" -c "interface $VAR(../../../@)" \
-	-c "ip ospf retransmit-interval $VAR(@)"
-delete: vtysh -c "configure terminal" -c "interface $VAR(../../../@)" \
-	-c "no ip ospf retransmit-interval"
diff --git a/templates/interfaces/vxlan/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/vxlan/node.tag/ip/ospf/transmit-delay/node.def
deleted file mode 100644
index 0785ce54..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/ospf/transmit-delay/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: u32
-help: Link state transmit delay
-default: 1
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-val_help: u32:1-65535; Transmit delay in seconds (default 1)
-
-update:vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "ip ospf transmit-delay $VAR(@)"
-delete:vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "no ip ospf transmit-delay"
diff --git a/templates/interfaces/vxlan/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/vxlan/node.tag/ip/rip/authentication/md5/node.def
deleted file mode 100644
index ad45eb1b..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/rip/authentication/md5/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-tag:
-type: u32
-help: MD5 authentication parameters
-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/vxlan/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/vxlan/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
deleted file mode 100644
index 5af81f70..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: txt
-help: Authentication password
-syntax:expression: pattern $VAR(@) "^[^[:space:]]{1,16}$" ; "MD5 key must be 16 characters or less"
-val_help: MD5 Key (16 characters or less)
-
-update: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: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"
diff --git a/templates/interfaces/vxlan/node.tag/ip/rip/authentication/node.def b/templates/interfaces/vxlan/node.tag/ip/rip/authentication/node.def
deleted file mode 100644
index 22039cf7..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/rip/authentication/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Authentication method
diff --git a/templates/interfaces/vxlan/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/vxlan/node.tag/ip/rip/authentication/plaintext-password/node.def
deleted file mode 100644
index 747da810..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/rip/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-type: txt
-help: 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"
-val_help: Password (16 characters or less)
-
-update: vtysh -c "configure terminal" -c "interface $VAR(../../../../@)" \
-	-c "ip rip authentication mode text" \
-	-c "ip rip authentication string $VAR(@)"
-
-delete: vtysh -c "configure terminal" -c "interface $VAR(../../../../@)" \
-	-c "no ip rip authentication mode" \
-	-c "no ip rip authentication string $VAR(@)"
diff --git a/templates/interfaces/vxlan/node.tag/ip/rip/node.def b/templates/interfaces/vxlan/node.tag/ip/rip/node.def
deleted file mode 100644
index d6a4eb34..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/rip/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Routing Information Protocol (RIP)
diff --git a/templates/interfaces/vxlan/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/vxlan/node.tag/ip/rip/split-horizon/disable/node.def
deleted file mode 100644
index eb231e35..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/rip/split-horizon/disable/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-help: Disable split horizon on specified interface
-create: vtysh -c "configure terminal" -c "interface $VAR(../../../../@)" \
-    -c "no ip rip split-horizon"
-delete: 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 $VAR(../../../../@)"
diff --git a/templates/interfaces/vxlan/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/vxlan/node.tag/ip/rip/split-horizon/node.def
deleted file mode 100644
index c4fb5ddc..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/rip/split-horizon/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Split horizon parameters
diff --git a/templates/interfaces/vxlan/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/vxlan/node.tag/ip/rip/split-horizon/poison-reverse/node.def
deleted file mode 100644
index 7ae46127..00000000
--- a/templates/interfaces/vxlan/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-help: Enable poison reverse for split-horizon
-create:vtysh -c "configure terminal" -c "interface $VAR(../../../../@)" \
-       -c "ip rip split-horizon poisoned-reverse"
-
-delete: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 $VAR(../../../../@)"
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/address/autoconf/node.def b/templates/interfaces/vxlan/node.tag/ipv6/address/autoconf/node.def
deleted file mode 100644
index 9beeb3d8..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/address/autoconf/node.def
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# This is a valueless node, hence has no type associated with it.
-#
-
-help: Enable acquisition of IPv6 address using stateless autoconfig
-
-update:
-	if [ -e /proc/sys/net/ipv6/conf/$VAR(../../../@)/autoconf ]; then
-	    echo "Enabling address auto-configuration for $VAR(../../../@)"
-	    sudo sh -c "echo 1 > /proc/sys/net/ipv6/conf/$VAR(../../../@)/autoconf"
-	    forwarding=`cat /proc/sys/net/ipv6/conf/$VAR(../../../@)/forwarding`
-	    if [ $forwarding = 1 ]; then
-		echo "Warning: IPv6 forwarding is currently enabled."
-		echo "         IPv6 address auto-configuration will not be performed"
-                echo "         unless IPv6 forwarding is disabled."
-	    fi
-	else
-	    echo "Address auto-configuration will be enabled when interface comes up."
-	fi
-
-delete:
-	if [ -e /proc/sys/net/ipv6/conf/$VAR(../../../@)/autoconf ]; then
-	    sudo sh -c "echo 0 > /proc/sys/net/ipv6/conf/$VAR(../../../@)/autoconf"
-	else
-	    echo "Address auto-configuration will be disabled when interface comes up."
-	fi
-
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/address/eui64/node.def b/templates/interfaces/vxlan/node.tag/ipv6/address/eui64/node.def
deleted file mode 100644
index c28bd55f..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/address/eui64/node.def
+++ /dev/null
@@ -1,15 +0,0 @@
-multi:
-type: ipv6net
-help: Assign IPv6 address using EUI-64 based on MAC address
-
-val_help: <h:h:h:h/64>; 64-bit IPv6 prefix to use with EUI-64 to make address
-
-create:
-	if [ -e /proc/sys/net/ipv6/conf/$VAR(../../../@) ]; then
-	    sudo /opt/vyatta/sbin/vyatta-ipv6-eui64.pl --create $VAR(../../../@) $VAR(@)
-	else
-	    echo "EUI-64 based address will be assigned when interface comes up."
-	fi
-
-delete:
-	sudo /opt/vyatta/sbin/vyatta-ipv6-eui64.pl --delete $VAR(../../../@) $VAR(@)
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/address/node.def b/templates/interfaces/vxlan/node.tag/ipv6/address/node.def
deleted file mode 100644
index 26064025..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/address/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: IPv6 address auto-configuration modes
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/disable-forwarding/node.def b/templates/interfaces/vxlan/node.tag/ipv6/disable-forwarding/node.def
deleted file mode 100644
index cc76d2cf..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/disable-forwarding/node.def
+++ /dev/null
@@ -1,31 +0,0 @@
-
-help: Disable IPv6 forwarding on this interface only
-
-create:
-	procfile=/proc/sys/net/ipv6/conf/$VAR(../../@)/forwarding
-	if [ -e $procfile ]; then
-	    echo "Disabling IPv6 forwarding for $VAR(../../@)"
-	    sudo sh -c "echo 0 > $procfile"
-	else
-	    echo "IPv6 forwarding will be disabled when $VAR(../../@) comes up"
-	fi
-	touch /var/run/vyatta/ipv6_no_fwd.$VAR(../../@)
-
-delete:
-	procfile=/proc/sys/net/ipv6/conf/$VAR(../../@)/forwarding
-	if [ -e $procfile ]; then
-	    # Only re-enable forwarding if global disable-forwarding switch
-	    # is not set.
-	    global=`cat /proc/sys/net/ipv6/conf/default/forwarding`
-	    if [ "$global" = "1" ]; then
-		echo "Re-enabling IPv6 forwarding for $VAR(../../@)"
-		sudo sh -c "echo 1 > /proc/sys/net/ipv6/conf/$VAR(../../@)/forwarding"
-	    else
-		echo "Not re-enabling IPv6 forwarding for $VAR(../../@) because it is still" 
-		echo "globally disabled."
-	    fi
-	else
-	    echo "IPv6 forwarding will be re-enabled when $VAR(../../@) comes up"
-	fi
-	rm /var/run/vyatta/ipv6_no_fwd.$VAR(../../@)
-
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/dup-addr-detect-transmits/node.def b/templates/interfaces/vxlan/node.tag/ipv6/dup-addr-detect-transmits/node.def
deleted file mode 100644
index fa9e57b5..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/dup-addr-detect-transmits/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Number of NS messages to send while performing DAD
-
-val_help: <1-N>; Number of NS messages to send while performing DAD
-val_help: 0; Disable Duplicate Address Dectection (DAD)
-
-default: 1
-
-syntax:expression: ($VAR(@) >= 0) ; "Value must be >= 0"
-
-update:
-        procfile=/proc/sys/net/ipv6/conf/$VAR(../../@)/dad_transmits
-        if [ -e $procfile ]; then
-            sudo sh -c "echo $VAR(@) > $procfile"
-        else
-            echo "Will set dup_addr_detect_transmits when $VAR(../../@) comes up"
-        fi
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/node.def b/templates/interfaces/vxlan/node.tag/ipv6/node.def
deleted file mode 100644
index 539673c9..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: IPv6 routing parameters
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/cost/node.def b/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/cost/node.def
deleted file mode 100644
index a40e2a60..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/cost/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: u32
-help: Interface cost
-default: 1
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-val_help: u32:1-65535; OSPFv3 cost
-
-update: vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "ipv6 ospf6 cost $VAR(@)"
-
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/dead-interval/node.def b/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/dead-interval/node.def
deleted file mode 100644
index 5bac9d1c..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/dead-interval/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: u32
-help: Interval after which neighbor is declared dead
-default: 40
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-val_help: u32:1-65535; Neighbor dead interval in seconds (default 40)
-
-update: vtysh -c "configure terminal" -c "interface $VAR(../../../@)" \
-          -c "ipv6 ospf6 dead-interval $VAR(@)"
-delete: vtysh -c "configure terminal" -c "interface $VAR(../../../@)" \
-          -c "ipv6 ospf6 dead-interval 40"
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/hello-interval/node.def b/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/hello-interval/node.def
deleted file mode 100644
index 165dc10b..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/hello-interval/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: u32
-help: Interval between hello packets
-default: 10
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-val_help: u32:1-65535; Interval between OSPFv3 hello packets in seconds (default 10)
-
-update: vtysh -c "configure terminal" -c "interface $VAR(../../../@)" \
-          -c "ipv6 ospf6 hello-interval $VAR(@)"
-delete: vtysh -c "configure terminal" -c "interface $VAR(../../../@)" \
-          -c "ipv6 ospf6 hello-interval 10"
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/ifmtu/node.def b/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/ifmtu/node.def
deleted file mode 100644
index 0fd15658..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/ifmtu/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: u32
-help: Interface MTU
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-val_help: u32:1-65535; Interface MTU
-
-update: vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "ipv6 ospf6 ifmtu $VAR(@)"
-delete: vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "no ipv6 ospf6 ifmtu"
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/instance-id/node.def b/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/instance-id/node.def
deleted file mode 100644
index bdd7aa5c..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/instance-id/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: u32
-help: Instance-id
-default: 0
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
-val_help: u32:0-255; Instance Id (default 0)
-
-update: vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "ipv6 ospf6 instance-id $VAR(@)"
-delete: vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "ipv6 ospf6 instance-id 0"
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/mtu-ignore/node.def b/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/mtu-ignore/node.def
deleted file mode 100644
index ad1bd4f3..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/mtu-ignore/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-help: Disable Maximum Transmission Unit mismatch detection
-create:vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "ipv6 ospf6 mtu-ignore"
-delete:vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "no ipv6 ospf6 mtu-ignore"
-
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/node.def b/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/node.def
deleted file mode 100644
index 43905a53..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: IPv6 Open Shortest Path First (OSPFv3)
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/passive/node.def b/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/passive/node.def
deleted file mode 100644
index 711ff19f..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/passive/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Disable forming of adjacency
-create: vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "ipv6 ospf6 passive"
-delete: vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "no ipv6 ospf6 passive"
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/priority/node.def b/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/priority/node.def
deleted file mode 100644
index 6c5397bd..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/priority/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: u32
-help: Router priority
-default: 1
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
-val_help: u32:0-255; Priority (default 1)
-
-update: vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "ipv6 ospf6 priority $VAR(@)"
-delete: vtysh -c "configure terminal" -c "interface $VAR(../../../@)" -c "ipv6 ospf6 priority 1"
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/retransmit-interval/node.def b/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/retransmit-interval/node.def
deleted file mode 100644
index 070e8029..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/retransmit-interval/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: u32
-help: Interval between retransmitting lost link state advertisements
-default: 5
-syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
-val_help: u32:3-65535; Retransmit interval in seconds (default 5)
-
-update: vtysh -c "configure terminal" -c "interface $VAR(../../../@)" \
-          -c "ipv6 ospf6 retransmit-interval $VAR(@)"
-delete: vtysh -c "configure terminal" -c "interface $VAR(../../../@)" \
-          -c "ipv6 ospf6 retransmit-interval 5"
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/transmit-delay/node.def b/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/transmit-delay/node.def
deleted file mode 100644
index 296ae391..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/ospfv3/transmit-delay/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: u32
-help: Link state transmit delay
-default: 1
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-val_help: u32:1-65535; Link state transmit delay (default 1)
-
-update: vtysh -c "configure terminal" -c "interface $VAR(../../../@)" \
-          -c "ipv6 ospf6 transmit-delay $VAR(@)"
-delete: vtysh -c "configure terminal" -c "interface $VAR(../../../@)" \
-          -c "ipv6 ospf6 transmit-delay 1"
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/ripng/node.def b/templates/interfaces/vxlan/node.tag/ipv6/ripng/node.def
deleted file mode 100644
index 69d49298..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/ripng/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Routing Information Protocol (RIPng)
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/ripng/split-horizon/disable/node.def b/templates/interfaces/vxlan/node.tag/ipv6/ripng/split-horizon/disable/node.def
deleted file mode 100644
index a8d39171..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/ripng/split-horizon/disable/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-help: Disable split horizon
-create: vtysh -c "configure terminal" -c "interface $VAR(../../../../@)" -c "no ipv6 ripng split-horizon"
-delete: 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 $VAR(../../../../@)"
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/ripng/split-horizon/node.def b/templates/interfaces/vxlan/node.tag/ipv6/ripng/split-horizon/node.def
deleted file mode 100644
index c4fb5ddc..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/ripng/split-horizon/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Split horizon parameters
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def b/templates/interfaces/vxlan/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def
deleted file mode 100644
index ffd27c2e..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/ripng/split-horizon/poison-reverse/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-help: Enable poison reverse for split-horizon
-create: vtysh -c "configure terminal" -c "interface $VAR(../../../../@)" \
-          -c "ipv6 ripng split-horizon poisoned-reverse"
-
-delete: 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 $VAR(../../../../@)"
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/cur-hop-limit/node.def b/templates/interfaces/vxlan/node.tag/ipv6/router-advert/cur-hop-limit/node.def
deleted file mode 100644
index 1ae51001..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/cur-hop-limit/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: u32
-help: Value to be placed in the "Current Hop Limit" field in RAs
-
-# Default value per Assignned Numbers RFC
-default: 64
-
-val_help: u32:1-255; Value to place in the "Current Hop Limit" field in RAs
-val_help: 0; Place 0, meaning "unspecified", in "Current Hop Limit" field
-
-syntax:expression: ($VAR(@) >= 0 && $VAR(@) <= 255) ; "Value must be between 0 and 255"
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/default-lifetime/node.def b/templates/interfaces/vxlan/node.tag/ipv6/router-advert/default-lifetime/node.def
deleted file mode 100644
index 205f964e..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/default-lifetime/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: u32
-help: Value to be placed in "Router Lifetime" field in RAs
-
-# No default value.  Value will be determined algorithmically based on
-# value of MaxRtrAdvInterval if left unspecified by the user.
-
-val_help: u32:4-9000; Value in seconds to be placed in "Router Lifetime" field in RAs
-val_help: 0; Place 0, meaning "not a default router", in Router Lifetime field
-syntax:expression: ($VAR(@) == 0 || ($VAR(@) >= 4 && $VAR(@) <= 9000)) ; "Value must be 0 or between 4 and 9000"
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/default-preference/node.def b/templates/interfaces/vxlan/node.tag/ipv6/router-advert/default-preference/node.def
deleted file mode 100644
index cc025735..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/default-preference/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: txt
-help: Default router preference
-
-syntax:expression: $VAR(@) in "low", "medium", "high"; \
-       "Must be (low|medium|high)"
-
-val_help: low; Default router is low preference
-val_help: medium; Default router is medium preference (Default)
-val_help: high; Default router is high preference
-
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/link-mtu/node.def b/templates/interfaces/vxlan/node.tag/ipv6/router-advert/link-mtu/node.def
deleted file mode 100644
index bd32fd59..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/link-mtu/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: u32
-help: Value of link MTU to place in RAs
-
-# Default value per RFC-4861.
-default: 0
-
-val_help: <1-MAX>; Value of link MTU to place in RAs
-val_help: 0; Do not send MTU options in RAs
-
-syntax:expression: ($VAR(@) == 0 || $VAR(@) >= 1280) ; "Value must be 0 or 1280 or greater"
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/managed-flag/node.def b/templates/interfaces/vxlan/node.tag/ipv6/router-advert/managed-flag/node.def
deleted file mode 100644
index b020c53d..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/managed-flag/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: bool
-help: Value for "managed address configuration" flag in RAs
-
-# Default value per RFC-4861.
-default: false
-allowed: echo -n "true false"
-
-val_help: true; Place "true" in "managed address configuration" flag in RAs
-val_help: false; Place "false" in "managed address configuration" flag in RAs
-
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/max-interval/node.def b/templates/interfaces/vxlan/node.tag/ipv6/router-advert/max-interval/node.def
deleted file mode 100644
index 1ba8e681..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/max-interval/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: u32
-help: Maximum interval between unsolicited multicast RAs
-
-# Default value per RFC-4861
-default: 600
-
-val_help: u32:4-1800; Maximum interval in seconds between unsolicited multicast RAs
-
-syntax:expression: ($VAR(@) >= 4 && $VAR(@) <= 1800) ; "Value must be between 4 and 1800"
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/min-interval/node.def b/templates/interfaces/vxlan/node.tag/ipv6/router-advert/min-interval/node.def
deleted file mode 100644
index 2ae72f7a..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/min-interval/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: u32
-help: Minimum interval between unsolicited multicast RAs
-
-# No default value.  Value will be determined algorithmically based
-# on the value of MaxRtrAdvInterval if not set by the user. Algorithm
-# is specified in RFC-4861.
-
-val_help: u32:3-1350; Minimum interval in seconds between unsolicited multicast RAs
-
-syntax:expression: ($VAR(@) >= 3 && $VAR(@) <= 1350) ; "Value must be between 3 and 1350"
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/name-server/node.def b/templates/interfaces/vxlan/node.tag/ipv6/router-advert/name-server/node.def
deleted file mode 100644
index 08899352..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/name-server/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-
-multi:
-
-type: ipv6
-
-help: IPv6 address of a Recursive DNS Server
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/node.def b/templates/interfaces/vxlan/node.tag/ipv6/router-advert/node.def
deleted file mode 100644
index 63135593..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/node.def
+++ /dev/null
@@ -1,36 +0,0 @@
-
-priority: 999 # Run after parent interface is configured
-
-help: Configure parameters for sending Router Advertisements (RAs)
-
-end:
-	if [ "$COMMIT_ACTION" = "SET" -o "$COMMIT_ACTION" = "ACTIVE" ]; then
-	    echo "Re-generating radvd config file for interface $VAR(../../@)..."
-	    sudo /opt/vyatta/sbin/vyatta_gen_radvd.pl --generate $VAR(../../@)
-	    if [ $? != 0 ]; then
-		exit 1
-	    fi
-	elif [ "$COMMIT_ACTION" = "DELETE" ]; then
-	    echo "Deleting entry for interface $VAR(../../@) from radv config file..."
-	    sudo /opt/vyatta/sbin/vyatta_gen_radvd.pl --delete $VAR(../../@)
-	    if [ $? != 0 ]; then
-		exit 1
-	    fi
-	fi
-
-	if [ -e /var/run/radvd/radvd.pid ]; then
-	    if [ -s /etc/radvd.conf ]; then
-		echo "Re-starting radvd..."
-		sudo /etc/init.d/radvd restart
-	    else
-		echo "Stopping radvd..."
-		sudo /etc/init.d/radvd stop
-	    fi
-	else
-	    if [ -s /etc/radvd.conf ]; then
-		echo "Starting radvd..."
-		sudo /etc/init.d/radvd start
-	    else
-		echo "Not starting radvd."
-	    fi
-	fi
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/other-config-flag/node.def b/templates/interfaces/vxlan/node.tag/ipv6/router-advert/other-config-flag/node.def
deleted file mode 100644
index d5488d7f..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/other-config-flag/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: bool
-help: Value to be placed in the "other configuration" flag in RAs
-
-# Default value per RFC-4861.
-default: false
-allowed: echo -n "true false"
-
-val_help: true; Place "true" in "other configuration" flag in RAs
-val_help: false; Place "false" in "other configuration" flag in RAs
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/prefix/node.def b/templates/interfaces/vxlan/node.tag/ipv6/router-advert/prefix/node.def
deleted file mode 100644
index 90242c35..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/prefix/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-tag:
-type: ipv6net
-
-help: IPv6 prefix to be advertised in Router Advertisements (RAs)
-
-val_help: ipv6net; IPv6 prefix to be advertized in Router Advertisements (RAs)
-
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/prefix/node.tag/autonomous-flag/node.def b/templates/interfaces/vxlan/node.tag/ipv6/router-advert/prefix/node.tag/autonomous-flag/node.def
deleted file mode 100644
index 5964d23a..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/prefix/node.tag/autonomous-flag/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: bool
-
-help: Whether prefix can be used for address auto-configuration
-
-# Default value per RFC-4861.
-default: true
-
-val_help: true; Prefix can be used for stateless address auto-configuration
-val_help: false; Prefix can not be used for stateless address auto-configuration
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/prefix/node.tag/on-link-flag/node.def b/templates/interfaces/vxlan/node.tag/ipv6/router-advert/prefix/node.tag/on-link-flag/node.def
deleted file mode 100644
index 948e3c3d..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/prefix/node.tag/on-link-flag/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: bool
-help: Flag that prefix can be used for on-link determination
-
-# Default value per RFC-4861.
-default: true
-
-val_help: true; Prefix can be used for on-link determination
-val_help: false; Prefix can not be used for on-link determination
-
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/prefix/node.tag/preferred-lifetime/node.def b/templates/interfaces/vxlan/node.tag/ipv6/router-advert/prefix/node.tag/preferred-lifetime/node.def
deleted file mode 100644
index 1fc0620b..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/prefix/node.tag/preferred-lifetime/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-type: txt
-help: Time in seconds that the prefix will remain preferred
-
-# Default value will be set by back-end script based on value of
-# AdvValidLifetime following guidelines in RFC-4861 if this value 
-# is left unspecified by the user.
-
-val_help: <0-MAX>; Time in seconds that the prefix will remain preferred
-val_help: infinity; Prefix will remain preferred forever
-
-syntax:expression: ($VAR(@) == "infinity" || (pattern $VAR(@) "[0-9]*")) ; "Must be 'infinity' or a number"
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/prefix/node.tag/valid-lifetime/node.def b/templates/interfaces/vxlan/node.tag/ipv6/router-advert/prefix/node.tag/valid-lifetime/node.def
deleted file mode 100644
index efcf5e19..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/prefix/node.tag/valid-lifetime/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: txt
-help: Time in seconds that the prefix will remain valid
-
-# Default per RFC-4861.
-default: "2592000"
-
-val_help: <0-MAX>; Time in seconds that the prefix will remain valid
-val_help: infinity; Prefix will remain valid forever
-
-syntax:expression: ($VAR(@) == "infinity" || (pattern $VAR(@) "[0-9]*")) ; "Must be 'infinity' or a number"
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/reachable-time/node.def b/templates/interfaces/vxlan/node.tag/ipv6/router-advert/reachable-time/node.def
deleted file mode 100644
index 903771cf..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/reachable-time/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: u32
-help: Value to be placed in "Reachable Time" field in RAs
-
-default: 0
-
-val_help: u32:1-3600000; Reachable Time value in RAs (in milliseconds)
-val_help: 0; Reachable Time 0 (i.e., unspecified by this router)
-
-syntax:expression: ($VAR(@) >= 0 && $VAR(@) <= 3600000) ; "Value must be between 0 and 3,600,000 milliseconds (1 hour)"
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/retrans-timer/node.def b/templates/interfaces/vxlan/node.tag/ipv6/router-advert/retrans-timer/node.def
deleted file mode 100644
index ab7793d9..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/retrans-timer/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: u32
-help: Value to place in "Retrans Timer" field in RAs.
-
-default: 0
-
-val_help: <1-MAX>; Value in milliseconds to place in "Retrans Timer" field in RAs
-val_help: 0; Place 0, meaning "unspecified", in in "Retrans Timer" field in RAs
diff --git a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/send-advert/node.def b/templates/interfaces/vxlan/node.tag/ipv6/router-advert/send-advert/node.def
deleted file mode 100644
index 8bcdeefb..00000000
--- a/templates/interfaces/vxlan/node.tag/ipv6/router-advert/send-advert/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-type: bool
-
-help: Enable/disable sending RAs
-
-# RFC-4861 default value is false, but since the router-advert tree is
-# absent by default, that serves to meet the requirement that router
-# adverts not be sent unless the system administrator explicitly configures
-# the router to send them.  So, configuring router-advert and leaving
-# this value unspecified serves to enable sending route adverts.
-
-default: true
-allowed: echo -n "true false"
-
-val_help: true; Enable sending RAs
-val_help: false; Disable sending RAs
-
diff --git a/templates/interfaces/vxlan/node.tag/policy/ipv6-route/node.def b/templates/interfaces/vxlan/node.tag/policy/ipv6-route/node.def
deleted file mode 100644
index fdc9c8aa..00000000
--- a/templates/interfaces/vxlan/node.tag/policy/ipv6-route/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: txt
-help: IPv6 policy route ruleset for interface
-allowed: local -a params
-	eval "params=($(cli-shell-api listActiveNodes policy ipv6-route))"
-	echo -n "${params[@]}"
-create: ifname=$VAR(../../@)
-	sudo /opt/vyatta/sbin/vyatta-firewall.pl --update-interfaces \
-		update $ifname in $VAR(@) "policy ipv6-route"
-
-update:	ifname=$VAR(../../@)
-	sudo /opt/vyatta/sbin/vyatta-firewall.pl --update-interfaces \
-		update $ifname in $VAR(@) "policy ipv6-route"
-
-
-delete:	ifname=$VAR(../../@)
-	sudo /opt/vyatta/sbin/vyatta-firewall.pl --update-interfaces \
-		delete $ifname in $VAR(@) "policy ipv6-route"
diff --git a/templates/interfaces/vxlan/node.tag/policy/node.def b/templates/interfaces/vxlan/node.tag/policy/node.def
deleted file mode 100644
index 94c62dbe..00000000
--- a/templates/interfaces/vxlan/node.tag/policy/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Policy route options
diff --git a/templates/interfaces/vxlan/node.tag/policy/route/node.def b/templates/interfaces/vxlan/node.tag/policy/route/node.def
deleted file mode 100644
index 1ce44d37..00000000
--- a/templates/interfaces/vxlan/node.tag/policy/route/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: txt
-help: IPv4 policy route ruleset for interface
-allowed: local -a params
-	eval "params=($(cli-shell-api listActiveNodes policy route))"
-	echo -n "${params[@]}"
-create: ifname=$VAR(../../@)
-	sudo /opt/vyatta/sbin/vyatta-firewall.pl --update-interfaces \
-		update $ifname in $VAR(@) "policy route"
-
-update:	ifname=$VAR(../../@)
-	sudo /opt/vyatta/sbin/vyatta-firewall.pl --update-interfaces \
-		update $ifname in $VAR(@) "policy route"
-
-
-delete:	ifname=$VAR(../../@)
-	sudo /opt/vyatta/sbin/vyatta-firewall.pl --update-interfaces \
-		delete $ifname in $VAR(@) "policy route"