add vlan setup code to PVE::Network

diff --git a/data/Makefile b/data/Makefile
index 286473a5b3f216e12f1b5d483efdb3e6e7c3b9fd..67759f97d6c78c38911b84b443515b262b2f3ec5 100644 (file)
--- a/data/Makefile
+++ b/data/Makefile
@@ -7,6 +7,7 @@ MAN1DIR=${MANDIR}/man1/
 PERLDIR=${PREFIX}/share/perl5
 
 LIB_SOURCES=                   \
 PERLDIR=${PREFIX}/share/perl5
 
 LIB_SOURCES=                   \

+       Network.pm              \

        ProcFSTools.pm          \
        PodParser.pm            \
        CLIHandler.pm           \
        ProcFSTools.pm          \
        PodParser.pm            \
        CLIHandler.pm           \

diff --git a/data/PVE/Network.pm b/data/PVE/Network.pm
new file mode 100644 (file)
index 0000000..4181450
--- /dev/null
+++ b/data/PVE/Network.pm
@@ -0,0 +1,103 @@
+package PVE::Network;
+
+use strict;
+use PVE::Tools;
+use PVE::ProcFSTools;
+use PVE::INotify;
+use File::Basename;
+
+# host network related utility functions
+
+sub copy_bridge_config {
+    my ($br0, $br1) = @_;
+
+    return if $br0 eq $br1;
+
+    my $br_configs = [ 'ageing_time', 'stp_state', 'priority', 'forward_delay', 
+                      'hello_time', 'max_age'];
+
+    foreach my $sysname (@$br_configs) {
+       eval {
+           my $v0 = PVE::Tools::file_read_firstline("/sys/class/net/$br0/bridge/$sysname");
+           my $v1 = PVE::Tools::file_read_firstline("/sys/class/net/$br1/bridge/$sysname");
+           if ($v0 ne $v1) {
+               system("echo \"$v0\" > /sys/class/net/$br1/bridge/$sysname") == 0 ||
+                   warn "unable to set bridge config '$sysname'\n";
+           }
+       };
+       warn $@ if $@;
+    }
+}
+
+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";
+
+    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";
+
+    # create vlan on $iface is not already exist
+    if (! -d "/sys/class/net/$ifacevlan") {
+       system("/sbin/vconfig add $iface $tag") == 0 ||
+           die "can't add vlan tag $tag to interface $iface\n";
+    }
+
+    # be sure to have the $ifacevlan up
+    system("/sbin/ip link set $ifacevlan up") == 0 ||
+        die "can't up interface $ifacevlan\n";
+
+    # test if $vlaniface is already enslaved in another bridge
+    my $path= "/sys/class/net/$ifacevlan/brport/bridge";
+    if (-l $path) {
+        my $tbridge = basename(readlink($path));
+       if ($tbridge eq $bridgevlan) {
+           # already member of bridge - assume setup is already done
+           return $bridgevlan;
+       } else {
+           die "interface $ifacevlan already exist in bridge $tbridge\n";
+       }
+    }
+
+    # add bridgevlan if it doesn't already exist
+    if (! -d "/sys/class/net/$bridgevlan") {
+        system("/usr/sbin/brctl addbr $bridgevlan") == 0 ||
+            die "can't add bridge $bridgevlan\n";
+    }
+
+    #fixme: set other bridge flags
+
+    # be sure to have the bridge up
+    system("/sbin/ip link set $bridgevlan up") == 0 ||
+        die "can't up bridge $bridgevlan\n";
+
+    # add $ifacevlan to the bridge
+    system("/usr/sbin/brctl addif $bridgevlan $ifacevlan") == 0 ||
+       die "can't add interface $ifacevlan to bridge $bridgevlan\n";
+    
+    return $bridgevlan;
+}
+
+1;

diff --git a/debian/changelog b/debian/changelog
index 345e934ad0f57435ef387fd5d6c8033c433afc51..84d1f40c07fbcd9c59195024f7dd6f7cb16c64b1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ libpve-common-perl (1.0-23) unstable; urgency=low
   * moved dir_glob_regex() and dir_glob_foreach() from PVE::Storage 
   to PVE::Tools
   
   * moved dir_glob_regex() and dir_glob_foreach() from PVE::Storage 
   to PVE::Tools
   

+  * add vlan setup code to PVE::Network
+  

  -- Proxmox Support Team <support@proxmox.com>  Wed, 28 Mar 2012 07:56:49 +0200
 
 libpve-common-perl (1.0-22) unstable; urgency=low
  -- Proxmox Support Team <support@proxmox.com>  Wed, 28 Mar 2012 07:56:49 +0200
 
 libpve-common-perl (1.0-22) unstable; urgency=low