diff options
| author | jack9603301 <jack9603301@163.com> | 2021-01-09 21:32:19 +0800 |
|---|---|---|
| committer | jack9603301 <jack9603301@163.com> | 2021-01-15 16:26:33 +0800 |
| commit | 38566b8fbdec60b1601ed127fd759c85802909e9 (patch) | |
| tree | 00a658fbeb2d2b27fe3d7def53b9bbdb681de0c3 /interface-definitions/interfaces-bridge.xml.in | |
| parent | 931692c5e4b15eb5ab62cd537ffd915365429e1c (diff) | |
| download | vyos-1x-38566b8fbdec60b1601ed127fd759c85802909e9.tar.gz vyos-1x-38566b8fbdec60b1601ed127fd759c85802909e9.zip | |
bridge: T3137: Let VLAN aware bridge approach the behavior of professional equipment
According to the consensus, the specific behavior of a VLAN aware bridge should conform
to the behavior of professional equipment. This commit makes a significant change to the
behavior of VLAN aware bridge, and has the following behaviors:
1. Disable `vif 1` configuration
2. When the VLAN aware bridge is enabled, the parent interface is always VLAN 1
3. When `native-vlan` is not configured, the default behavior of the device is `native-vlan 1`
4. The VLAN ids forwarded by the bridge are determined by `vif`
5. It has an `enable-vlan` node to enable VLAN awareness
6. VLAN configuration is allowed only when VLAN aware bridge is activated
Diffstat (limited to 'interface-definitions/interfaces-bridge.xml.in')
| -rw-r--r-- | interface-definitions/interfaces-bridge.xml.in | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in index c32c0ca32..e940e6685 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> @@ -196,7 +202,6 @@ <valueless/> </properties> </leafNode> - #include <include/vif-s.xml.i> #include <include/vif.xml.i> </children> </tagNode> |