From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 EF7FF7513D for ; Mon, 12 Jul 2021 00:47:17 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DA61DEB6B for ; Mon, 12 Jul 2021 00:47:17 +0200 (CEST) Received: from kvmformation3.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id 29A48EB17 for ; Mon, 12 Jul 2021 00:47:15 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id C539DC10; Mon, 12 Jul 2021 00:47:08 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 12 Jul 2021 00:47:04 +0200 Message-Id: <20210711224707.63089-7-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210711224707.63089-1-aderumier@odiso.com> References: <20210711224707.63089-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 1.054 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% HEADER_FROM_DIFFERENT_DOMAINS 0.001 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KHOP_HELO_FCRDNS 0.399 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH v2 qemu-server 6/9] ipam : add snapshot rollback support X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jul 2021 22:47:18 -0000 Signed-off-by: Alexandre Derumier --- PVE/QemuConfig.pm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/PVE/QemuConfig.pm b/PVE/QemuConfig.pm index 7ee8876..6627e2f 100644 --- a/PVE/QemuConfig.pm +++ b/PVE/QemuConfig.pm @@ -12,6 +12,7 @@ use PVE::QemuServer::Helpers; use PVE::QemuServer::Monitor qw(mon_cmd); use PVE::QemuServer; use PVE::QemuServer::Machine; +use PVE::QemuServer::Ipam; use PVE::Storage; use PVE::Tools; use PVE::Format qw(render_bytes render_duration); @@ -397,6 +398,7 @@ sub __snapshot_rollback_hook { if ($prepare) { # we save the machine of the current config $data->{oldmachine} = $conf->{machine}; + $data->{oldconf} = $conf; } else { # if we have a 'runningmachine' entry in the snapshot we use that # for the forcemachine parameter, else we use the old logic @@ -424,6 +426,36 @@ sub __snapshot_rollback_hook { # re-initializing its random number generator $conf->{vmgenid} = PVE::QemuServer::generate_uuid(); } + + my $oldconf = $data->{oldconf}; + my $pendingoldconf = $oldconf->{pending}; + + #remove ip from current pending net interfaces + foreach my $opt (keys %$pendingoldconf) { + next if $opt !~ m/^net(\d+)$/; + my $net = PVE::QemuServer::parse_net($pendingoldconf->{$opt}); + PVE::QemuServer::vmconfig_delete_net_ip($conf, $net); + } + + #remove ip from net current conf + foreach my $opt (keys %$oldconf) { + next if $opt !~ m/^net(\d+)$/; + my $net = PVE::QemuServer::parse_net($oldconf->{$opt}); + PVE::QemuServer::vmconfig_delete_net_ip($oldconf, $net); + } + + #update ipam description/dns + foreach my $opt (keys %$conf) { + next if $opt !~ m/^net(\d+)$/; + my $netid = $1; + my $net = PVE::QemuServer::parse_net($conf->{$opt}); + my $hostname = $conf->{name}; + my $oldhostname = $oldconf->{name}; + PVE::QemuServer::Ipam::update_net_ip(4,$net, $hostname, $oldhostname, "vm:$vmid net:$opt"); + PVE::QemuServer::Ipam::update_net_ip(6,$net, $hostname, $oldhostname, "vm:$vmid net:$opt"); + + $conf->{$opt} = PVE::QemuServer::print_net($net); + } } return; -- 2.30.2