bridge: T1556: migrate bridge config to XML/Python

28 files changed, 0 insertions, 152 deletions

diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/bridge-group/bridge/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/bridge-group/bridge/node.def
deleted file mode 100644
index 0766f8af..00000000
--- a/templates/interfaces/bonding/node.tag/vif-s/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/vif-s/node.tag/bridge-group/cost/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/bridge-group/cost/node.def
deleted file mode 100644
index 243747b9..00000000
--- a/templates/interfaces/bonding/node.tag/vif-s/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/vif-s/node.tag/bridge-group/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/bridge-group/node.def
deleted file mode 100644
index b603bb8c..00000000
--- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/bridge-group/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-priority: 325 # after vif and bridge
-help: Add this interface to a bridge group
-
-end: /opt/vyatta/sbin/vyatta-bridge.pl ${COMMIT_ACTION} $VAR(../../@).$VAR(../@)
diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/bridge-group/priority/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/bridge-group/priority/node.def
deleted file mode 100644
index be0ff479..00000000
--- a/templates/interfaces/bonding/node.tag/vif-s/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/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/bridge/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/bridge/node.def
deleted file mode 100644
index 0766f8af..00000000
--- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/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/vif-s/node.tag/vif-c/node.tag/bridge-group/cost/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/cost/node.def
deleted file mode 100644
index 243747b9..00000000
--- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/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/vif-s/node.tag/vif-c/node.tag/bridge-group/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/node.def
deleted file mode 100644
index f1e45c42..00000000
--- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-priority: 325 # after vif and bridge
-help: Add this interface to a bridge group
-
-end: /opt/vyatta/sbin/vyatta-bridge.pl ${COMMIT_ACTION} $VAR(../../../@).$VAR(../../@).$VAR(../@)
diff --git a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/priority/node.def b/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/priority/node.def
deleted file mode 100644
index be0ff479..00000000
--- a/templates/interfaces/bonding/node.tag/vif-s/node.tag/vif-c/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/bonding/node.tag/vif/node.tag/bridge-group/bridge/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/bridge/node.def
deleted file mode 100644
index 0766f8af..00000000
--- a/templates/interfaces/bonding/node.tag/vif/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/vif/node.tag/bridge-group/cost/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/cost/node.def
deleted file mode 100644
index 243747b9..00000000
--- a/templates/interfaces/bonding/node.tag/vif/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/vif/node.tag/bridge-group/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/node.def
deleted file mode 100644
index b603bb8c..00000000
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/node.def
+++ /dev/null
@@ -1,4 +0,0 @@
-priority: 325 # after vif and bridge
-help: Add this interface to a bridge group
-
-end: /opt/vyatta/sbin/vyatta-bridge.pl ${COMMIT_ACTION} $VAR(../../@).$VAR(../@)
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/priority/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/bridge-group/priority/node.def
deleted file mode 100644
index be0ff479..00000000
--- a/templates/interfaces/bonding/node.tag/vif/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/ethernet/node.tag/vif-s/node.tag/bridge-group/bridge/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/bridge-group/bridge/node.def
deleted file mode 100644
index 0d1f16e2..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/bridge-group/bridge/node.def
+++ /dev/null
@@ -1,9 +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/ethernet/node.tag/vif-s/node.tag/bridge-group/cost/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/bridge-group/cost/node.def
deleted file mode 100644
index 243747b9..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/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/ethernet/node.tag/vif-s/node.tag/bridge-group/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/bridge-group/node.def
deleted file mode 100644
index dfd046c2..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/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(../../@).$VAR(../@)
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/bridge-group/priority/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/bridge-group/priority/node.def
deleted file mode 100644
index be0ff479..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/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/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/bridge/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/bridge/node.def
deleted file mode 100644
index 0d1f16e2..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/bridge/node.def
+++ /dev/null
@@ -1,9 +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/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/cost/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/cost/node.def
deleted file mode 100644
index 243747b9..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/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/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/node.def
deleted file mode 100644
index a2f2ae42..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/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(../../../@).$VAR(../../@).$VAR(../@)
diff --git a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/priority/node.def b/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/node.tag/bridge-group/priority/node.def
deleted file mode 100644
index be0ff479..00000000
--- a/templates/interfaces/ethernet/node.tag/vif-s/node.tag/vif-c/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/ethernet/node.tag/vif/node.tag/bridge-group/bridge/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/bridge/node.def
deleted file mode 100644
index 0d1f16e2..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/bridge/node.def
+++ /dev/null
@@ -1,9 +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/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/cost/node.def
deleted file mode 100644
index 243747b9..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/ethernet/node.tag/vif/node.tag/bridge-group/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/node.def
deleted file mode 100644
index dfd046c2..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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(../../@).$VAR(../@)
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/bridge-group/priority/node.def
deleted file mode 100644
index be0ff479..00000000
--- a/templates/interfaces/ethernet/node.tag/vif/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/tunnel/node.tag/parameters/ip/bridge-group/bridge/node.def b/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/bridge/node.def
deleted file mode 100644
index 84d2c983..00000000
--- a/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/bridge/node.def
+++ /dev/null
@@ -1,20 +0,0 @@
-type: txt
-help: Bridge group interface
-allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=bridge
-commit:expression: exec \
-   "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge"
-commit:expression: $VAR(../../../../encapsulation/@) == "gre-bridge"; "tunnel encapsulation type must be gre-bridge"
-create:
-   # TODO: need to add logic for update as we need to remove the interface first.
-   if [ "$(ip link show $VAR(../../../../@) | grep ether)" ]; then
-      sudo brctl addif $VAR(@) $VAR(../../../../@) ||
-         echo interfaces tunnel $VAR(../../../../@) bridge-group bridge $VAR(@): error adding interface to bridge
-   else
-      echo interfaces tunnel $VAR(../../../../@) bridge-group bridge $VAR(@): tunnel encapsulation type must be gre-bridge
-      exit 1
-   fi
-delete: if [ -d /sys/class/net/$VAR(@) ]; then
-            sudo brctl delif $VAR(@) $VAR(../../../../@)
-        else
-            exit 0
-        fi
diff --git a/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/cost/node.def b/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/cost/node.def
deleted file mode 100644
index 243747b9..00000000
--- a/templates/interfaces/tunnel/node.tag/parameters/ip/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/tunnel/node.tag/parameters/ip/bridge-group/node.def b/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/node.def
deleted file mode 100644
index 663979dd..00000000
--- a/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Add this interface to a bridge group
diff --git a/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/priority/node.def b/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/priority/node.def
deleted file mode 100644
index be0ff479..00000000
--- a/templates/interfaces/tunnel/node.tag/parameters/ip/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