macvlan: T1635: migrate pseudo-ethernet interface definition to XML/Python

60 files changed, 0 insertions, 575 deletions

diff --git a/templates/interfaces/pseudo-ethernet/node.def b/templates/interfaces/pseudo-ethernet/node.def
deleted file mode 100644
index 14fe64aa..00000000
--- a/templates/interfaces/pseudo-ethernet/node.def
+++ /dev/null
@@ -1,19 +0,0 @@
-tag:
-priority: 319 # same as vif
-type: txt
-help: Pseudo Ethernet device name
-val_help: <pethN>; Pseudo Ethernet interface name
-
-syntax:expression: pattern $VAR(@) "^peth[0-9]+$" \
-         ; "name must be (peth0-peth999)"
-
-commit:expression: $VAR(link) != "" 
-         ; "link device must be set for virtual ethernet $VAR(@)"
-
-create:	sudo ip link add $VAR(@) link $VAR(link/@) type macvlan mode $VAR(mode/@) || exit 1
-	if ! cli-shell-api exists interfaces ethernet $VAR(@) disable;
-	then sudo ip link set $VAR(@) up
-	fi
-	/opt/vyatta/sbin/vyatta-link-detect $VAR(@) on
-
-delete: sudo ip link delete dev $VAR(@) type macvlan
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/address/node.def b/templates/interfaces/pseudo-ethernet/node.tag/address/node.def
deleted file mode 100644
index 253c4775..00000000
--- a/templates/interfaces/pseudo-ethernet/node.tag/address/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-multi:
-type: txt
-priority: 320 # After peth device is initialized
-help: IP address
-
-syntax:expression: exec "/opt/vyatta/sbin/valid_address $VAR(@)"
-
-create: sudo /opt/vyatta/sbin/vyatta-address add $VAR(../@) $VAR(@)
-
-delete: sudo /opt/vyatta/sbin/vyatta-address delete $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/pseudo-ethernet/node.tag/description/node.def b/templates/interfaces/pseudo-ethernet/node.tag/description/node.def
deleted file mode 100644
index e57584a8..00000000
--- a/templates/interfaces/pseudo-ethernet/node.tag/description/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-help: Description for this interface
-
-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/pseudo-ethernet/node.tag/dhcp-options/client-id/node.def b/templates/interfaces/pseudo-ethernet/node.tag/dhcp-options/client-id/node.def
deleted file mode 100644
index 85ebe6e3..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/dhcp-options/host-name/node.def b/templates/interfaces/pseudo-ethernet/node.tag/dhcp-options/host-name/node.def
deleted file mode 100644
index 80d28fbd..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/dhcp-options/node.def b/templates/interfaces/pseudo-ethernet/node.tag/dhcp-options/node.def
deleted file mode 100644
index e90406df..00000000
--- a/templates/interfaces/pseudo-ethernet/node.tag/dhcp-options/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: DHCP options
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/dhcpv6-options/node.def b/templates/interfaces/pseudo-ethernet/node.tag/dhcpv6-options/node.def
deleted file mode 100644
index d25533f9..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/dhcpv6-options/parameters-only/node.def b/templates/interfaces/pseudo-ethernet/node.tag/dhcpv6-options/parameters-only/node.def
deleted file mode 100644
index 0e407f81..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/dhcpv6-options/temporary/node.def b/templates/interfaces/pseudo-ethernet/node.tag/dhcpv6-options/temporary/node.def
deleted file mode 100644
index a850ef4b..00000000
--- a/templates/interfaces/pseudo-ethernet/node.tag/dhcpv6-options/temporary/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-
-help: IPv6 "temporary" address
-
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/disable-link-detect/node.def b/templates/interfaces/pseudo-ethernet/node.tag/disable-link-detect/node.def
deleted file mode 100644
index 7129ff33..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/disable/node.def b/templates/interfaces/pseudo-ethernet/node.tag/disable/node.def
deleted file mode 100644
index c4bfba77..00000000
--- a/templates/interfaces/pseudo-ethernet/node.tag/disable/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-help: Disable interface
-create: vif=`/opt/vyatta/sbin/vyatta-interfaces.pl --vif=$VAR(../@) --show=all`
-        if [ ! -z "$vif" ]; then
-          echo "Can not disable interface " $VAR(../@) " with vif:" $vif
-          exit 1
-        fi
-        /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: if ! sudo ip link set $VAR(../@) up; then
-          echo "Error enabling dev $VAR(../@)"
-          exit 1
-        fi
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/ip/arp-cache-timeout/node.def b/templates/interfaces/pseudo-ethernet/node.tag/ip/arp-cache-timeout/node.def
deleted file mode 100644
index 4441914c..00000000
--- a/templates/interfaces/pseudo-ethernet/node.tag/ip/arp-cache-timeout/node.def
+++ /dev/null
@@ -1,9 +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/pseudo-ethernet/node.tag/ip/enable-proxy-arp/node.def b/templates/interfaces/pseudo-ethernet/node.tag/ip/enable-proxy-arp/node.def
deleted file mode 100644
index ae7ba09a..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/ip/proxy-arp-pvlan/node.def b/templates/interfaces/pseudo-ethernet/node.tag/ip/proxy-arp-pvlan/node.def
deleted file mode 100644
index a6cf9494..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/link/node.def b/templates/interfaces/pseudo-ethernet/node.tag/link/node.def
deleted file mode 100644
index 13d4c612..00000000
--- a/templates/interfaces/pseudo-ethernet/node.tag/link/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: txt
-commit:expression: exec \
-    "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=ethernet"
-allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=ethernet
-help: Lower link device
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/mac/node.def b/templates/interfaces/pseudo-ethernet/node.tag/mac/node.def
deleted file mode 100644
index 8d9e2f16..00000000
--- a/templates/interfaces/pseudo-ethernet/node.tag/mac/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-type: macaddr
-help: Media Access Control (MAC) address
-syntax:expression: exec "\
-	/opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --valid-mac $VAR(@)"
-update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --set-mac $VAR(@)
-
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/mode/node.def b/templates/interfaces/pseudo-ethernet/node.tag/mode/node.def
deleted file mode 100644
index ed557760..00000000
--- a/templates/interfaces/pseudo-ethernet/node.tag/mode/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-type: txt
-help: receive mode
-default: "private"
-allowed: echo "private vepa bridge passthru"
-syntax:expression: $VAR(@) in "private", "vepa", "bridge", "passthru" ; \
-    "mode must be private, vepa, bridge or passthru"
-
-val_help:private: No communication with other pseudo-devices
-val_help:vepa: Virtual Ethernet Port Aggregator reflective relay
-val_help:bridge: Simple bridge between pseudo-devices
-val_help:passthru: Promicious mode passthrough of underlying device
-
-update: sudo ip link set dev $VAR(../@) type macvlan mode $VAR(@)
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.def
deleted file mode 100644
index 0d338c1d..00000000
--- a/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-tag:
-priority: 320
-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
-
-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/pseudo-ethernet/node.tag/vif-s/node.tag/address/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/address/node.def
deleted file mode 100644
index db361f38..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif-s/node.tag/description/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/description/node.def
deleted file mode 100644
index a0b29f05..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif-s/node.tag/dhcp-options/client-id/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/dhcp-options/client-id/node.def
deleted file mode 100644
index 85ebe6e3..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif-s/node.tag/dhcp-options/host-name/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/dhcp-options/host-name/node.def
deleted file mode 100644
index 80d28fbd..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif-s/node.tag/dhcp-options/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/dhcp-options/node.def
deleted file mode 100644
index e90406df..00000000
--- a/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/dhcp-options/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: DHCP options
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/dhcpv6-options/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/dhcpv6-options/node.def
deleted file mode 100644
index d6fea411..00000000
--- a/templates/interfaces/pseudo-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_$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
-
-    exit 0
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/dhcpv6-options/parameters-only/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/dhcpv6-options/parameters-only/node.def
deleted file mode 100644
index 0e407f81..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif-s/node.tag/dhcpv6-options/temporary/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/dhcpv6-options/temporary/node.def
deleted file mode 100644
index a850ef4b..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif-s/node.tag/disable-link-detect/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/disable-link-detect/node.def
deleted file mode 100644
index 5f60e6ab..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif-s/node.tag/disable/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/disable/node.def
deleted file mode 100644
index 12db6a98..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif-s/node.tag/ethertype/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/ethertype/node.def
deleted file mode 100644
index e88ff7e5..00000000
--- a/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/ethertype/node.def
+++ /dev/null
@@ -1,21 +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 pseudo-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
-        sudo ip link add link $VAR(../../@) name "$VAR(../../@).$VAR(../@)" type vlan proto $ETHTYPE id $VAR(../@) || exit 1
-        sudo ip link set "$VAR(../../@).$VAR(../@)" up
-        /opt/vyatta/sbin/vyatta-link-detect "$VAR(../../@).$VAR(../@)" on
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/ip/enable-proxy-arp/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/ip/enable-proxy-arp/node.def
deleted file mode 100644
index cd6d56d9..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif-s/node.tag/mac/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/mac/node.def
deleted file mode 100644
index 750710ec..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif-s/node.tag/mtu/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/mtu/node.def
deleted file mode 100644
index b3f3e7c7..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.def
deleted file mode 100644
index 7dfb8a1c..00000000
--- a/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-tag:
-priority: 321
-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: sudo ip link add link $VAR(../../@).$VAR(../@) name "$VAR(../../@).$VAR(../@).$VAR(@)" type vlan proto 802.1q id $VAR(@) || exit 1
-        sudo ip link set "$VAR(../../@).$VAR(../@).$VAR(@)" up
-	/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/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/address/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/address/node.def
deleted file mode 100644
index 93476d60..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/description/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/description/node.def
deleted file mode 100644
index 9324ce1b..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcp-options/client-id/node.def b/templates/interfaces/pseudo-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/pseudo-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/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcp-options/host-name/node.def b/templates/interfaces/pseudo-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/pseudo-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/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcp-options/node.def b/templates/interfaces/pseudo-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/pseudo-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/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/node.def
deleted file mode 100644
index 0be14824..00000000
--- a/templates/interfaces/pseudo-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_$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
-
-    exit 0
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/parameters-only/node.def b/templates/interfaces/pseudo-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/pseudo-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/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/dhcpv6-options/temporary/node.def b/templates/interfaces/pseudo-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/pseudo-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/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/disable-link-detect/node.def b/templates/interfaces/pseudo-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/pseudo-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/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/disable/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/disable/node.def
deleted file mode 100644
index 7069e9c9..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/ip/enable-proxy-arp/node.def b/templates/interfaces/pseudo-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/pseudo-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/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/mac/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/mac/node.def
deleted file mode 100644
index 24b4b4d7..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/mtu/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/mtu/node.def
deleted file mode 100644
index 264c429b..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif/node.def
deleted file mode 100644
index d66c2fbe..00000000
--- a/templates/interfaces/pseudo-ethernet/node.tag/vif/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-tag:
-priority: 320
-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: sudo ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@) || exit 1
-        sudo ip link set "$VAR(../@).$VAR(@)" up
-	/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/pseudo-ethernet/node.tag/vif/node.tag/address/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/address/node.def
deleted file mode 100644
index db361f38..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif/node.tag/description/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/description/node.def
deleted file mode 100644
index a0b29f05..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif/node.tag/dhcp-options/client-id/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/dhcp-options/client-id/node.def
deleted file mode 100644
index 85ebe6e3..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif/node.tag/dhcp-options/host-name/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/dhcp-options/host-name/node.def
deleted file mode 100644
index 80d28fbd..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif/node.tag/dhcp-options/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/dhcp-options/node.def
deleted file mode 100644
index e90406df..00000000
--- a/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/dhcp-options/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: DHCP options
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/dhcpv6-options/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/dhcpv6-options/node.def
deleted file mode 100644
index d6fea411..00000000
--- a/templates/interfaces/pseudo-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_$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
-
-    exit 0
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/dhcpv6-options/parameters-only/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/dhcpv6-options/parameters-only/node.def
deleted file mode 100644
index 0e407f81..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif/node.tag/dhcpv6-options/temporary/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/dhcpv6-options/temporary/node.def
deleted file mode 100644
index a850ef4b..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/disable-link-detect/node.def
deleted file mode 100644
index 5f60e6ab..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif/node.tag/disable/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/disable/node.def
deleted file mode 100644
index 12db6a98..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif/node.tag/ip/enable-proxy-arp/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/ip/enable-proxy-arp/node.def
deleted file mode 100644
index cd6d56d9..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif/node.tag/mac/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/mac/node.def
deleted file mode 100644
index 750710ec..00000000
--- a/templates/interfaces/pseudo-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/pseudo-ethernet/node.tag/vif/node.tag/mtu/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif/node.tag/mtu/node.def
deleted file mode 100644
index b3f3e7c7..00000000
--- a/templates/interfaces/pseudo-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 1500