From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 qemu-server 9/9] ipam : add destroy vm support
Date: Mon, 12 Jul 2021 00:47:07 +0200 [thread overview]
Message-ID: <20210711224707.63089-10-aderumier@odiso.com> (raw)
In-Reply-To: <20210711224707.63089-1-aderumier@odiso.com>
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
PVE/QemuServer.pm | 35 ++++++++++++++++++++++++++++++++++-
1 file changed, 34 insertions(+), 1 deletion(-)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 7d34a74..f6f14a6 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -2215,6 +2215,8 @@ sub destroy_vm {
};
PVE::QemuConfig->foreach_volume_full($conf, $include_opts, $remove_owned_drive);
+ PVE::QemuServer::vmconfig_destroy_nets_ip($conf);
+
for my $snap (values %{$conf->{snapshots}}) {
next if !defined($snap->{vmstate});
my $drive = PVE::QemuConfig->parse_volume('vmstate', $snap->{vmstate}, 1);
@@ -4922,7 +4924,6 @@ sub vmconfig_update_net_ip {
$ipconfig->{gw6} = $net->{gw6} if $net->{gw6};
my $value = PVE::QemuServer::print_ipconfig($ipconfig);
$conf->{pending}->{$ipconfigid} = $value;
-
}
sub vmconfig_delete_net_ip {
@@ -5028,6 +5029,37 @@ sub vmconfig_delete_pendingnet_ip {
}
}
+sub vmconfig_destroy_nets_ip {
+ my ($conf) = @_;
+
+ foreach my $snapname (keys %{$conf->{snapshots}}) {
+ my $snapconf = $conf->{snapshots}->{$snapname};
+ foreach my $opt (keys %{$snapconf}) {
+ next if $opt !~ m/^net(\d+)$/;
+ my $hostname = $snapconf->{name};
+ my $net = PVE::QemuServer::parse_net($snapconf->{$opt});
+ eval {
+ PVE::QemuServer::Ipam::delete_net_ip(4, $net, $hostname);
+ };
+ eval {
+ PVE::QemuServer::Ipam::delete_net_ip(6, $net, $hostname);
+ };
+ }
+ }
+
+ foreach my $opt (keys %{$conf}) {
+ next if $opt !~ m/^net(\d+)$/;
+ my $net = PVE::QemuServer::parse_net($conf->{$opt});
+ my $hostname = $conf->{name};
+ eval {
+ PVE::QemuServer::Ipam::delete_net_ip(4, $net, $hostname);
+ };
+ eval {
+ PVE::QemuServer::Ipam::delete_net_ip(6, $net, $hostname);
+ };
+ }
+}
+
sub vmconfig_update_net {
my ($storecfg, $conf, $hotplug, $vmid, $opt, $value, $arch, $machine_type) = @_;
@@ -6121,6 +6153,7 @@ my $restore_cleanup_oldconf = sub {
}
}
}
+
};
# Helper to parse vzdump backup device hints
--
2.30.2
prev parent reply other threads:[~2021-07-11 22:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-11 22:46 [pve-devel] [PATCH v2 qemu-server 0/9] RFC: sdn: add ipam support Alexandre Derumier
2021-07-11 22:46 ` [pve-devel] [PATCH v2 qemu-server 1/9] add ipam module Alexandre Derumier
2021-07-11 22:47 ` [pve-devel] [PATCH v2 qemu-server 2/9] add print_ipconfig Alexandre Derumier
2021-07-11 22:47 ` [pve-devel] [PATCH v2 qemu-server 3/9] add ip options to netdescr Alexandre Derumier
2021-07-11 22:47 ` [pve-devel] [PATCH v2 qemu-server 4/9] ipam : add update/delete support Alexandre Derumier
2021-07-11 22:47 ` [pve-devel] [PATCH v2 qemu-server 5/9] ipam : add revert ip support Alexandre Derumier
2021-07-11 22:47 ` [pve-devel] [PATCH v2 qemu-server 6/9] ipam : add snapshot rollback support Alexandre Derumier
2021-07-11 22:47 ` [pve-devel] [PATCH v2 qemu-server 7/9] ipam : add snaphot delete support Alexandre Derumier
2021-07-11 22:47 ` [pve-devel] [PATCH v2 qemu-server 8/9] ipam : add create vm support Alexandre Derumier
2021-07-11 22:47 ` Alexandre Derumier [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210711224707.63089-10-aderumier@odiso.com \
--to=aderumier@odiso.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox