[pve-devel] [PATCH v4 qemu-server 21/33] vmnic add|remove : add|del ip in ipam

[Stefan Hanreich]

From: Alexandre Derumier <aderum...@odiso.com>

Co-Authored-by: Stefan Lendl <s.le...@proxmox.com>
Signed-off-by: Stefan Hanreich <s.hanre...@proxmox.com>
Signed-off-by: Alexandre Derumier <aderum...@odiso.com>
---
 PVE/QemuServer.pm | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index c465fb6..5f15c66 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -64,6 +64,7 @@ use PVE::QemuServer::USB;
 my $have_sdn;
 eval {
     require PVE::Network::SDN::Zones;
+    require PVE::Network::SDN::Vnets;
     $have_sdn = 1;
 };
 
@@ -4998,6 +4999,10 @@ sub vmconfig_hotplug_pending {
            } elsif ($opt =~ m/^net(\d+)$/) {
                die "skip\n" if !$hotplug_features->{network};
                vm_deviceunplug($vmid, $conf, $opt);
+               if($have_sdn) {
+                   my $net = PVE::QemuServer::parse_net($conf->{$opt});
+                   PVE::Network::SDN::Vnets::del_ips_from_mac($net->{bridge}, 
$net->{macaddr}, $conf->{name});
+               }
            } elsif (is_valid_drivename($opt)) {
                die "skip\n" if !$hotplug_features->{disk} || $opt =~ 
m/(ide|sata)(\d+)/;
                vm_deviceunplug($vmid, $conf, $opt);
@@ -5203,6 +5208,12 @@ sub vmconfig_apply_pending {
                die "internal error";
            } elsif (defined($conf->{$opt}) && is_valid_drivename($opt)) {
                vmconfig_delete_or_detach_drive($vmid, $storecfg, $conf, $opt, 
$force);
+           } elsif (defined($conf->{$opt}) && $opt =~ m/^net\d+$/) {
+               if($have_sdn) {
+                   my $net = PVE::QemuServer::parse_net($conf->{$opt});
+                   eval { 
PVE::Network::SDN::Vnets::del_ips_from_mac($net->{bridge}, $net->{macaddr}, 
$conf->{name}) };
+                   warn if $@;
+               }
            }
        };
        if (my $err = $@) {
@@ -5222,6 +5233,20 @@ sub vmconfig_apply_pending {
        eval {
            if (defined($conf->{$opt}) && is_valid_drivename($opt)) {
                vmconfig_register_unused_drive($storecfg, $vmid, $conf, 
parse_drive($opt, $conf->{$opt}))
+           } elsif (defined($conf->{pending}->{$opt}) && $opt =~ m/^net\d+$/) {
+               if($have_sdn) {
+                    my $new_net = 
PVE::QemuServer::parse_net($conf->{pending}->{$opt});
+                   if ($conf->{$opt}){
+                       my $old_net = PVE::QemuServer::parse_net($conf->{$opt});
+
+                       if ($old_net->{bridge} ne $new_net->{bridge} ||
+                           $old_net->{macaddr} ne $new_net->{macaddr}) {
+                           
PVE::Network::SDN::Vnets::del_ips_from_mac($old_net->{bridge}, 
$old_net->{macaddr}, $conf->{name});
+                       }
+                  }
+                  #fixme: reuse ip if mac change && same bridge
+                  
PVE::Network::SDN::Vnets::add_next_free_cidr($new_net->{bridge}, $conf->{name}, 
$new_net->{macaddr}, $vmid, undef, 1);
+               }
            }
        };
        if (my $err = $@) {
@@ -5265,6 +5290,11 @@ sub vmconfig_update_net {
             # for non online change, we try to hot-unplug
            die "skip\n" if !$hotplug;
            vm_deviceunplug($vmid, $conf, $opt);
+
+           if($have_sdn) {
+               PVE::Network::SDN::Vnets::del_ips_from_mac($oldnet->{bridge}, 
$oldnet->{macaddr}, $conf->{name});
+           }
+
        } else {
 
            die "internal error" if $opt !~ m/net(\d+)/;
@@ -5276,6 +5306,13 @@ sub vmconfig_update_net {
                safe_num_ne($oldnet->{firewall}, $newnet->{firewall})) {
                PVE::Network::tap_unplug($iface);
 
+               if (safe_string_ne($oldnet->{bridge}, $newnet->{bridge})) {
+                   if ($have_sdn) {
+                       
PVE::Network::SDN::Vnets::del_ips_from_mac($oldnet->{bridge}, 
$oldnet->{macaddr}, $conf->{name});
+                       
PVE::Network::SDN::Vnets::add_next_free_cidr($newnet->{bridge}, $conf->{name}, 
$newnet->{macaddr}, $vmid, undef, 1);
+                   }
+               }
+
                if ($have_sdn) {
                    PVE::Network::SDN::Zones::tap_plug($iface, 
$newnet->{bridge}, $newnet->{tag}, $newnet->{firewall}, $newnet->{trunks}, 
$newnet->{rate});
                } else {
@@ -5296,6 +5333,9 @@ sub vmconfig_update_net {
     }
 
     if ($hotplug) {
+       if ($have_sdn) {
+           PVE::Network::SDN::Vnets::add_next_free_cidr($newnet->{bridge}, 
$conf->{name}, $newnet->{macaddr}, $vmid, undef, 1);
+       }
        vm_deviceplug($storecfg, $conf, $vmid, $opt, $newnet, $arch, 
$machine_type);
     } else {
        die "skip\n";
-- 
2.39.2


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel