[bridge]: T1556: rewrite Bridge in new style XML syntax

39 files changed, 1 insertions, 301 deletions

diff --git a/Makefile.am b/Makefile.am
index 4ecc9dee..dc4f43f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -118,6 +118,7 @@ curver_DATA += cfg-version/l2tp@1
 curver_DATA += cfg-version/pptp@1
 curver_DATA += cfg-version/ntp@1
 curver_DATA += cfg-version/webproxy@2
+curver_DATA += cfg-version/interfaces@1
 
 cpiop = find  . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \
   cpio -0pd
diff --git a/cfg-version/interfaces@1 b/cfg-version/interfaces@1
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/cfg-version/interfaces@1
diff --git a/templates/interfaces/bonding/node.tag/bridge-group/bridge/node.def b/templates/interfaces/bonding/node.tag/bridge-group/bridge/node.def
deleted file mode 100644
index b6c48963..00000000
--- a/templates/interfaces/bonding/node.tag/bridge-group/bridge/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: txt
-
-help: Bridge group interface
-
-commit:expression: exec \
-   "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge"
-   
-allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=bridge
diff --git a/templates/interfaces/bonding/node.tag/bridge-group/cost/node.def b/templates/interfaces/bonding/node.tag/bridge-group/cost/node.def
deleted file mode 100644
index 243747b9..00000000
--- a/templates/interfaces/bonding/node.tag/bridge-group/cost/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Path cost for this port
-syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535"
-val_help: u32:1-65535; Path cost value for Spanning Tree Protocol
diff --git a/templates/interfaces/bonding/node.tag/bridge-group/node.def b/templates/interfaces/bonding/node.tag/bridge-group/node.def
deleted file mode 100644
index 778226a8..00000000
--- a/templates/interfaces/bonding/node.tag/bridge-group/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-priority: 320
-help: Add this interface to a bridge group
-
-end: /opt/vyatta/sbin/vyatta-bridge.pl ${COMMIT_ACTION} $VAR(../@)
diff --git a/templates/interfaces/bonding/node.tag/bridge-group/priority/node.def b/templates/interfaces/bonding/node.tag/bridge-group/priority/node.def
deleted file mode 100644
index be0ff479..00000000
--- a/templates/interfaces/bonding/node.tag/bridge-group/priority/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Bridge port priority
-syntax:expression: $VAR(@) >= 0 &&$VAR(@) < 64; "Port priority must be between 0-63"
-val_help: u32:0-63; Bridge port priority
diff --git a/templates/interfaces/bridge/node.def b/templates/interfaces/bridge/node.def
deleted file mode 100644
index cda535d5..00000000
--- a/templates/interfaces/bridge/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-tag:
-priority: 310
-type: txt
-help: Bridge interface name
-val_help: <brN>; Bridge interface name
-syntax:expression: pattern $VAR(@) "^br[0-9]+$" ; "Must be (br0 - br999)"
-
-create: /sbin/brctl addbr $VAR(@)
-	if [ -n "$VAR(mac/@)" ] ; then
-	   sudo ip li set dev $VAR(@) address $VAR(mac/@)
-	fi
-        sudo ip link set $VAR(@) up
-
-delete: if ! ${vyos_conf_scripts_dir}/bridge_has_members.py $VAR(@); then
-          exit 1;
-        fi
-        sudo ip link set $VAR(@) down;
-        sudo /sbin/brctl delbr $VAR(@);
diff --git a/templates/interfaces/bridge/node.tag/address/node.def b/templates/interfaces/bridge/node.tag/address/node.def
deleted file mode 100644
index ab0e5593..00000000
--- a/templates/interfaces/bridge/node.tag/address/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-multi:
-priority: 320
-type: txt
-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/bridge/node.tag/aging/node.def b/templates/interfaces/bridge/node.tag/aging/node.def
deleted file mode 100644
index ab83140f..00000000
--- a/templates/interfaces/bridge/node.tag/aging/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: u32
-help: Interval addresses are retained
-default: 300
-syntax:expression: $VAR(@) == 0 || ( $VAR(@) >= 10 && $VAR(@) < 1000000 ) ;
-	"Bridge aging time must be between 10 and 1000000 or zero"
-val_help: 0; Disable retaining address in bridge (always flood)
-val_help: u32:10-1000000; Address aging time for bridge seconds (default 300)
-
-update: /sbin/brctl setageing $VAR(../@) $VAR(@)
-delete: /sbin/brctl setageing $VAR(../@) 300
diff --git a/templates/interfaces/bridge/node.tag/description/node.def b/templates/interfaces/bridge/node.tag/description/node.def
deleted file mode 100644
index c6d2789d..00000000
--- a/templates/interfaces/bridge/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/bridge/node.tag/dhcp-options/client-id/node.def b/templates/interfaces/bridge/node.tag/dhcp-options/client-id/node.def
deleted file mode 100644
index 85ebe6e3..00000000
--- a/templates/interfaces/bridge/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/bridge/node.tag/dhcp-options/host-name/node.def b/templates/interfaces/bridge/node.tag/dhcp-options/host-name/node.def
deleted file mode 100644
index 80d28fbd..00000000
--- a/templates/interfaces/bridge/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/bridge/node.tag/dhcp-options/node.def b/templates/interfaces/bridge/node.tag/dhcp-options/node.def
deleted file mode 100644
index e90406df..00000000
--- a/templates/interfaces/bridge/node.tag/dhcp-options/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: DHCP options
diff --git a/templates/interfaces/bridge/node.tag/dhcpv6-options/node.def b/templates/interfaces/bridge/node.tag/dhcpv6-options/node.def
deleted file mode 100644
index d25533f9..00000000
--- a/templates/interfaces/bridge/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/bridge/node.tag/dhcpv6-options/parameters-only/node.def b/templates/interfaces/bridge/node.tag/dhcpv6-options/parameters-only/node.def
deleted file mode 100644
index 0e407f81..00000000
--- a/templates/interfaces/bridge/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/bridge/node.tag/dhcpv6-options/temporary/node.def b/templates/interfaces/bridge/node.tag/dhcpv6-options/temporary/node.def
deleted file mode 100644
index a850ef4b..00000000
--- a/templates/interfaces/bridge/node.tag/dhcpv6-options/temporary/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-
-help: IPv6 "temporary" address
-
diff --git a/templates/interfaces/bridge/node.tag/disable-link-detect/node.def b/templates/interfaces/bridge/node.tag/disable-link-detect/node.def
deleted file mode 100644
index 7129ff33..00000000
--- a/templates/interfaces/bridge/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/bridge/node.tag/disable/node.def b/templates/interfaces/bridge/node.tag/disable/node.def
deleted file mode 100644
index 3f37a6d6..00000000
--- a/templates/interfaces/bridge/node.tag/disable/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-help: Disable the bridge interface
-update: /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/bridge/node.tag/forwarding-delay/node.def b/templates/interfaces/bridge/node.tag/forwarding-delay/node.def
deleted file mode 100644
index 7783339b..00000000
--- a/templates/interfaces/bridge/node.tag/forwarding-delay/node.def
+++ /dev/null
@@ -1,5 +0,0 @@
-type: u32
-help: Forwarding delay
-syntax:expression:$VAR(@) <= 200; "Forwarding delay must be between 0 and 200"
-val_help: u32:0-200; Spanning Tree Protocol forwarding delay in seconds (default 15)
-update: /sbin/brctl setfd $VAR(../@) $VAR(@)
diff --git a/templates/interfaces/bridge/node.tag/hello-time/node.def b/templates/interfaces/bridge/node.tag/hello-time/node.def
deleted file mode 100644
index f6d54d73..00000000
--- a/templates/interfaces/bridge/node.tag/hello-time/node.def
+++ /dev/null
@@ -1,7 +0,0 @@
-type: u32
-default: 2
-help: Hello packet advertisment interval
-syntax:expression: $VAR(@) <= 30; "Bridge Hello interval must be between 0 and 30 seconds"
-val_help: u32:0-30; Spanning Tree Protocol hello advertisement interval (default 2)
-update: /sbin/brctl sethello $VAR(../@) $VAR(@)
-delete: /sbin/brctl sethello $VAR(../@) 2
diff --git a/templates/interfaces/bridge/node.tag/igmp-snooping/node.def b/templates/interfaces/bridge/node.tag/igmp-snooping/node.def
deleted file mode 100644
index 13471e47..00000000
--- a/templates/interfaces/bridge/node.tag/igmp-snooping/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: IGMP snooping settings
diff --git a/templates/interfaces/bridge/node.tag/igmp-snooping/querier/node.def b/templates/interfaces/bridge/node.tag/igmp-snooping/querier/node.def
deleted file mode 100644
index d6d5a1a3..00000000
--- a/templates/interfaces/bridge/node.tag/igmp-snooping/querier/node.def
+++ /dev/null
@@ -1,21 +0,0 @@
-type: txt
-
-help: Enable or disable IGMP querier
-
-val_help: enable; Enable IGMP querier
-val_help: disable; Disable IGMP querier
-
-default: "disable"
-
-syntax:expression: $VAR(@) in "enable", "disable"; "querier option value must be enable or disable"
-
-update:
-        if [ x$VAR(@) == xenable ]; then
-            sudo sh -c "echo 1 > /sys/devices/virtual/net/$VAR(../../@)/bridge/multicast_querier"
-        else
-            sudo sh -c "echo 0 > /sys/devices/virtual/net/$VAR(../../@)/bridge/multicast_querier"
-        fi
-
-delete:
-        sudo sh -c "echo 0 > /sys/devices/virtual/net/$VAR(../../@)/bridge/multicast_querier"
-
diff --git a/templates/interfaces/bridge/node.tag/ip/arp-cache-timeout/node.def b/templates/interfaces/bridge/node.tag/ip/arp-cache-timeout/node.def
deleted file mode 100644
index 4441914c..00000000
--- a/templates/interfaces/bridge/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/bridge/node.tag/mac/node.def b/templates/interfaces/bridge/node.tag/mac/node.def
deleted file mode 100644
index 5b797830..00000000
--- a/templates/interfaces/bridge/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/bridge/node.tag/max-age/node.def b/templates/interfaces/bridge/node.tag/max-age/node.def
deleted file mode 100644
index 452313ad..00000000
--- a/templates/interfaces/bridge/node.tag/max-age/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-type: u32
-help: Interval at which neighbor bridges are removed
-default: 20
-syntax:expression: $VAR(@) >= 6 && $VAR(@) <= 200 ;
-	"Bridge max aging value must be between 6 and 200"
-val_help: u32:6-200; Bridge maximum aging time value (default 20)
-
-update: /sbin/brctl setmaxage $VAR(../@) $VAR(@)
-delete: /sbin/brctl setmaxage $VAR(../@) 20
-
diff --git a/templates/interfaces/bridge/node.tag/priority/node.def b/templates/interfaces/bridge/node.tag/priority/node.def
deleted file mode 100644
index 3e35dc67..00000000
--- a/templates/interfaces/bridge/node.tag/priority/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-type: u32
-help: Priority for this bridge
-default: 32768
-syntax:expression:$VAR(@) < 65536 ; "Bridge priority must be between 0 and 65535 (multiples of 4096)"
-val_help: u32:0-65535; Bridge priority (default 32768)
-
-update: /sbin/brctl setbridgeprio $VAR(../@) $VAR(@)
-delete: /sbin/brctl setbridgeprio $VAR(../@) 32768
diff --git a/templates/interfaces/bridge/node.tag/stp/node.def b/templates/interfaces/bridge/node.tag/stp/node.def
deleted file mode 100644
index 63000648..00000000
--- a/templates/interfaces/bridge/node.tag/stp/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: bool
-default: false
-help: Enable spanning tree protocol
-val_help: true; Enable Spanning Tree Protocol
-val_help: false; Disable Spanning Tree Protocol (default)
-
-update: if [ "$VAR(@)" == "true" ]; then
-	  if [ -z "$VAR(../../forwarding-delay)" ]; then
-		/sbin/brctl setfd $VAR(../@) 15
-          else
-		/sbin/brctl setfd $VAR(../@) $VAR(../../forwarding-delay)
-          fi
-	  /sbin/brctl stp $VAR(../@) on
-        else
-          /sbin/brctl stp $VAR(../@) off
-          /sbin/brctl setfd $VAR(../@) 0
-        fi
-delete:/sbin/brctl stp $VAR(../@) off
diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def
deleted file mode 100644
index d58e8f07..00000000
--- a/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: txt
-
-help: Bridge group name
-
-syntax:expression: pattern $VAR(@) "^br[0-9]+$" \
-		   ; "$VAR(@): not a valid name for a bridge"
-
-commit:expression: exec \
-   "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge"
-
-allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=bridge
-
diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def
deleted file mode 100644
index 22bac5a2..00000000
--- a/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Bridge port cost
-syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535"
-val_help: u32:1-65535; Path cost value for Spanning Tree Protocol
diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/node.def
deleted file mode 100644
index 74ecab4d..00000000
--- a/templates/interfaces/ethernet/node.tag/bridge-group/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Add this interface to a bridge group
-
-end: /opt/vyatta/sbin/vyatta-bridge.pl ${COMMIT_ACTION} $VAR(../@)
diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def
deleted file mode 100644
index be0ff479..00000000
--- a/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Bridge port priority
-syntax:expression: $VAR(@) >= 0 &&$VAR(@) < 64; "Port priority must be between 0-63"
-val_help: u32:0-63; Bridge port priority
diff --git a/templates/interfaces/l2tpv3/node.tag/bridge-group/bridge/node.def b/templates/interfaces/l2tpv3/node.tag/bridge-group/bridge/node.def
deleted file mode 100644
index d58e8f07..00000000
--- a/templates/interfaces/l2tpv3/node.tag/bridge-group/bridge/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: txt
-
-help: Bridge group name
-
-syntax:expression: pattern $VAR(@) "^br[0-9]+$" \
-		   ; "$VAR(@): not a valid name for a bridge"
-
-commit:expression: exec \
-   "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge"
-
-allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=bridge
-
diff --git a/templates/interfaces/l2tpv3/node.tag/bridge-group/cost/node.def b/templates/interfaces/l2tpv3/node.tag/bridge-group/cost/node.def
deleted file mode 100644
index 22bac5a2..00000000
--- a/templates/interfaces/l2tpv3/node.tag/bridge-group/cost/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Bridge port cost
-syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535"
-val_help: u32:1-65535; Path cost value for Spanning Tree Protocol
diff --git a/templates/interfaces/l2tpv3/node.tag/bridge-group/node.def b/templates/interfaces/l2tpv3/node.tag/bridge-group/node.def
deleted file mode 100644
index 74ecab4d..00000000
--- a/templates/interfaces/l2tpv3/node.tag/bridge-group/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Add this interface to a bridge group
-
-end: /opt/vyatta/sbin/vyatta-bridge.pl ${COMMIT_ACTION} $VAR(../@)
diff --git a/templates/interfaces/l2tpv3/node.tag/bridge-group/priority/node.def b/templates/interfaces/l2tpv3/node.tag/bridge-group/priority/node.def
deleted file mode 100644
index be0ff479..00000000
--- a/templates/interfaces/l2tpv3/node.tag/bridge-group/priority/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Bridge port priority
-syntax:expression: $VAR(@) >= 0 &&$VAR(@) < 64; "Port priority must be between 0-63"
-val_help: u32:0-63; Bridge port priority
diff --git a/templates/interfaces/vxlan/node.tag/bridge-group/bridge/node.def b/templates/interfaces/vxlan/node.tag/bridge-group/bridge/node.def
deleted file mode 100644
index d58e8f07..00000000
--- a/templates/interfaces/vxlan/node.tag/bridge-group/bridge/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: txt
-
-help: Bridge group name
-
-syntax:expression: pattern $VAR(@) "^br[0-9]+$" \
-		   ; "$VAR(@): not a valid name for a bridge"
-
-commit:expression: exec \
-   "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge"
-
-allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=bridge
-
diff --git a/templates/interfaces/vxlan/node.tag/bridge-group/cost/node.def b/templates/interfaces/vxlan/node.tag/bridge-group/cost/node.def
deleted file mode 100644
index 22bac5a2..00000000
--- a/templates/interfaces/vxlan/node.tag/bridge-group/cost/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Bridge port cost
-syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535"
-val_help: u32:1-65535; Path cost value for Spanning Tree Protocol
diff --git a/templates/interfaces/vxlan/node.tag/bridge-group/node.def b/templates/interfaces/vxlan/node.tag/bridge-group/node.def
deleted file mode 100644
index 74ecab4d..00000000
--- a/templates/interfaces/vxlan/node.tag/bridge-group/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Add this interface to a bridge group
-
-end: /opt/vyatta/sbin/vyatta-bridge.pl ${COMMIT_ACTION} $VAR(../@)
diff --git a/templates/interfaces/vxlan/node.tag/bridge-group/priority/node.def b/templates/interfaces/vxlan/node.tag/bridge-group/priority/node.def
deleted file mode 100644
index be0ff479..00000000
--- a/templates/interfaces/vxlan/node.tag/bridge-group/priority/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-type: u32
-help: Bridge port priority
-syntax:expression: $VAR(@) >= 0 &&$VAR(@) < 64; "Port priority must be between 0-63"
-val_help: u32:0-63; Bridge port priority