diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-23 12:17:39 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-23 12:17:39 -0700 |
| commit | e1296e8beae45ec88e65295ca07e98eb579c59ce (patch) | |
| tree | 6972d2e1937c7a6465dba71ecdc4c7e2e72a7423 /templates | |
| parent | f5717d6f5876a88bb34d657371876504da0853b6 (diff) | |
| parent | 47014cdc10a429725d1620fc5326fd9995469c09 (diff) | |
| download | vyatta-cfg-system-e1296e8beae45ec88e65295ca07e98eb579c59ce.tar.gz vyatta-cfg-system-e1296e8beae45ec88e65295ca07e98eb579c59ce.zip | |
Merge branch 'larkspur' of vm:git/vyatta-cfg-system into larkspur
Diffstat (limited to 'templates')
4 files changed, 11 insertions, 7 deletions
diff --git a/templates/interfaces/bridge/node.tag/aging/node.def b/templates/interfaces/bridge/node.tag/aging/node.def index c2d9b12f..c3ee5964 100644 --- a/templates/interfaces/bridge/node.tag/aging/node.def +++ b/templates/interfaces/bridge/node.tag/aging/node.def @@ -1,8 +1,10 @@ type: u32 help: Interval addresses are retained default: 300 -syntax:expression:$VAR(@) <= 60; "Bridge aging time must be between 0 and 60" -val_help: u32:0-60; Address aging time for bridge (seconds) +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: /usr/sbin/brctl setageing $VAR(../@) $VAR(@) delete: /usr/sbin/brctl setageing $VAR(../@) 300 diff --git a/templates/interfaces/bridge/node.tag/forwarding-delay/node.def b/templates/interfaces/bridge/node.tag/forwarding-delay/node.def index ae9d8390..21de2454 100644 --- a/templates/interfaces/bridge/node.tag/forwarding-delay/node.def +++ b/templates/interfaces/bridge/node.tag/forwarding-delay/node.def @@ -1,5 +1,5 @@ type: u32 help: Forwarding delay -syntax:expression:$VAR(@) <= 60; "Forwarding delay must be between 0 and 60" -val_help: u32:0-60; Spanning Tree Protocol forwarding delay in seconds (default 15) +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: /usr/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 index beb6e385..8f48b8be 100644 --- a/templates/interfaces/bridge/node.tag/hello-time/node.def +++ b/templates/interfaces/bridge/node.tag/hello-time/node.def @@ -1,7 +1,7 @@ type: u32 default: 2 help: Hello packet advertisment interval -syntax:expression:$VAR(@) <= 30; "Bridge Hello interval must be between 0 and 30 seconds" +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: /usr/sbin/brctl sethello $VAR(../@) $VAR(@) delete: /usr/sbin/brctl sethello $VAR(../@) 2 diff --git a/templates/interfaces/bridge/node.tag/max-age/node.def b/templates/interfaces/bridge/node.tag/max-age/node.def index 72b3b902..b30e5e9e 100644 --- a/templates/interfaces/bridge/node.tag/max-age/node.def +++ b/templates/interfaces/bridge/node.tag/max-age/node.def @@ -1,8 +1,10 @@ type: u32 help: Interval at which neighbor bridges are removed default: 20 -syntax:expression:$VAR(@) <= 60; "Bridge max aging value must be between 0 and 60" -val_help: u32:0-60; Bridge maximum aging time value (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: /usr/sbin/brctl setmaxage $VAR(../@) $VAR(@) delete: /usr/sbin/brctl setmaxage $VAR(../@) 20 |