diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-16 14:51:13 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-16 17:28:50 -0700 |
| commit | c317fda4786d93e9cdf94deb1e52c5d581360b7e (patch) | |
| tree | 482402f3382ef5dc9c3f4d67c73384ff2a3a86e5 | |
| parent | d7839af77fec135ed8342d935a6cb0e136a0d8cb (diff) | |
| download | vyatta-cfg-system-c317fda4786d93e9cdf94deb1e52c5d581360b7e.tar.gz vyatta-cfg-system-c317fda4786d93e9cdf94deb1e52c5d581360b7e.zip | |
Add syntax validation for bridge STP parameters
The syntax range for bridge STP values was missing or incorrect.
Bug 5864
11 files changed, 28 insertions, 52 deletions
diff --git a/templates/interfaces/bonding/node.tag/bridge-group/cost/node.def b/templates/interfaces/bonding/node.tag/bridge-group/cost/node.def index f90f4769..33763624 100644 --- a/templates/interfaces/bonding/node.tag/bridge-group/cost/node.def +++ b/templates/interfaces/bonding/node.tag/bridge-group/cost/node.def @@ -1,6 +1,4 @@ type: u32 - help: Set the path cost for this port - -comp_help: possible completions: - <0-2147483647> Set port cost +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/bonding/node.tag/bridge-group/priority/node.def b/templates/interfaces/bonding/node.tag/bridge-group/priority/node.def index 5c11ec4f..d7a2f7a0 100644 --- a/templates/interfaces/bonding/node.tag/bridge-group/priority/node.def +++ b/templates/interfaces/bonding/node.tag/bridge-group/priority/node.def @@ -1,6 +1,4 @@ type: u32 - -help: Set the path priority for this port - -comp_help: possible completions: - <0-255> Set port priority +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 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 index f90f4769..33763624 100644 --- 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 @@ -1,6 +1,4 @@ type: u32 - help: Set the path cost for this port - -comp_help: possible completions: - <0-2147483647> Set port cost +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/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 index 5c11ec4f..d7a2f7a0 100644 --- 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 @@ -1,6 +1,4 @@ type: u32 - -help: Set the path priority for this port - -comp_help: possible completions: - <0-255> Set port priority +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 diff --git a/templates/interfaces/bridge/node.tag/priority/node.def b/templates/interfaces/bridge/node.tag/priority/node.def index 63548d1e..41c0a682 100644 --- a/templates/interfaces/bridge/node.tag/priority/node.def +++ b/templates/interfaces/bridge/node.tag/priority/node.def @@ -1,7 +1,8 @@ type: u32 help: Set the priority for this bridge default: 0 +syntax:expression:$VAR(@) < 65536 ; "Bridge priority must be between 0 and 65535" +val_help:<0-65535>; Bridge priority (default 0) + update: /usr/sbin/brctl setbridgeprio $VAR(../@) $VAR(@) delete: /usr/sbin/brctl setbridgeprio $VAR(../@) 0 -comp_help: possible completions: - <number> Set bridge priority (default 0) diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def index f90f4769..33763624 100644 --- a/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def +++ b/templates/interfaces/ethernet/node.tag/bridge-group/cost/node.def @@ -1,6 +1,4 @@ type: u32 - help: Set the path cost for this port - -comp_help: possible completions: - <0-2147483647> Set port cost +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/ethernet/node.tag/bridge-group/priority/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def index 5c11ec4f..d7a2f7a0 100644 --- a/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def +++ b/templates/interfaces/ethernet/node.tag/bridge-group/priority/node.def @@ -1,6 +1,4 @@ type: u32 - -help: Set the path priority for this port - -comp_help: possible completions: - <0-255> Set port priority +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 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 index f90f4769..33763624 100644 --- 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 @@ -1,6 +1,4 @@ type: u32 - help: Set the path cost for this port - -comp_help: possible completions: - <0-2147483647> Set port cost +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/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 index 5c11ec4f..d7a2f7a0 100644 --- 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 @@ -1,6 +1,4 @@ type: u32 - -help: Set the path priority for this port - -comp_help: possible completions: - <0-255> Set port priority +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 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 |