proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-08-15 04:02:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add support for bridges with more than one physical link (ie. two bonds each connected to a different switch using MSTP/PVSTP to load balance vlans across links)

Browse Source 
Signed-off-by: Pablo Ruiz Garcia <pablo.ruiz@gmail.com>
This commit is contained in:
Pablo Ruiz Garcia 2014-02-12 08:55:28 +01:00 committed by Dietmar Maurer
parent aec048035e
commit 70d89745ca
1 changed files with 34 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
data/PVE/Network.pm
View File

@ -121,36 +121,10 @@ sub copy_bridge_config {
} }
} }
sub activate_bridge_vlan { sub activate_bridge_vlan_slave {
my ($bridge, $tag_param) = @_; my ($bridgevlan, $iface, $tag) = @_;
die "bridge '$bridge' is not active\n" if ! -d "/sys/class/net/$bridge";
return $bridge if !defined($tag_param); # no vlan, simply return
my $tag = int($tag_param);
die "got strange vlan tag '$tag_param'\n" if $tag < 1 || $tag > 4094;
my $bridgevlan = "${bridge}v$tag";
my $dir = "/sys/class/net/$bridge/brif";
#check if we have an only one ethX or bondX interface in the bridge
my $iface;
PVE::Tools::dir_glob_foreach($dir, '((eth|bond)\d+)', sub {
my ($slave) = @_;
die "more then one physical interfaces on bridge '$bridge'\n" if $iface;
$iface = $slave;
});
die "no physical interface on bridge '$bridge'\n" if !$iface;
my $ifacevlan = "${iface}.$tag"; my $ifacevlan = "${iface}.$tag";
# create vlan on $iface is not already exist # create vlan on $iface is not already exist
if (! -d "/sys/class/net/$ifacevlan") { if (! -d "/sys/class/net/$ifacevlan") {
system("/sbin/vconfig add $iface $tag") == 0 || system("/sbin/vconfig add $iface $tag") == 0 ||
@ -165,30 +139,52 @@ sub activate_bridge_vlan {
my $path= "/sys/class/net/$ifacevlan/brport/bridge"; my $path= "/sys/class/net/$ifacevlan/brport/bridge";
if (-l $path) { if (-l $path) {
my $tbridge = basename(readlink($path)); my $tbridge = basename(readlink($path));
if ($tbridge eq $bridgevlan) { if ($tbridge ne $bridgevlan) {
# already member of bridge - assume setup is already done
return $bridgevlan;
} else {
die "interface $ifacevlan already exist in bridge $tbridge\n"; die "interface $ifacevlan already exist in bridge $tbridge\n";
} }
} }
# add $ifacevlan to the bridge
system("/sbin/brctl addif $bridgevlan $ifacevlan") == 0 ||
die "can't add interface $ifacevlan to bridge $bridgevlan\n";
}
sub activate_bridge_vlan {
my ($bridge, $tag_param) = @_;
die "bridge '$bridge' is not active\n" if ! -d "/sys/class/net/$bridge";
return $bridge if !defined($tag_param); # no vlan, simply return
my $tag = int($tag_param);
die "got strange vlan tag '$tag_param'\n" if $tag < 1 || $tag > 4094;
my $bridgevlan = "${bridge}v$tag";
# add bridgevlan if it doesn't already exist # add bridgevlan if it doesn't already exist
if (! -d "/sys/class/net/$bridgevlan") { if (! -d "/sys/class/net/$bridgevlan") {
system("/sbin/brctl addbr $bridgevlan") == 0 || system("/sbin/brctl addbr $bridgevlan") == 0 ||
die "can't add bridge $bridgevlan\n"; die "can't add bridge $bridgevlan\n";
} }
# for each physical interface (eth or bridge) bind them to bridge vlan
my $ifcount = 0;
my $dir = "/sys/class/net/$bridge/brif";
PVE::Tools::dir_glob_foreach($dir, '((eth|bond)\d+)', sub {
my ($slave) = @_;
activate_bridge_vlan_slave($bridgevlan, $slave, $tag);
$ifcount++;
});
die "no physical interface on bridge '$bridge'\n" if $ifcount == 0;
#fixme: set other bridge flags #fixme: set other bridge flags
# be sure to have the bridge up # be sure to have the bridge up
system("/sbin/ip link set $bridgevlan up") == 0 || system("/sbin/ip link set $bridgevlan up") == 0 ||
die "can't up bridge $bridgevlan\n"; die "can't up bridge $bridgevlan\n";
# add $ifacevlan to the bridge
system("/sbin/brctl addif $bridgevlan $ifacevlan") == 0 ||
die "can't add interface $ifacevlan to bridge $bridgevlan\n";
return $bridgevlan; return $bridgevlan;
} }