From my previous mail,
Here I'll allocate only in ipam, but not generate dhcp config.
-------- Message initial --------
De: Stefan Lendl <s.le...@proxmox.com>
Répondre à: Proxmox VE development discussion <pve-
de...@lists.proxmox.com>
À: pve-devel@lists.proxmox.com
Objet: [pve-devel] [RFC qemu-server 6/6] DHCP mappings on vNIC
add/remove
Date: 27/10/2023 13:30:00
add DHCP mapping on vNIC add/update and VM clone (new mac)
remove DHCP mapping on vNIC delete and VM destroy
Signed-off-by: Stefan Lendl <s.le...@proxmox.com>
---
PVE/API2/Qemu.pm | 25 +++++++++++++++++++++++++
PVE/QemuServer.pm | 2 ++
2 files changed, 27 insertions(+)
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 38bdaab..1b16fa5 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -49,6 +49,8 @@ use PVE::SSHInfo;
use PVE::Replication;
use PVE::StorageTunnel;
+use PVE::Network::SDN;
+
BEGIN {
if (!$ENV{PVE_GENERATING_DOCS}) {
require PVE::HA::Env::PVE2;
@@ -1804,6 +1806,9 @@ my $update_vm_api = sub {
}
PVE::QemuConfig->add_to_pending_delete($conf,
$opt, $force);
PVE::QemuConfig->write_config($vmid, $conf);
+
+ my $net = PVE::QemuServer::parse_net($conf-
>{$opt});
+ PVE::Network::SDN::Dhcp::remove_mapping($net-
>{bridge}, $net->{macaddr});
} else {
PVE::QemuConfig->add_to_pending_delete($conf,
$opt, $force);
PVE::QemuConfig->write_config($vmid, $conf);
@@ -1881,6 +1886,18 @@ my $update_vm_api = sub {
);
}
$conf->{pending}->{$opt} = $param->{$opt};
+
+ my $new_net = PVE::QemuServer::parse_net($param-
>{$opt});
+ if (exists $conf->{$opt}) {
+ my $old_net =
PVE::QemuServer::parse_net($conf->{$opt});
+ if ($old_net->{bridge} ne $new_net->{bridge}
or
+ $old_net->{macaddr} ne $new_net-
>{macaddr}) {
+ print "Bridge or MAC changed: $conf-
>{$opt} -> $param->{$opt}\n";
+
PVE::Network::SDN::Dhcp::remove_mapping($old_net->{bridge}, $old_net-
>{macaddr});
+ }
+ }
+ PVE::Network::SDN::Dhcp::add_mapping($vmid,
$new_net->{bridge}, $new_net->{macaddr});
+
} else {
$conf->{pending}->{$opt} = $param->{$opt};
@@ -3763,6 +3780,14 @@ __PACKAGE__->register_method({
PVE::QemuConfig->write_config($newid, $newconf);
+ foreach my $opt (keys %$newconf) {
+ if ($opt =~ m/^net(\d+)$/) {
+ my $value = $newconf->{$opt};
+ my $net = PVE::QemuServer::parse_net($value);
+ PVE::Network::SDN::Dhcp::add_mapping($newid,
$net->{bridge}, $net->{macaddr});
+ }
+ }
+
if ($target) {
# always deactivate volumes - avoid lvm LVs to be
active on several nodes
PVE::Storage::deactivate_volumes($storecfg,
$vollist, $snapname) if !$running;
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 710259b..8a63ec3 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -2337,6 +2337,8 @@ sub destroy_vm {
});
}
+ cleanup_sdn_dhcp($vmid, $conf);
+
if (defined $replacement_conf) {
PVE::QemuConfig->write_config($vmid, $replacement_conf);
} else {
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
