summaryrefslogtreecommitdiff
path: root/interface-definitions/interfaces-bridge.xml
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2019-09-11 23:14:46 +0200
committerDaniil Baturin <daniil@baturin.org>2019-09-11 23:14:46 +0200
commita9a68a6f1086fd4c978deaf5ddace69c18443756 (patch)
treef3da329903d4e758408851f9b22c4834c130363f /interface-definitions/interfaces-bridge.xml
parent501908ae54a1aaae1337673617ebfcc281b02662 (diff)
parent59e5e64cfbb67a5eb1a9d4d21dd54d946897b8d7 (diff)
downloadvyos-1x-a9a68a6f1086fd4c978deaf5ddace69c18443756.tar.gz
vyos-1x-a9a68a6f1086fd4c978deaf5ddace69c18443756.zip
Merge branch 'current' into equuleus
Diffstat (limited to 'interface-definitions/interfaces-bridge.xml')
-rw-r--r--interface-definitions/interfaces-bridge.xml12
1 files changed, 6 insertions, 6 deletions
diff --git a/interface-definitions/interfaces-bridge.xml b/interface-definitions/interfaces-bridge.xml
index adb525a46..4b82972dc 100644
--- a/interface-definitions/interfaces-bridge.xml
+++ b/interface-definitions/interfaces-bridge.xml
@@ -47,18 +47,17 @@
</leafNode>
<leafNode name="aging">
<properties>
- <help>Interval addresses are retained</help>
+ <help>MAC address aging interval</help>
<valueHelp>
<format>0</format>
- <description>Disable retaining address in bridge (always flood)</description>
+ <description>Disable MAC address learning (always flood)</description>
</valueHelp>
<valueHelp>
<format>10-1000000</format>
- <description>Address aging time for bridge seconds (default 300)</description>
+ <description>MAC address aging time in seconds (default: 300)</description>
</valueHelp>
<constraint>
- <validator name="numeric" argument="--range 0-0"/>
- <validator name="numeric" argument="--range 10-1000000"/>
+ <validator name="numeric" argument="--range 0-0 --range 10-1000000"/>
</constraint>
</properties>
</leafNode>
@@ -117,6 +116,7 @@
<leafNode name="disable">
<properties>
<help>Disable this bridge interface</help>
+ <valueless/>
</properties>
</leafNode>
<leafNode name="forwarding-delay">
@@ -170,7 +170,7 @@
<constraint>
<validator name="numeric" argument="--range 1-86400"/>
</constraint>
- <constraintErrorMessage>Bridge max aging value must be between 6 and 86400 seconds</constraintErrorMessage>
+ <constraintErrorMessage>ARP cache entry timeout must be between 1 and 86400 seconds</constraintErrorMessage>
</properties>
</leafNode>
</children>