summaryrefslogtreecommitdiff
path: root/templates/interfaces/tunnel
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-07-16 14:51:13 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-07-16 17:28:50 -0700
commitc317fda4786d93e9cdf94deb1e52c5d581360b7e (patch)
tree482402f3382ef5dc9c3f4d67c73384ff2a3a86e5 /templates/interfaces/tunnel
parentd7839af77fec135ed8342d935a6cb0e136a0d8cb (diff)
downloadvyatta-cfg-quagga-c317fda4786d93e9cdf94deb1e52c5d581360b7e.tar.gz
vyatta-cfg-quagga-c317fda4786d93e9cdf94deb1e52c5d581360b7e.zip
Add syntax validation for bridge STP parameters
The syntax range for bridge STP values was missing or incorrect. Bug 5864
Diffstat (limited to 'templates/interfaces/tunnel')
-rw-r--r--templates/interfaces/tunnel/node.tag/bridge-group/cost/node.def9
-rw-r--r--templates/interfaces/tunnel/node.tag/bridge-group/priority/node.def10
2 files changed, 5 insertions, 14 deletions
diff --git a/templates/interfaces/tunnel/node.tag/bridge-group/cost/node.def b/templates/interfaces/tunnel/node.tag/bridge-group/cost/node.def
index ed3bee26..33763624 100644
--- a/templates/interfaces/tunnel/node.tag/bridge-group/cost/node.def
+++ b/templates/interfaces/tunnel/node.tag/bridge-group/cost/node.def
@@ -1,9 +1,4 @@
type: u32
help: Set the path cost for this port
-comp_help: possible completions:
- <0-2147483647> Set port cost
-commit:expression: $VAR(../bridge/@) != ""; "interface must first be assigned to a bridge"
-create: sudo brctl setpathcost $VAR(../bridge/@) $VAR(../../@) $VAR(@) ||
- echo interfaces tunnel $VAR(../../@) bridge-group cost: error setting bridge cost
-delete: if [ -n "$( sudo brctl show | egrep $VAR(../../@) )" ]; then sudo brctl setpathcost $VAR(../bridge/@) $VAR(../../@) 0; fi;
-
+syntax:expression: $VAR(@) >= 1 && $VAR(@) < 65536 ; "Bridge cost value must be between 1 and 65535"
+val_help:<1-65535>; Path cost value for Spanning Tree Protocol
diff --git a/templates/interfaces/tunnel/node.tag/bridge-group/priority/node.def b/templates/interfaces/tunnel/node.tag/bridge-group/priority/node.def
index fe174f1f..d7a2f7a0 100644
--- a/templates/interfaces/tunnel/node.tag/bridge-group/priority/node.def
+++ b/templates/interfaces/tunnel/node.tag/bridge-group/priority/node.def
@@ -1,8 +1,4 @@
type: u32
-help: Set the path priority for this port
-comp_help: possible completions:
- <0-255> Set port priority
-commit:expression: $VAR(../bridge/@) != ""; "interface must first be assigned to a bridge"
-create: sudo brctl setportprio $VAR(../bridge/@) $VAR(../../@) $VAR(@) ||
- echo interfaces tunnel $VAR(../../@) bridge-group priority: error setting bridge priority
-delete: if [ -n "$( sudo brctl show | egrep "$VAR(../../@)" )" ]; then sudo brctl setportprio $VAR(../bridge/@) $VAR(../../@) 0; fi;
+help: Set the port priority for this port
+syntax:expression: $VAR(@) >= 0 &&$VAR(@) <= 255; "Port priority must be between 1-255"
+val_help:<1-255>; Bridge port priority