Proxmox/pve-network
5
0
Fork 0
mirror of git://git.proxmox.com/git/pve-network.git synced 2025-01-30 01:47:28 +03:00
Code Releases Activity

fix #4683: zones: QinQ: fix vlan-protocol when bridge is VLAN aware

Browse Source 
The tagged bridge interface need to also have to correct
vlan-protocol

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Alexandre Derumier 2023-04-20 23:36:21 +02:00 committed by Thomas Lamprecht
parent 91b2f632c0
commit de4e2b9cf4
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/PVE/Network/SDN/Zones/QinQPlugin.pm
View File

@ -98,13 +98,17 @@ sub generate_sdn_config {
} elsif ($vlan_aware) {
# VLAN_aware_brige-(tag)----->vlanwarebridge-(tag)----->vnet
$zone_bridge_ports = "$bridge.$stag";
if ($vlanprotocol) {
@iface_config = ();
push @iface_config, "bridge-vlan-protocol $vlanprotocol";
push(@{$config->{$bridge}}, @iface_config) if !$config->{$bridge};
}
$zone_bridge_ports = "$bridge.$stag";
@iface_config = ();
push @iface_config, "vlan-protocol $vlanprotocol";
push(@{$config->{$zone_bridge_ports}}, @iface_config) if !$config->{$zone_bridge_ports};
}
} else {
# eth--->eth.x(svlan)----->vlanwarebridge-(tag)----->vnet---->vnet

4
src/test/zones/qinq/bridge_vlanaware_vlanprotocol/expected_sdn_interfaces
View File

@ -20,6 +20,10 @@ auto vmbr0
iface vmbr0
bridge-vlan-protocol 802.1ad
auto vmbr0.10
iface vmbr0.10
vlan-protocol 802.1ad
auto z_myzone
iface z_myzone
bridge-stp off