diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-01-16 08:42:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-16 08:42:41 +0100 |
| commit | 3315af9ab8b570ada24a3f68ab0a18f84274186b (patch) | |
| tree | 8fe8d4459c88c2403803fbde983575d4bea696be /interface-definitions | |
| parent | 56ec3259b67c6441d992948a8bae95039194eb6c (diff) | |
| parent | 2d1e8a2fdba707aaae46b9f136aa8dd171ff8f3d (diff) | |
| download | vyos-1x-3315af9ab8b570ada24a3f68ab0a18f84274186b.tar.gz vyos-1x-3315af9ab8b570ada24a3f68ab0a18f84274186b.zip | |
Merge pull request #677 from jack9603301/T3137
bridge: T3137: Let VLAN aware bridge approach the behavior of professional equipment
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/interfaces-bridge.xml.in | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in index c32c0ca32..63c543f33 100644 --- a/interface-definitions/interfaces-bridge.xml.in +++ b/interface-definitions/interfaces-bridge.xml.in @@ -86,6 +86,12 @@ #include <include/interface-ipv6-options.xml.i> #include <include/interface-mac.xml.i> #include <include/interface-mirror.xml.i> + <leafNode name="enable-vlan"> + <properties> + <help>Enable VLAN aware bridge</help> + <valueless/> + </properties> + </leafNode> <leafNode name="max-age"> <properties> <help>Interval at which neighbor bridges are removed</help> @@ -138,7 +144,7 @@ <description>VLAN id range allowed on this interface (use '-' as delimiter)</description> </valueHelp> <constraint> - <regex>^([0-9]{1,4}-[0-9]{1,4})|([0-9]{1,4})$</regex> + <validator name="allowed-vlan"/> </constraint> <constraintErrorMessage>not a valid VLAN ID value or range</constraintErrorMessage> <multi/> @@ -196,7 +202,6 @@ <valueless/> </properties> </leafNode> - #include <include/vif-s.xml.i> #include <include/vif.xml.i> </children> </tagNode> |