From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-container 3/6] vm_create|restore: create ips in ipam
Date: Wed, 15 Nov 2023 15:22:02 +0100 [thread overview]
Message-ID: <20231115142208.563587-10-aderumier@odiso.com> (raw)
In-Reply-To: <20231115142208.563587-1-aderumier@odiso.com>
also delete ips on create failure
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
src/PVE/API2/LXC.pm | 4 ++++
src/PVE/LXC.pm | 13 +++++++++++++
2 files changed, 17 insertions(+)
diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index 28d14de..ccacbd2 100644
--- a/src/PVE/API2/LXC.pm
+++ b/src/PVE/API2/LXC.pm
@@ -475,9 +475,11 @@ __PACKAGE__->register_method({
if ($restore) {
print "merging backed-up and given configuration..\n";
PVE::LXC::Create::restore_configuration($vmid, $storage_cfg, $archive, $rootdir, $conf, !$is_root, $unique, $skip_fw_config_restore);
+ PVE::LXC::create_ifaces_ipams_ips($conf, $vmid) if $unique;
my $lxc_setup = PVE::LXC::Setup->new($conf, $rootdir);
$lxc_setup->template_fixup($conf);
} else {
+ PVE::LXC::create_ifaces_ipams_ips($conf, $vmid);
my $lxc_setup = PVE::LXC::Setup->new($conf, $rootdir); # detect OS
PVE::LXC::Config->write_config($vmid, $conf); # safe config (after OS detection)
$lxc_setup->post_create_hook($password, $ssh_keys);
@@ -503,6 +505,8 @@ __PACKAGE__->register_method({
PVE::LXC::Config->write_config($vmid, $conf);
};
if (my $err = $@) {
+ eval { PVE::LXC::delete_ifaces_ipams_ips($conf, $vmid) };
+ warn $@ if $@;
PVE::LXC::destroy_disks($storage_cfg, $vollist);
if ($destroy_config_on_error) {
eval { PVE::LXC::Config->destroy_config($vmid) };
diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index 6f1c6b9..a270dcc 100644
--- a/src/PVE/LXC.pm
+++ b/src/PVE/LXC.pm
@@ -2732,6 +2732,19 @@ sub thaw($) {
}
}
+sub create_ifaces_ipams_ips {
+ my ($conf, $vmid) = @_;
+
+ return if !$have_sdn;
+
+ for my $opt (keys %$conf) {
+ next if $opt !~ m/^net(\d+)$/;
+ my $net = PVE::QemuServer::parse_net($conf->{$opt});
+ next if $net->{type} ne 'veth';
+ PVE::Network::SDN::Vnets::add_next_free_cidr($net->{bridge}, $conf->{hostname}, $net->{hwaddr}, "vmid: $vmid", undef, 1);
+ }
+}
+
sub delete_ifaces_ipams_ips {
my ($conf, $vmid) = @_;
--
2.39.2
next prev parent reply other threads:[~2023-11-15 14:22 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-15 14:21 [pve-devel] [PATCH series pve-network/qemu-server/pve-container] DHCP WIP3 Alexandre Derumier
2023-11-15 14:21 ` [pve-devel] [PATCH pve-network 1/3] fix subnets && netbox ipam tests Alexandre Derumier
2023-11-15 14:21 ` [pve-devel] [PATCH pve-container 1/6] nic hotplug : add|del ips in ipam Alexandre Derumier
2023-11-15 14:56 ` Stefan Hanreich
2023-11-15 15:19 ` DERUMIER, Alexandre
2023-11-15 14:21 ` [pve-devel] [PATCH qemu-server 1/6] vmnic add|remove : add|del ip " Alexandre Derumier
2023-11-15 14:21 ` [pve-devel] [PATCH pve-network 2/3] add add_dhcp_mapping Alexandre Derumier
2023-11-15 14:21 ` [pve-devel] [PATCH pve-container 2/6] vm_destroy: remove ips from ipam for all interfaces Alexandre Derumier
2023-11-15 14:21 ` [pve-devel] [PATCH qemu-server 2/6] vm_start : vm-network-scripts: add_dhcp_reservation Alexandre Derumier
2023-11-15 14:22 ` [pve-devel] [PATCH pve-network 3/3] dhcp: delete remove_mapping Alexandre Derumier
2023-11-15 14:22 ` [pve-devel] [PATCH qemu-server 3/6] nic hotplug: add_dhcp_mapping Alexandre Derumier
2023-11-15 14:22 ` Alexandre Derumier [this message]
2023-11-15 14:22 ` [pve-devel] [PATCH qemu-server 4/6] api2: create|restore|clone: add_free_ip Alexandre Derumier
2023-11-15 14:22 ` [pve-devel] [PATCH pve-container 4/6] vm_clone : create ips in ipams Alexandre Derumier
2023-11-15 14:22 ` [pve-devel] [PATCH pve-container 5/6] vm_apply_pending: add|del ips from ipam for offline changes Alexandre Derumier
2023-11-15 14:22 ` [pve-devel] [PATCH qemu-server 5/6] vm_destroy: delete ip from ipam Alexandre Derumier
2023-11-15 14:22 ` [pve-devel] [PATCH pve-container 6/6] lxc-pve-prestart-hook : add_dhcp_mapping Alexandre Derumier
2023-11-15 14:22 ` [pve-devel] [PATCH qemu-server 6/6] nic online bridge/vlan change: link disconnect/reconnect Alexandre Derumier
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=20231115142208.563587-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