ethernet: T1637: removed as rewritten in XML/Python

80 files changed, 0 insertions, 848 deletions

diff --git a/templates/interfaces/ethernet/node.def b/templates/interfaces/ethernet/node.def
deleted file mode 100644
index 2d66a11b..00000000
--- a/templates/interfaces/ethernet/node.def
+++ /dev/null
@@ -1,49 +0,0 @@
-tag:
-priority: 318
-type: txt
-help: Ethernet interface name
-allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=ethernet
-val_help: <ethN>; Ethernet interface name
-          <en[ospx]N; Ethernet interface name
-syntax:expression: pattern $VAR(@) "^((eth|lan)[0-9]+|(eno|ens|enp|enx).+)$" \
-		   ; "interface ethernet $VAR(@): not a valid name"
-
-syntax:expression: exec \
-    "if [ ! -d /sys/class/net/$VAR(@) ]; then \
-        echo \"interface ethernet $VAR(@): does not exist\";
-	exit 1; \
-    fi
-
-    if ip link show | awk '{print $2 }' | grep -ao \"lan[0-9]@$VAR(@)\" > /dev/null 2>&1 ; then \
-       echo \"interface ethernet $VAR(@): is a switch master interface and not configurable, please use 'lan' interfaces\";
-       exit 1; \
-    fi"
-
-begin: rm -f /tmp/speed-duplex.$VAR(@)
-        if [ -d "/sys/class/net/$VAR(@)" ]; then
-           if [ -n "$VAR(mac/@)" ]; then
-                /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(@) \
-                 --set-mac "$VAR(mac/@)"
-           else 
-                /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(@) \
-                --set-mac "$VAR(hw-id/@)"
-           fi
-       fi
-
-
-create: if ! cli-shell-api exists interfaces ethernet $VAR(@) disable;
-	then
-           case "$VAR(@)" in 
-             *lan*)
-               masterint=$(ip link show $VAR(@) | awk 'NR==1{print $2 }' | grep -ao "eth[0-9]")
-               sudo ip link set $masterint up
-             ;;
-           esac
-           sudo ip link set $VAR(@) up
-	fi
-	/opt/vyatta/sbin/vyatta-link-detect $VAR(@) on
-
-delete: [ -d /sys/class/net/$VAR(@) ] || exit 0
-        sudo ip link set $VAR(@) down
-
-end: rm -f /tmp/speed-duplex.$VAR(@)
diff --git a/templates/interfaces/ethernet/node.tag/address/node.def b/templates/interfaces/ethernet/node.tag/address/node.def
deleted file mode 100644
index bc051fa7..00000000
--- a/templates/interfaces/ethernet/node.tag/address/node.def
+++ /dev/null
@@ -1,19 +0,0 @@
-multi:
-type: txt
-help: IP address
-
-syntax:expression: exec "/opt/vyatta/sbin/valid_address $VAR(@)"
-
-commit:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr-commit $VAR(@@) --dev $VAR(../@)"
-
-create: sudo /opt/vyatta/sbin/vyatta-address add $VAR(../@) $VAR(@)
-        sudo /usr/libexec/vyos/conf_mode/host_name.py
-
-delete: sudo /opt/vyatta/sbin/vyatta-address delete $VAR(../@) $VAR(@)
-
-allowed: echo "dhcp dhcpv6 <>"
-
-val_help: ipv4net; IP address and prefix length
-val_help: ipv6net; IPv6 address and prefix length
-val_help: dhcp; Dynamic Host Configuration Protocol
-val_help: dhcpv6; Dynamic Host Configuration Protocol for IPv6
diff --git a/templates/interfaces/ethernet/node.tag/description/node.def b/templates/interfaces/ethernet/node.tag/description/node.def
deleted file mode 100644
index c6d2789d..00000000
--- a/templates/interfaces/ethernet/node.tag/description/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-help: Description
-
-syntax:expression: pattern $VAR(@) "^.{1,256}$" \
-	; "interface description is too long (limit 256 characters)"
-
-update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../@)/ifalias"
-delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../@)/ifalias"
diff --git a/templates/interfaces/ethernet/node.tag/dhcp-options/client-id/node.def b/templates/interfaces/ethernet/node.tag/dhcp-options/client-id/node.def
deleted file mode 100644
index 85ebe6e3..00000000
--- a/templates/interfaces/ethernet/node.tag/dhcp-options/client-id/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: DHCP client identifier
diff --git a/templates/interfaces/ethernet/node.tag/dhcp-options/host-name/node.def b/templates/interfaces/ethernet/node.tag/dhcp-options/host-name/node.def
deleted file mode 100644
index 80d28fbd..00000000
--- a/templates/interfaces/ethernet/node.tag/dhcp-options/host-name/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: DHCP client host name (overrides the system host name)
diff --git a/templates/interfaces/ethernet/node.tag/dhcp-options/node.def b/templates/interfaces/ethernet/node.tag/dhcp-options/node.def
deleted file mode 100644
index e90406df..00000000
--- a/templates/interfaces/ethernet/node.tag/dhcp-options/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: DHCP options
diff --git a/templates/interfaces/ethernet/node.tag/dhcpv6-options/duid/node.def b/templates/interfaces/ethernet/node.tag/dhcpv6-options/duid/node.def
deleted file mode 100644
index 218f2ee4..00000000
--- a/templates/interfaces/ethernet/node.tag/dhcpv6-options/duid/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type:txt
-help: DHCPv6 DUID to be sent by dhcpv6 client
diff --git a/templates/interfaces/ethernet/node.tag/dhcpv6-options/node.def b/templates/interfaces/ethernet/node.tag/dhcpv6-options/node.def
deleted file mode 100644
index d25533f9..00000000
--- a/templates/interfaces/ethernet/node.tag/dhcpv6-options/node.def
+++ /dev/null
@@ -1,52 +0,0 @@
-# This node is run before the rest of the interface is configured.
-# We first check to see if DHCPv6 is still configured on the interface by
-# looking over at the interface address parameters.  Then we check to see
-# if the DHCPv6 client program is still running on this interface.  If both
-# of those are true, then any change to this tree means that the user
-# has changed this tree ONLY, and that we are going to have to re-start
-# the DHCPv6 client using the new parameters.
-
-
-priority: 319 # Run before interface has been configured
-
-help: DHCPv6 options
-
-end:
-    ifname="$VAR(../@)"
-    echo "dhcpv6-options: ifname is $ifname"
-
-    dhcpv6_set=0
-    for param in $VAR(../address/@@); do
-	if [ "$param" = "dhcpv6" ]; then
-	    dhcpv6_set=1
-	fi
-    done
-
-    if [ $dhcpv6_set -eq 0 ]; then
-	echo "DHCPv6 is not configured on this interface"
-	exit 0
-    fi
-
-    conffile=/var/lib/dhcp/dhclient_v6_$VAR(../@).conf
-    if [ ! -e $conffile ]; then
-	echo "Conf file $conffile doesn't exist"
-	exit 0
-    fi
-
-    if [ -n "$VAR(./parameters-only)" ]; then
-	arg1="--parameters-only"
-    fi
-
-    if [ -n "$VAR(./temporary)" ]; then
-	arg2="--temporary"
-    fi
-
-    echo "Re-starting DHCPv6 client on ${ifname}..."
-    sudo /opt/vyatta/sbin/vyatta-dhcpv6-client.pl --stop --start \
-	--ifname $ifname $arg1 $arg2
-    if [ $? != 0 ]; then
-        exit 1
-    fi
-
-    echo "Done."
-    exit 0
diff --git a/templates/interfaces/ethernet/node.tag/dhcpv6-options/parameters-only/node.def b/templates/interfaces/ethernet/node.tag/dhcpv6-options/parameters-only/node.def
deleted file mode 100644
index 0e407f81..00000000
--- a/templates/interfaces/ethernet/node.tag/dhcpv6-options/parameters-only/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-
-help: Acquire only config parameters, not address
-
diff --git a/templates/interfaces/ethernet/node.tag/dhcpv6-options/temporary/node.def b/templates/interfaces/ethernet/node.tag/dhcpv6-options/temporary/node.def
deleted file mode 100644
index a850ef4b..00000000
--- a/templates/interfaces/ethernet/node.tag/dhcpv6-options/temporary/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-
-help: IPv6 "temporary" address
-
diff --git a/templates/interfaces/ethernet/node.tag/disable-flow-control/node.def b/templates/interfaces/ethernet/node.tag/disable-flow-control/node.def
deleted file mode 100644
index 3553b36d..00000000
--- a/templates/interfaces/ethernet/node.tag/disable-flow-control/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-priority: 320 # Must run after interface is configured.
-
-help: Disable Ethernet flow control (pause frames)
-
-create: /sbin/ethtool --pause $VAR(../@) autoneg off tx off rx off
-
-delete: [ -d /sys/class/net/$VAR(../@) ] || exit 0
-	/sbin/ethtool --pause $VAR(../@) autoneg on tx on rx on
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 7129ff33..00000000
--- a/templates/interfaces/ethernet/node.tag/disable-link-detect/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Ignore link state changes
-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/disable/node.def b/templates/interfaces/ethernet/node.tag/disable/node.def
deleted file mode 100644
index 418fe24c..00000000
--- a/templates/interfaces/ethernet/node.tag/disable/node.def
+++ /dev/null
@@ -1,20 +0,0 @@
-help: Disable interface
-
-create: /etc/netplug/linkdown.d/dhclient $VAR(../@)
-        if ! sudo ip link set $VAR(../@) down 2>/dev/null; then
-           echo "Error disabling dev $VAR(../@)"
-           /etc/netplug/linkup.d/dhclient $VAR(../@)
-           exit 1
-        fi
-
-delete: [ -d /sys/class/net/$VAR(../@) ] || exit 0
-	if ! sudo ip link set $VAR(../@) up; then
-             echo "Error enabling dev $VAR(../@)"
-             exit 1
-        fi
-	affinity=$VAR(../smp-affinity/@)
-	sudo /opt/vyatta/sbin/irq-affinity.pl $VAR(../@) ${affinity:-auto}
-        s=$(cli-shell-api showCfg interfaces ethernet $VAR(../@) address | awk '{print $2}')
-        if [ "$s" == "dhcp" ]; then
-          /etc/netplug/linkup.d/dhclient $VAR(../@)
-        fi
diff --git a/templates/interfaces/ethernet/node.tag/duplex/node.def b/templates/interfaces/ethernet/node.tag/duplex/node.def
deleted file mode 100644
index 0eee484e..00000000
--- a/templates/interfaces/ethernet/node.tag/duplex/node.def
+++ /dev/null
@@ -1,19 +0,0 @@
-type: txt
-help: Duplex mode
-default: "auto"
-syntax:expression: $VAR(@) in "auto", "half", "full"; "duplex must be auto, half or full"
-allowed: echo auto half full
-
-commit:expression: exec " \
-	/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../@) \
-	--check-speed $VAR(../speed/@) $VAR(@)"
-
-update: if [ ! -f /tmp/speed-duplex.$VAR(../@) ]; then
-	    /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../@) \
-	    	--speed-duplex $VAR(../speed/@) $VAR(@)
-	   touch /tmp/speed-duplex.$VAR(../@)
-	fi
-
-val_help: auto; Auto negotiation (default)
-val_help: half; Half duplex
-val_help: full; Full duplex
diff --git a/templates/interfaces/ethernet/node.tag/hw-id/node.def b/templates/interfaces/ethernet/node.tag/hw-id/node.def
deleted file mode 100644
index e2b8497d..00000000
--- a/templates/interfaces/ethernet/node.tag/hw-id/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: macaddr
-help: Media Access Control (MAC) address 
diff --git a/templates/interfaces/ethernet/node.tag/ip/arp-cache-timeout/node.def b/templates/interfaces/ethernet/node.tag/ip/arp-cache-timeout/node.def
deleted file mode 100644
index b92fbba4..00000000
--- a/templates/interfaces/ethernet/node.tag/ip/arp-cache-timeout/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-help: ARP cache entry timeout in seconds
-
-type: u32
-
-create:expression: "sudo sh -c \"echo $((1000*$VAR(@))) > /proc/sys/net/ipv4/neigh/$VAR(../../@)/base_reachable_time_ms\" "
-
-update:expression: "sudo sh -c \"echo $((1000*$VAR(@))) > /proc/sys/net/ipv4/neigh/$VAR(../../@)/base_reachable_time_ms\" "
-
-delete:expression: "sudo sh -c \"echo 30000 > /proc/sys/net/ipv4/neigh/$VAR(../../@)/base_reachable_time_ms\" "
-
diff --git a/templates/interfaces/ethernet/node.tag/ip/enable-proxy-arp/node.def b/templates/interfaces/ethernet/node.tag/ip/enable-proxy-arp/node.def
deleted file mode 100644
index ae7ba09a..00000000
--- a/templates/interfaces/ethernet/node.tag/ip/enable-proxy-arp/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Enable proxy-arp on this interface
-create:expression: "sudo sh -c \"echo 1 > /proc/sys/net/ipv4/conf/$VAR(../../@)/proxy_arp\" "
-delete:expression: "sudo sh -c \"echo 0 > /proc/sys/net/ipv4/conf/$VAR(../../@)/proxy_arp\" "
diff --git a/templates/interfaces/ethernet/node.tag/ip/proxy-arp-pvlan/node.def b/templates/interfaces/ethernet/node.tag/ip/proxy-arp-pvlan/node.def
deleted file mode 100644
index a6cf9494..00000000
--- a/templates/interfaces/ethernet/node.tag/ip/proxy-arp-pvlan/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Enable private VLAN proxy ARP on this interface
-create:expression: "sudo sh -c \"echo 1 > /proc/sys/net/ipv4/conf/$VAR(../../@)/proxy_arp_pvlan\" "
-delete:expression: "sudo sh -c \"echo 0 > /proc/sys/net/ipv4/conf/$VAR(../../@)/proxy_arp_pvlan\" "
diff --git a/templates/interfaces/ethernet/node.tag/mac/node.def b/templates/interfaces/ethernet/node.tag/mac/node.def
deleted file mode 100644
index 5b797830..00000000
--- a/templates/interfaces/ethernet/node.tag/mac/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: macaddr
-help: Media Access Control (MAC) address
-syntax:expression: exec "\
-	/opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --valid-mac $VAR(@)"
diff --git a/templates/interfaces/ethernet/node.tag/mtu/node.def b/templates/interfaces/ethernet/node.tag/mtu/node.def
deleted file mode 100644
index 57abc31f..00000000
--- a/templates/interfaces/ethernet/node.tag/mtu/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-type: u32
-priority: 381
-help: Maximum Transmission Unit (MTU)
-syntax:expression: $VAR(@) >= 68 && $VAR(@) <= 9000; "MTU must be between 68 and 9000"
-val_help: u32:68-9000; Maximum Transmission Unit (MTU)
-
-update: if ! sudo ip link set $VAR(../@) mtu $VAR(@)
-        then echo "Error setting MTU on dev $VAR(../@)"; exit 1
-        fi
-delete: [ -d /sys/class/net/$VAR(../@) ] || exit 0
-        sudo ip link set $VAR(../@) mtu 1500
diff --git a/templates/interfaces/ethernet/node.tag/offload-options/generic-receive/node.def b/templates/interfaces/ethernet/node.tag/offload-options/generic-receive/node.def
deleted file mode 100644
index a2bc1ebc..00000000
--- a/templates/interfaces/ethernet/node.tag/offload-options/generic-receive/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Configuration template for offload options
-#
-
-priority: 319 # Failure barrier only - no ordering constraints
-
-type: txt
-help: Configure generic-receive option
-val_help: on; Enable generic-receive
-val_help: off; Disable generic-receive
-
-syntax:expression: $VAR(@) == "on" || $VAR(@) == "off" ; "Must be either 'on' or 'off'"
-
-update: sudo /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../../@) --offload-option generic-receive $VAR(@)
-
-
diff --git a/templates/interfaces/ethernet/node.tag/offload-options/generic-segmentation/node.def b/templates/interfaces/ethernet/node.tag/offload-options/generic-segmentation/node.def
deleted file mode 100644
index bdc25c63..00000000
--- a/templates/interfaces/ethernet/node.tag/offload-options/generic-segmentation/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Configuration template for offload options
-#
-
-priority: 319 # Failure barrier only - no ordering constraints
-
-type: txt
-help: Configure generic-segmentation option
-val_help: on; Enable generic-segmentation
-val_help: off; Disable generic-segmentation
-
-syntax:expression: $VAR(@) == "on" || $VAR(@) == "off" ; "Must be either 'on' or 'off'"
-
-update: sudo /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../../@) --offload-option generic-segmentation $VAR(@)
-
-
diff --git a/templates/interfaces/ethernet/node.tag/offload-options/node.def b/templates/interfaces/ethernet/node.tag/offload-options/node.def
deleted file mode 100644
index 59d45778..00000000
--- a/templates/interfaces/ethernet/node.tag/offload-options/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Configurable offload options
diff --git a/templates/interfaces/ethernet/node.tag/offload-options/scatter-gather/node.def b/templates/interfaces/ethernet/node.tag/offload-options/scatter-gather/node.def
deleted file mode 100644
index 71ee1142..00000000
--- a/templates/interfaces/ethernet/node.tag/offload-options/scatter-gather/node.def
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Configuration template for offload options
-#
-
-priority: 319 # Failure barrier only - no ordering constraints
-
-type: txt
-help: Configure scatter-gather option
-val_help: on; Enable scatter-gather
-val_help: off; Disable scatter-gather
-
-syntax:expression: $VAR(@) == "on" || $VAR(@) == "off" ; "Must be either 'on' or 'off'"
-
-update: sudo /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../../@) --offload-option scatter-gather $VAR(@)
diff --git a/templates/interfaces/ethernet/node.tag/offload-options/tcp-segmentation/node.def b/templates/interfaces/ethernet/node.tag/offload-options/tcp-segmentation/node.def
deleted file mode 100644
index c8da289e..00000000
--- a/templates/interfaces/ethernet/node.tag/offload-options/tcp-segmentation/node.def
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Configuration template for offload options
-#
-
-priority: 319 # Failure barrier only - no ordering constraints
-
-type: txt
-help: Configure tcp-segmentation option
-val_help: on; Enable tcp-segmentation
-val_help: off; Disable tcp-segmentation
-
-syntax:expression: $VAR(@) == "on" || $VAR(@) == "off" ; "Must be either 'on' or 'off'"
-
-update:	sudo /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../../@) --offload-option tcp-segmentation $VAR(@)
-
diff --git a/templates/interfaces/ethernet/node.tag/offload-options/udp-fragmentation/node.def b/templates/interfaces/ethernet/node.tag/offload-options/udp-fragmentation/node.def
deleted file mode 100644
index dcff5b2c..00000000
--- a/templates/interfaces/ethernet/node.tag/offload-options/udp-fragmentation/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Configuration template for offload options
-#
-
-priority: 319 # Failure barrier only - no ordering constraints
-
-type: txt
-help: Configure udp-fragmentation option
-val_help: on; Enable udp-fragmentation
-val_help: off; Disable udp-fragmentation
-
-syntax:expression: $VAR(@) == "on" || $VAR(@) == "off" ; "Must be either 'on' or 'off'"
-
-update: sudo /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../../@) --offload-option udp-fragmentation $VAR(@)
-
-
diff --git a/templates/interfaces/ethernet/node.tag/smp-affinity/node.def b/templates/interfaces/ethernet/node.tag/smp-affinity/node.def
deleted file mode 100644
index 59a8997c..00000000
--- a/templates/interfaces/ethernet/node.tag/smp-affinity/node.def
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-#
-# Configuration template for interface.ethernet.name.smp-affinity
-#
-# Configure the CPUs that the associated interface will interrupt.
-# SMP affinity is configured by a hexidecimal bitmask that specifies the
-# CPUs that the system can interrupt.  The SMP affinity bitmask must contain
-# at least one bits, and may only contain as many bits as there are CPUs on
-# the system.
-#
-
-priority: 319 # Failure barrier only - no ordering constraints
-
-type: txt
-
-help: CPU interrupt affinity mask
-
-val_help: auto; Automatic CPU affinity (default)
-val_help: <hex>; Bitmask representing CPUs that this NIC will interrupt
-val_help: <hex>,<hex>; Bitmasks representing CPUs for interrupt and receive processing
-
-default: "auto"
-
-syntax:expression: $VAR(@) == "auto" || pattern $VAR(@) "^[0-9a-f]+(|,[0-9a-f]+)$" ;
-	"IRQ affinity mask must be hex value or auto"
-
-update:	sudo /opt/vyatta/sbin/irq-affinity.pl $VAR(../@) $VAR(@)
-
diff --git a/templates/interfaces/ethernet/node.tag/speed/node.def b/templates/interfaces/ethernet/node.tag/speed/node.def
deleted file mode 100644
index 2c069cc1..00000000
--- a/templates/interfaces/ethernet/node.tag/speed/node.def
+++ /dev/null
@@ -1,23 +0,0 @@
-type: txt
-help: Link speed
-default: "auto"
-syntax:expression: $VAR(@) in "auto", "10", "100", "1000", "2500", "10000"; "Speed must be auto, 10, 100, 1000, 2500, or 10000"
-allowed: echo auto 10 100 1000 2500 10000
-
-commit:expression: exec "\
-	/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../@) \
-	--check-speed $VAR(@) $VAR(../duplex/@)"
-
-update: if [ ! -f /tmp/speed-duplex.$VAR(../@) ]; then
-	   /opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(../@) \
-	   	--speed-duplex $VAR(@) $VAR(../duplex/@)
-	   touch /tmp/speed-duplex.$VAR(../@)
-	fi
-
-val_help: auto; Auto negotiation (default)
-val_help: 10; 10 Mbit/sec
-val_help: 100; 100 Mbit/sec
-val_help: 1000; 1 Gbit/sec
-val_help: 2500; 2.5 Gbit/sec
-val_help: 10000; 10 Gbit/sec
-
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.def
deleted file mode 100644
index 53f2c76c..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.def
+++ /dev/null
@@ -1,30 +0,0 @@
-tag:
-priority: 319
-type: u32
-help: QinQ TAG-S Virtual Local Area Network (VLAN) ID
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094"
-val_help: u32:0-4094; VLAN ID
-
-create:
-        ETHERTYPE=`echo "$VAR(ethertype/@)"`
-        if [ $ETHERTYPE == "0x88A8" ]; then ETHTYPE=802.1ad; fi
-        if [ $ETHERTYPE == "0x8100" ]; then ETHTYPE=802.1q; fi
-
-        if [ ! -d /sys/class/net/$VAR(../@).$VAR(@) ]; then
-          if ! sudo ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan proto $ETHTYPE id $VAR(@); then
-             echo "Error creating VLAN device $VAR(../@).$VAR(@)"
-             exit 1
-          fi
-        fi
-
-        # if parent is up, then bring VLAN up
-        if [ $(( $(cat /sys/class/net/$VAR(../@)/flags) & 1 )) -eq 1 ]; then
-            sudo ip link set "$VAR(../@).$VAR(@)" up
-        fi
-        /opt/vyatta/sbin/vyatta-link-detect "$VAR(../@).$VAR(@)" on
-
-delete: ETHERTYPE=`echo "$VAR(ethertype/@)"`
-        if [ $ETHERTYPE == "0x88A8" ]; then ETHTYPE=802.1ad; fi
-        if [ $ETHERTYPE == "0x8100" ]; then ETHTYPE=802.1Q; fi
-        [ -d /sys/class/net/$VAR(../@).$VAR(@) ] || exit 0
-        sudo ip link delete dev "$VAR(../@).$VAR(@)" type vlan proto $ETHTYPE id $VAR(@)
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/address/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/address/node.def
deleted file mode 100644
index db361f38..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/address/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-multi:
-type: txt
-help: IP address
-
-syntax:expression: exec "/opt/vyatta/sbin/valid_address $VAR(@)"
-
-commit:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr-commit $VAR(@@) --dev $VAR(../../@).$VAR(../@)"
-
-create: sudo /opt/vyatta/sbin/vyatta-address add $VAR(../../@).$VAR(../@) $VAR(@)
-
-delete: sudo /opt/vyatta/sbin/vyatta-address delete $VAR(../../@).$VAR(../@) $VAR(@)
-
-allowed: echo "dhcp <>"
-
-val_help: ipv4net; IP address and prefix length
-val_help: ipv6net; IPv6 address and prefix length
-val_help: dhcp; Dynamic Host Configuration Protocol
-val_help: dhcpv6; Dynamic Host Configuration Protocol for IPv6
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/description/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/description/node.def
deleted file mode 100644
index a0b29f05..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/description/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-help: Description
-
-syntax:expression: pattern $VAR(@) "^.{1,256}$" \
-	; "interface description is too long (limit 256 characters)"
-
-update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../../@).$VAR(../@)/ifalias"
-delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../../@).$VAR(../@)/ifalias"
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcp-options/client-id/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcp-options/client-id/node.def
deleted file mode 100644
index 85ebe6e3..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcp-options/client-id/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: DHCP client identifier
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcp-options/host-name/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcp-options/host-name/node.def
deleted file mode 100644
index 80d28fbd..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcp-options/host-name/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: DHCP client host name (overrides the system host name)
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcp-options/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcp-options/node.def
deleted file mode 100644
index e90406df..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcp-options/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: DHCP options
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcpv6-options/duid/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcpv6-options/duid/node.def
deleted file mode 100644
index 218f2ee4..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcpv6-options/duid/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type:txt
-help: DHCPv6 DUID to be sent by dhcpv6 client
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcpv6-options/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcpv6-options/node.def
deleted file mode 100644
index 9116b354..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcpv6-options/node.def
+++ /dev/null
@@ -1,50 +0,0 @@
-# This node is run before the rest of the interface is configured.
-# We first check to see if DHCPv6 is still configured on the interface by
-# looking over at the interface address parameters.  Then we check to see
-# if the DHCPv6 client program is still running on this interface.  If both
-# of those are true, then any change to this tree means that the user
-# has changed this tree ONLY, and that we are going to have to re-start
-# the DHCPv6 client using the new parameters.
-
-
-priority: 319 # Run before interface has been configured
-
-help: DHCPv6 options
-
-end:
-    ifname="$VAR(../../@).$VAR(../@)"
-
-    dhcpv6_set=0
-    for param in $VAR(../address/@@); do
-	if [ "$param" = "dhcpv6" ]; then
-	    dhcpv6_set=1
-	fi
-    done
-
-    if [ $dhcpv6_set -eq 0 ]; then
-	echo "DHCPv6 is not configured on this interface"
-	exit 0
-    fi
-
-    conffile=/var/lib/dhcp/dhclient_v6_$ifname.conf
-    if [ ! -e $conffile ]; then
-	echo "Conf file $conffile doesn't exist"
-	exit 0
-    fi
-
-    if [ -n "$VAR(./parameters-only)" ]; then
-	arg1="--parameters-only"
-    fi
-
-    if [ -n "$VAR(./temporary)" ]; then
-	arg2="--temporary"
-    fi
-
-    echo "Re-starting DHCPv6 client on ${ifname}..."
-    sudo /opt/vyatta/sbin/vyatta-dhcpv6-client.pl --stop --start \
-	--ifname $ifname $arg1 $arg2
-    if [ $? != 0 ]; then
-        exit 1
-    fi
-
-    exit 0
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcpv6-options/parameters-only/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcpv6-options/parameters-only/node.def
deleted file mode 100644
index 0e407f81..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcpv6-options/parameters-only/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-
-help: Acquire only config parameters, not address
-
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcpv6-options/temporary/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcpv6-options/temporary/node.def
deleted file mode 100644
index a850ef4b..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/dhcpv6-options/temporary/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-
-help: IPv6 "temporary" address
-
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/disable-link-detect/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/disable-link-detect/node.def
deleted file mode 100644
index 5f60e6ab..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/disable-link-detect/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Ignore link state changes
-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-s/node.tag/disable/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/disable/node.def
deleted file mode 100644
index 12db6a98..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/disable/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-help: Disable interface
-update: /etc/netplug/linkdown.d/dhclient $VAR(../../@).$VAR(../@)
-        if ! sudo ip link set $VAR(../../@).$VAR(../@) down 2>/dev/null; then
-          echo "Error disabling dev $VAR(../../@).$VAR(../@)"
-          /etc/netplug/linkup.d/dhclient $VAR(../../@).$VAR(../@)
-          exit 1
-        fi
-delete: if ! sudo ip link set $VAR(../../@).$VAR(../@) up; then
-          echo "Error enabling dev $VAR(../../@).$VAR(../@)"
-          exit 1
-        fi
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/ethertype/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/ethertype/node.def
deleted file mode 100644
index 32895483..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/ethertype/node.def
+++ /dev/null
@@ -1,27 +0,0 @@
-type: txt
-help: Set Ethertype
-syntax:expression: $VAR(@) in "0x88A8", "0x8100";"Must be (0x88A8 0x8100)\n"
-default: "0x88A8"
-
-comp_help: possible completions:
-  0x88A8             802.1AD
-  0x8100             802.1Q
-
-update: ACTIVEETHTYPE=`cli-shell-api returnActiveValue interfaces ethernet $VAR(../../@) vif-s $VAR(../@) ethertype`
-	if [ ! -z $VAR(../vif-c/@@) ] && [ ! -z $ACTIVEETHTYPE ]
-		then echo "Can not change ethertype with vif-c configured"
-		exit 1
-	fi
-	ETHERTYPE=`echo "$VAR(@)"`
-	if [ $ETHERTYPE == "0x88A8" ]; then ETHTYPE=802.1ad; fi
-	if [ $ETHERTYPE == "0x8100" ]; then ETHTYPE=802.1Q; fi
-	sudo ip link delete dev "$VAR(../../@).$VAR(../@)" type vlan proto $ETHTYPE id $VAR(../@) > /dev/null 2>&1
-	if ! sudo ip link add link $VAR(../../@) name "$VAR(../../@).$VAR(../@)" type vlan proto $ETHTYPE id $VAR(../@)
-		then echo "Error creating VLAN device $VAR(../../@).$VAR(../@)"
-		exit 1
-	fi
-	# if parent is up, then bring VLAN up
-	if [ $(( $(cat /sys/class/net/$VAR(../../@)/flags) & 1 )) -eq 1 ]
-		then sudo ip link set "$VAR(../../@).$VAR(../@)" up
-	fi
-	/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../@).$VAR(../@)" on
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/ip/enable-proxy-arp/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/ip/enable-proxy-arp/node.def
deleted file mode 100644
index cd6d56d9..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/ip/enable-proxy-arp/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Enable proxy-arp on this interface
-create:expression: "sudo sh -c \"echo 1 > /proc/sys/net/ipv4/conf/$VAR(../../../@).$VAR(../../@)/proxy_arp\" " 
-delete:expression: "sudo sh -c \"echo 0 > /proc/sys/net/ipv4/conf/$VAR(../../../@).$VAR(../../@)/proxy_arp\" " 
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/ip/proxy-arp-pvlan/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/ip/proxy-arp-pvlan/node.def
deleted file mode 100644
index e1ab1f00..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/ip/proxy-arp-pvlan/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Enable private VLAN proxy ARP on this interface
-create:expression: "sudo sh -c \"echo 1 > /proc/sys/net/ipv4/conf/$VAR(../../../@).$VAR(../../@)/proxy_arp_pvlan\" " 
-delete:expression: "sudo sh -c \"echo 0 > /proc/sys/net/ipv4/conf/$VAR(../../../@).$VAR(../../@)/proxy_arp_pvlan\" " 
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/mac/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/mac/node.def
deleted file mode 100644
index 750710ec..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/mac/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: macaddr
-help: Media Access Control (MAC) address
-
-update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../../@).$VAR(../@) --set-mac $VAR(@)
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/mtu/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/mtu/node.def
deleted file mode 100644
index b3f3e7c7..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/mtu/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: u32
-priority: 382
-help: Maximum Transmission Unit (MTU)
-val_help: u32:68-9000; Maximum Transmission Unit (MTU)
-syntax:expression: $VAR(@) >= 68 && $VAR(@) <= 9000; "MTU must be between 68 and 9000"
-
-update: sudo ip link set $VAR(../../@).$VAR(../@) mtu $VAR(@)
-delete: [ -d /sys/class/net/$VAR(../../@).$VAR(../@) ] || exit 0
-        sudo ip link set $VAR(../../@).$VAR(../@) mtu 1500
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.def
deleted file mode 100644
index 8312aa06..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.def
+++ /dev/null
@@ -1,19 +0,0 @@
-tag:
-priority: 320
-type: u32
-help: QinQ TAG-C Virtual Local Area Network (VLAN) ID
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094"
-val_help: u32:0-4094; VLAN ID
-
-create: if ! sudo ip link add link $VAR(../../@).$VAR(../@) name "$VAR(../../@).$VAR(../@).$VAR(@)" type vlan proto 802.1q id $VAR(@)
-	then echo "Error creating VLAN device $VAR(../../@).$VAR(../@).$VAR(@)"
-	     exit 1
-        fi
-	# if parent is up, then bring VLAN up
-	if [ $(( $(cat /sys/class/net/$VAR(../../@).$VAR(../@)/flags) & 1 )) -eq 1 ]
-        then sudo ip link set "$VAR(../../@).$VAR(../@).$VAR(@)" up
-	fi
-	/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../@).$VAR(../@).$VAR(@)" on
-
-delete: [ -d /sys/class/net/$VAR(../../@).$VAR(../@).$VAR(@) ] || exit 0
-        sudo ip link delete dev "$VAR(../../@).$VAR(../@).$VAR(@)" type vlan proto 802.1q id $VAR(@)
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/address/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/address/node.def
deleted file mode 100644
index 93476d60..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/address/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-multi:
-type: txt
-help: IP address
-
-syntax:expression: exec "/opt/vyatta/sbin/valid_address $VAR(@)"
-
-commit:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr-commit $VAR(@@) --dev $VAR(../../../@).$VAR(../../@).$VAR(../@)"
-
-create: sudo /opt/vyatta/sbin/vyatta-address add $VAR(../../../@).$VAR(../../@).$VAR(../@) $VAR(@)
-
-delete: sudo /opt/vyatta/sbin/vyatta-address delete $VAR(../../../@).$VAR(../../@).$VAR(../@) $VAR(@)
-
-allowed: echo "dhcp <>"
-
-val_help: ipv4net; IP address and prefix length
-val_help: ipv6net; IPv6 address and prefix length
-val_help: dhcp; Dynamic Host Configuration Protocol
-val_help: dhcpv6; Dynamic Host Configuration Protocol for IPv6
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/description/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/description/node.def
deleted file mode 100644
index 9324ce1b..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/description/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-help: Description
-
-syntax:expression: pattern $VAR(@) "^.{1,256}$" \
-	; "interface description is too long (limit 256 characters)"
-
-update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../../../@).$VAR(../../@).$VAR(../@)/ifalias"
-delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../../../@).$VAR(../../@).$VAR(../@)/ifalias"
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcp-options/client-id/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcp-options/client-id/node.def
deleted file mode 100644
index 85ebe6e3..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcp-options/client-id/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: DHCP client identifier
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcp-options/host-name/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcp-options/host-name/node.def
deleted file mode 100644
index 80d28fbd..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcp-options/host-name/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: DHCP client host name (overrides the system host name)
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcp-options/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcp-options/node.def
deleted file mode 100644
index e90406df..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcp-options/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: DHCP options
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/duid/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/duid/node.def
deleted file mode 100644
index 218f2ee4..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/duid/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type:txt
-help: DHCPv6 DUID to be sent by dhcpv6 client
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def
deleted file mode 100644
index ddebe05b..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def
+++ /dev/null
@@ -1,50 +0,0 @@
-# This node is run before the rest of the interface is configured.
-# We first check to see if DHCPv6 is still configured on the interface by
-# looking over at the interface address parameters.  Then we check to see
-# if the DHCPv6 client program is still running on this interface.  If both
-# of those are true, then any change to this tree means that the user
-# has changed this tree ONLY, and that we are going to have to re-start
-# the DHCPv6 client using the new parameters.
-
-
-priority: 319 # Run before interface has been configured
-
-help: DHCPv6 options
-
-end:
-    ifname="$VAR(../../../@).$VAR(../../@).$VAR(../@)"
-
-    dhcpv6_set=0
-    for param in $VAR(../address/@@); do
-	if [ "$param" = "dhcpv6" ]; then
-	    dhcpv6_set=1
-	fi
-    done
-
-    if [ $dhcpv6_set -eq 0 ]; then
-	echo "DHCPv6 is not configured on this interface"
-	exit 0
-    fi
-
-    conffile=/var/lib/dhcp/dhclient_v6_$ifname.conf
-    if [ ! -e $conffile ]; then
-	echo "Conf file $conffile doesn't exist"
-	exit 0
-    fi
-
-    if [ -n "$VAR(./parameters-only)" ]; then
-	arg1="--parameters-only"
-    fi
-
-    if [ -n "$VAR(./temporary)" ]; then
-	arg2="--temporary"
-    fi
-
-    echo "Re-starting DHCPv6 client on ${ifname}..."
-    sudo /opt/vyatta/sbin/vyatta-dhcpv6-client.pl --stop --start \
-	--ifname $ifname $arg1 $arg2
-    if [ $? != 0 ]; then
-        exit 1
-    fi
-
-    exit 0
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/parameters-only/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/parameters-only/node.def
deleted file mode 100644
index 0e407f81..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/parameters-only/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-
-help: Acquire only config parameters, not address
-
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/temporary/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/temporary/node.def
deleted file mode 100644
index a850ef4b..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/temporary/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-
-help: IPv6 "temporary" address
-
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/disable-link-detect/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/disable-link-detect/node.def
deleted file mode 100644
index ed593317..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/disable-link-detect/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Ignore link state changes
-update:/opt/vyatta/sbin/vyatta-link-detect $VAR(../../../@).$VAR(../../@).$VAR(../@) on
-delete:/opt/vyatta/sbin/vyatta-link-detect $VAR(../../../@).$VAR(../../@).$VAR(../@) off
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/disable/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/disable/node.def
deleted file mode 100644
index 7069e9c9..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/disable/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-help: Disable interface
-update: /etc/netplug/linkdown.d/dhclient $VAR(../../../@).$VAR(../../@).$VAR(../@)
-        if ! sudo ip link set $VAR(../../../@).$VAR(../../@).$VAR(../@) down 2>/dev/null; then
-          echo "Error disabling dev $VAR(../../../@).$VAR(../../@).$VAR(../@)"
-          /etc/netplug/linkup.d/dhclient $VAR(../../../@).$VAR(../../@).$VAR(../@)
-          exit 1
-        fi
-delete: if ! sudo ip link set $VAR(../../../@).$VAR(../../@).$VAR(../@) up; then
-          echo "Error enabling dev $VAR(../../../@).$VAR(../../@).$VAR(../@)"
-          exit 1
-        fi
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/ip/enable-proxy-arp/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/ip/enable-proxy-arp/node.def
deleted file mode 100644
index dd572811..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/ip/enable-proxy-arp/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Enable proxy-arp on this interface
-create:expression: "sudo sh -c \"echo 1 > /proc/sys/net/ipv4/conf/$VAR(../../../../@).$VAR(../../../@).$VAR(../../@)/proxy_arp\" " 
-delete:expression: "sudo sh -c \"echo 0 > /proc/sys/net/ipv4/conf/$VAR(../../../../@).$VAR(../../../@).$VAR(../../@)/proxy_arp\" " 
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/ip/proxy-arp-pvlan/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/ip/proxy-arp-pvlan/node.def
deleted file mode 100644
index ce1dcc41..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/ip/proxy-arp-pvlan/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Enable private VLAN proxy ARP on this interface 
-create:expression: "sudo sh -c \"echo 1 > /proc/sys/net/ipv4/conf/$VAR(../../../../@).$VAR(../../../@).$VAR(../../@)/proxy_arp_pvlan\" " 
-delete:expression: "sudo sh -c \"echo 0 > /proc/sys/net/ipv4/conf/$VAR(../../../../@).$VAR(../../../@).$VAR(../../@)/proxy_arp_pvlan\" " 
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/mac/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/mac/node.def
deleted file mode 100644
index 24b4b4d7..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/mac/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: macaddr
-help: Media Access Control (MAC) address
-
-update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../../../@).$VAR(../../@).$VAR(../@) --set-mac $VAR(@)
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/mtu/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/mtu/node.def
deleted file mode 100644
index 264c429b..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/mtu/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: u32
-priority: 382
-help: Maximum Transmission Unit (MTU)
-val_help: u32:68-9000; Maximum Transmission Unit (MTU)
-syntax:expression: $VAR(@) >= 68 && $VAR(@) <= 9000; "MTU must be between 68 and 9000"
-
-update: sudo ip link set $VAR(../../../@).$VAR(../../@).$VAR(../@) mtu $VAR(@)
-delete: [ -d /sys/class/net/$VAR(../../../@).$VAR(../../@).$VAR(../@) ] || exit 0
-        sudo ip link set $VAR(../../../@).$VAR(../../@).$VAR(../@) mtu 1500
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.def b/templates/interfaces/ethernet/node.tag/vif/node.def
deleted file mode 100644
index d20fefda..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.def
+++ /dev/null
@@ -1,25 +0,0 @@
-tag:
-priority: 319
-type: u32
-help: Virtual Local Area Network (VLAN) ID
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094"
-val_help: u32:0-4094; VLAN ID
-
-create: if [ -n "$VAR(./egress-qos)" ]; then
-		opt_e=" egress-qos-map $VAR(./egress-qos/@) "
-	fi
-	if [ -n "$VAR(./ingress-qos)" ]; then
-		opt_in=" ingress-qos-map $VAR(./ingress-qos/@) "
-	fi
-	if ! sudo ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@) ${opt_e} ${opt_in}
-	then echo "Error creating VLAN device $VAR(../@).$VAR(@)"
-	     exit 1
-        fi
-	# if parent is up, then bring VLAN up
-	if [ $(( $(cat /sys/class/net/$VAR(../@)/flags) & 1 )) -eq 1 ]
-        then sudo ip link set "$VAR(../@).$VAR(@)" up
-	fi
-	/opt/vyatta/sbin/vyatta-link-detect "$VAR(../@).$VAR(@)" on
-
-delete: [ -d /sys/class/net/$VAR(../@).$VAR(@) ] || exit 0
-        sudo ip link delete dev "$VAR(../@).$VAR(@)" type vlan id $VAR(@)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def
deleted file mode 100644
index db361f38..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-multi:
-type: txt
-help: IP address
-
-syntax:expression: exec "/opt/vyatta/sbin/valid_address $VAR(@)"
-
-commit:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr-commit $VAR(@@) --dev $VAR(../../@).$VAR(../@)"
-
-create: sudo /opt/vyatta/sbin/vyatta-address add $VAR(../../@).$VAR(../@) $VAR(@)
-
-delete: sudo /opt/vyatta/sbin/vyatta-address delete $VAR(../../@).$VAR(../@) $VAR(@)
-
-allowed: echo "dhcp <>"
-
-val_help: ipv4net; IP address and prefix length
-val_help: ipv6net; IPv6 address and prefix length
-val_help: dhcp; Dynamic Host Configuration Protocol
-val_help: dhcpv6; Dynamic Host Configuration Protocol for IPv6
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/description/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/description/node.def
deleted file mode 100644
index a0b29f05..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/description/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-help: Description
-
-syntax:expression: pattern $VAR(@) "^.{1,256}$" \
-	; "interface description is too long (limit 256 characters)"
-
-update: sudo sh -c "echo \"$VAR(@)\" >/sys/class/net/$VAR(../../@).$VAR(../@)/ifalias"
-delete: sudo sh -c "echo '' >/sys/class/net/$VAR(../../@).$VAR(../@)/ifalias"
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcp-options/client-id/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcp-options/client-id/node.def
deleted file mode 100644
index 85ebe6e3..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcp-options/client-id/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: DHCP client identifier
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcp-options/host-name/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcp-options/host-name/node.def
deleted file mode 100644
index 80d28fbd..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcp-options/host-name/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type: txt
-help: DHCP client host name (overrides the system host name)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcp-options/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcp-options/node.def
deleted file mode 100644
index e90406df..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcp-options/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: DHCP options
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcpv6-options/duid/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcpv6-options/duid/node.def
deleted file mode 100644
index 218f2ee4..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcpv6-options/duid/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-type:txt
-help: DHCPv6 DUID to be sent by dhcpv6 client
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcpv6-options/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcpv6-options/node.def
deleted file mode 100644
index 9116b354..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcpv6-options/node.def
+++ /dev/null
@@ -1,50 +0,0 @@
-# This node is run before the rest of the interface is configured.
-# We first check to see if DHCPv6 is still configured on the interface by
-# looking over at the interface address parameters.  Then we check to see
-# if the DHCPv6 client program is still running on this interface.  If both
-# of those are true, then any change to this tree means that the user
-# has changed this tree ONLY, and that we are going to have to re-start
-# the DHCPv6 client using the new parameters.
-
-
-priority: 319 # Run before interface has been configured
-
-help: DHCPv6 options
-
-end:
-    ifname="$VAR(../../@).$VAR(../@)"
-
-    dhcpv6_set=0
-    for param in $VAR(../address/@@); do
-	if [ "$param" = "dhcpv6" ]; then
-	    dhcpv6_set=1
-	fi
-    done
-
-    if [ $dhcpv6_set -eq 0 ]; then
-	echo "DHCPv6 is not configured on this interface"
-	exit 0
-    fi
-
-    conffile=/var/lib/dhcp/dhclient_v6_$ifname.conf
-    if [ ! -e $conffile ]; then
-	echo "Conf file $conffile doesn't exist"
-	exit 0
-    fi
-
-    if [ -n "$VAR(./parameters-only)" ]; then
-	arg1="--parameters-only"
-    fi
-
-    if [ -n "$VAR(./temporary)" ]; then
-	arg2="--temporary"
-    fi
-
-    echo "Re-starting DHCPv6 client on ${ifname}..."
-    sudo /opt/vyatta/sbin/vyatta-dhcpv6-client.pl --stop --start \
-	--ifname $ifname $arg1 $arg2
-    if [ $? != 0 ]; then
-        exit 1
-    fi
-
-    exit 0
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcpv6-options/parameters-only/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcpv6-options/parameters-only/node.def
deleted file mode 100644
index 0e407f81..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcpv6-options/parameters-only/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-
-help: Acquire only config parameters, not address
-
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcpv6-options/temporary/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcpv6-options/temporary/node.def
deleted file mode 100644
index a850ef4b..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/dhcpv6-options/temporary/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-
-help: IPv6 "temporary" address
-
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 5f60e6ab..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable-link-detect/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Ignore link state changes
-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/disable/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/disable/node.def
deleted file mode 100644
index 12db6a98..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/disable/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-help: Disable interface
-update: /etc/netplug/linkdown.d/dhclient $VAR(../../@).$VAR(../@)
-        if ! sudo ip link set $VAR(../../@).$VAR(../@) down 2>/dev/null; then
-          echo "Error disabling dev $VAR(../../@).$VAR(../@)"
-          /etc/netplug/linkup.d/dhclient $VAR(../../@).$VAR(../@)
-          exit 1
-        fi
-delete: if ! sudo ip link set $VAR(../../@).$VAR(../@) up; then
-          echo "Error enabling dev $VAR(../../@).$VAR(../@)"
-          exit 1
-        fi
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/egress-qos/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/egress-qos/node.def
deleted file mode 100644
index ea0b5c2a..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/egress-qos/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-help: VLAN egress QoS
-type: txt
-
-syntax:expression: pattern $VAR(@) "[:0-7 ]+$"; "QoS mapping should be in the format of \"0:7 2:3\" with numbers 0-9"
-
-create:expression: "true"
-update:expression: "false" ; \
-               "egress-qos can only be set at vlan creation for $VAR(../@)"
-comp_help: Format for qos mapping "0:1 1:6 7:6"
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ingress-qos/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ingress-qos/node.def
deleted file mode 100644
index 3f5d39fc..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ingress-qos/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-help: VLAN ingress QoS
-type: txt
-
-syntax:expression: pattern $VAR(@) "[:0-7 ]+$"; "QoS mapping should be in the format of \"0:7 2:3\" with numbers 0-9"
-
-create:expression: "true"
-update:expression: "false" ; \
-               "ingress-qos can only be set at vlan creation for $VAR(../@)"
-comp_help: Format for qos mapping "0:1 1:6 7:6"
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/arp-cache-timeout/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/arp-cache-timeout/node.def
deleted file mode 100644
index 054bc3b8..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/arp-cache-timeout/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-help: ARP cache entry timeout in seconds
-
-type: u32
-
-create:expression: "sudo sh -c \"echo $((1000*$VAR(@))) > /proc/sys/net/ipv4/neigh//$VAR(../../../@)\.$VAR(../../@)/base_reachable_time_ms\" "
-
-update:expression: "sudo sh -c \"echo $((1000*$VAR(@))) > /proc/sys/net/ipv4/neigh/$VAR(../../../@)\.$VAR(../../@)/base_reachable_time_ms\" "
-
-delete:expression: "sudo sh -c \"echo 30000 > /proc/sys/net/ipv4/neigh/$VAR(../../../@)\.$VAR(../../@)/base_reachable_time_ms\" "
-
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/enable-proxy-arp/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/enable-proxy-arp/node.def
deleted file mode 100644
index cd6d56d9..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/enable-proxy-arp/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Enable proxy-arp on this interface
-create:expression: "sudo sh -c \"echo 1 > /proc/sys/net/ipv4/conf/$VAR(../../../@).$VAR(../../@)/proxy_arp\" " 
-delete:expression: "sudo sh -c \"echo 0 > /proc/sys/net/ipv4/conf/$VAR(../../../@).$VAR(../../@)/proxy_arp\" " 
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/proxy-arp-pvlan/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/proxy-arp-pvlan/node.def
deleted file mode 100644
index 49bec357..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/proxy-arp-pvlan/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Enable private VLAN proxy ARP on this interface
-create:expression: "sudo sh -c \"echo 1 > /proc/sys/net/ipv4/conf/$VAR(../../../@).$VAR(../../@)/proxy_arp_pvlan\" "
-delete:expression: "sudo sh -c \"echo 0 > /proc/sys/net/ipv4/conf/$VAR(../../../@).$VAR(../../@)/proxy_arp_pvlan\" "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/mac/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/mac/node.def
deleted file mode 100644
index 750710ec..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/mac/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: macaddr
-help: Media Access Control (MAC) address
-
-update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../../@).$VAR(../@) --set-mac $VAR(@)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/mtu/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/mtu/node.def
deleted file mode 100644
index 21a10350..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/mtu/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: u32
-priority: 382
-help: Maximum Transmission Unit (MTU)
-val_help: u32:68-9000; Maximum Transmission Unit (MTU)
-syntax:expression: $VAR(@) >= 68 && $VAR(@) <= 9000; "MTU must be between 68 and 9000"
-
-update: sudo ip link set $VAR(../../@).$VAR(../@) mtu $VAR(@)
-delete: [ -d /sys/class/net/$VAR(../../@).$VAR(../@) ] || exit 0
-        sudo ip link set $VAR(../../@).$VAR(../@) mtu `cat /sys/class/net/$VAR(../../@)/mtu`