all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu-server 4/6] api2: create|restore|clone: add_free_ip
Date: Wed, 15 Nov 2023 15:22:03 +0100	[thread overview]
Message-ID: <20231115142208.563587-11-aderumier@odiso.com> (raw)
In-Reply-To: <20231115142208.563587-1-aderumier@odiso.com>

Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
 PVE/API2/Qemu.pm  |  6 ++++++
 PVE/QemuServer.pm | 15 +++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 38bdaab..a0f8243 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -991,6 +991,8 @@ __PACKAGE__->register_method({
 		    eval { PVE::QemuServer::template_create($vmid, $restored_conf) };
 		    warn $@ if $@;
 		}
+
+		PVE::QemuServer::create_ifaces_ipams_ips($restored_conf, $vmid) if $unique;
 	    };
 
 	    # ensure no old replication state are exists
@@ -1066,6 +1068,8 @@ __PACKAGE__->register_method({
 		}
 
 		PVE::AccessControl::add_vm_to_pool($vmid, $pool) if $pool;
+
+		PVE::QemuServer::create_ifaces_ipams_ips($conf, $vmid);
 	    };
 
 	    PVE::QemuConfig->lock_config_full($vmid, 1, $realcmd);
@@ -3763,6 +3767,8 @@ __PACKAGE__->register_method({
 
 		PVE::QemuConfig->write_config($newid, $newconf);
 
+		PVE::QemuServer::create_ifaces_ipams_ips($newconf, $vmid);
+
 		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 d157f9e..7248346 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -8629,4 +8629,19 @@ sub del_nets_bridge_fdb {
     }
 }
 
+sub create_ifaces_ipams_ips {
+    my ($conf, $vmid) = @_;
+
+    return if !$have_sdn;
+
+    foreach my $opt (keys %$conf) {
+        if ($opt =~ m/^net(\d+)$/) {
+            my $value = $conf->{$opt};
+            my $net = PVE::QemuServer::parse_net($value);
+            eval { PVE::Network::SDN::Vnets::add_next_free_cidr($net->{bridge}, $conf->{name}, $net->{macaddr}, $vmid, undef, 1) };
+            warn $@ if $@;
+        }
+    }
+}
+
 1;
-- 
2.39.2




  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 ` [pve-devel] [PATCH pve-container 3/6] vm_create|restore: create ips in ipam Alexandre Derumier
2023-11-15 14:22 ` Alexandre Derumier [this message]
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-11-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal