add openvswitch support to tap_plug / tap_unplug

[pve-common.git] / data / PVE / Network.pm

diff --git a/data/PVE/Network.pm b/data/PVE/Network.pm
index 1fa1dc799dafce37c70173400175d3959d36fa12..380b334af4dedac79f7e711e436d2473e016a3c5 100644 (file)
--- a/data/PVE/Network.pm
+++ b/data/PVE/Network.pm
@@ -1,6 +1,7 @@
 package PVE::Network;
 
 use strict;
+use warnings;
 use PVE::Tools qw(run_command);
 use PVE::ProcFSTools;
 use PVE::INotify;
@@ -67,20 +68,36 @@ sub tap_create {
 sub tap_plug {
     my ($iface, $bridge, $tag) = @_;
 
-    my $newbridge = activate_bridge_vlan($bridge, $tag);
-    copy_bridge_config($bridge, $newbridge) if $bridge ne $newbridge;
+    #cleanup old port config from any openvswitch bridge
+    eval {run_command("/usr/bin/ovs-vsctl del-port $iface", outfunc => sub {}, errfunc => sub {}) };
 
-    system ("/sbin/brctl addif $newbridge $iface") == 0 ||
-       die "can't add interface to bridge\n";
+    if (-d "/sys/class/net/$bridge/bridge"){
+           my $newbridge = activate_bridge_vlan($bridge, $tag);
+           copy_bridge_config($bridge, $newbridge) if $bridge ne $newbridge;
+
+           system ("/sbin/brctl addif $newbridge $iface") == 0 ||
+               die "can't add interface to bridge\n";
+    }else{
+           my $cmd = "/usr/bin/ovs-vsctl add-port $bridge $iface";
+           $cmd .= " tag=$tag" if $tag;
+           system ($cmd) == 0 ||
+               die "can't add interface to bridge\n";
+    }
 }
 
 sub tap_unplug {
     my ($iface, $bridge, $tag) = @_;
 
-    $bridge .= "v$tag" if $tag;
+    if (-d "/sys/class/net/$bridge/bridge"){
 
-    system ("/sbin/brctl delif $bridge $iface") == 0 ||
-       die "can't del interface from bridge\n";
+       $bridge .= "v$tag" if $tag;
+
+           system ("/sbin/brctl delif $bridge $iface") == 0 ||
+               die "can't del interface from bridge\n";
+    }else{
+           system ("/usr/bin/ovs-vsctl del-port $iface") == 0 ||
+               die "can't del interface from bridge\n";
+    }
 }
 
 sub copy_bridge_config {