diff options
| author | John Estabrook <jestabro@vyos.io> | 2020-11-12 08:34:01 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-12 08:34:01 -0600 |
| commit | bf31936562e4e827373ac56661a9e1a48ee0a0a6 (patch) | |
| tree | 1d9a2a72366fde7ec757264bbab08a483cb72596 /interface-definitions | |
| parent | 2e498164218851f1b958c43a7b903849a80b8304 (diff) | |
| parent | 3466941316a70ac840ebdcc7576230158be8a0fb (diff) | |
| download | vyos-1x-bf31936562e4e827373ac56661a9e1a48ee0a0a6.tar.gz vyos-1x-bf31936562e4e827373ac56661a9e1a48ee0a0a6.zip | |
Merge pull request #594 from jack9603301/T3042
bridge: T3042: Support VLAN filter and VLAN sub-interface on the bridge
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/interfaces-bridge.xml.in | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in index ccd6db9e4..97f548252 100644 --- a/interface-definitions/interfaces-bridge.xml.in +++ b/interface-definitions/interfaces-bridge.xml.in @@ -111,6 +111,37 @@ </completionHelp> </properties> <children> + <leafNode name="native-vlan"> + <properties> + <help>Set the specific VLAN ID in the interface to ACCESS mode</help> + <valueHelp> + <format>1-4094</format> + <description>Virtual Local Area Network (VLAN) ID</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1-4094"/> + </constraint> + <constraintErrorMessage>VLAN ID must be between 1 and 4094</constraintErrorMessage> + </properties> + </leafNode> + <leafNode name="allowed-vlan"> + <properties> + <help>Allow the bridge to pass the tagged VLAN tag on this interface</help> + <valueHelp> + <format><n></format> + <description>Virtual Local Area Network (VLAN) ID</description> + </valueHelp> + <valueHelp> + <format><n-m>-<1-4096></format> + <description>Virtual Local Area Network (VLAN) ID Range</description> + </valueHelp> + <constraint> + <regex>^([0-9]{1,4}-[0-9]{1,4})|([0-9]{1,4})$</regex> + </constraint> + <constraintErrorMessage>not a valid VLAN ID value or range</constraintErrorMessage> + <multi/> + </properties> + </leafNode> <leafNode name="cost"> <properties> <help>Bridge port cost</help> @@ -163,6 +194,8 @@ <valueless/> </properties> </leafNode> + #include <include/vif-s.xml.i> + #include <include/vif.xml.i> </children> </tagNode> </children> |