From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <s.lendl@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 89C909D9EA
for <pve-devel@lists.proxmox.com>; Fri, 27 Oct 2023 13:30:19 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 6B23C38BFA
for <pve-devel@lists.proxmox.com>; Fri, 27 Oct 2023 13:30:19 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS
for <pve-devel@lists.proxmox.com>; Fri, 27 Oct 2023 13:30:18 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A991442546;
Fri, 27 Oct 2023 13:30:18 +0200 (CEST)
From: Stefan Lendl <s.lendl@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri, 27 Oct 2023 13:30:00 +0200
Message-ID: <20231027113000.2008166-7-s.lendl@proxmox.com>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <20231027113000.2008166-1-s.lendl@proxmox.com>
References: <87v8axbjh1.fsf@gmail.com>
<20231027113000.2008166-1-s.lendl@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.062 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: [pve-devel] [RFC qemu-server 6/6] DHCP mappings on vNIC add/remove
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Fri, 27 Oct 2023 11:30:19 -0000
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.lendl@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 {
--
2.41.0