summaryrefslogtreecommitdiff
path: root/interface-definitions
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-08-22 15:13:48 +0200
committerChristian Poessinger <christian@poessinger.com>2021-08-22 15:13:48 +0200
commit785af7cf6603a81adc432537bf97987f59d818a3 (patch)
tree74f6187a69e597608647a9c6aebe57707b291dce /interface-definitions
parent5567b9ae59cdd2137fa7d7250fd84f31093eb1cc (diff)
downloadvyos-1x-785af7cf6603a81adc432537bf97987f59d818a3.tar.gz
vyos-1x-785af7cf6603a81adc432537bf97987f59d818a3.zip
bridge: T3137: backport vlan features from 1.4 current
Diffstat (limited to 'interface-definitions')
-rw-r--r--interface-definitions/interfaces-bridge.xml.in15
1 files changed, 13 insertions, 2 deletions
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in
index 91ce00ba6..ddfc5ade4 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/>
@@ -172,6 +178,12 @@
</properties>
<defaultValue>32</defaultValue>
</leafNode>
+ <leafNode name="isolated">
+ <properties>
+ <help>Port is isolated (also known as Private-VLAN)</help>
+ <valueless/>
+ </properties>
+ </leafNode>
</children>
</tagNode>
</children>
@@ -196,7 +208,6 @@
<valueless/>
</properties>
</leafNode>
- #include <include/interface/vif-s.xml.i>
#include <include/interface/vif.xml.i>
</children>
</tagNode>