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 F1EA7751DE 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 EB7C9EB6C 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 2C9B9EB19 for ; Mon, 12 Jul 2021 00:47:15 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id CE7B9C12; 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:06 +0200 Message-Id: <20210711224707.63089-9-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.052 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 8/9] ipam : add create vm 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/API2/Qemu.pm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index aaefcec..66a21ba 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -703,7 +703,31 @@ __PACKAGE__->register_method({ my $arch = PVE::QemuServer::get_vm_arch($conf); my $vollist = []; + my $nets = {}; eval { + foreach my $opt (keys %{$conf}) { + next if $opt !~ m/^net(\d+)$/; + my $hostname = $conf->{name}; + my $description = "vm:$vmid net:$opt"; + my $net = PVE::QemuServer::parse_net($conf->{$opt}); + PVE::QemuServer::Ipam::add_net_ip(4,$net, $hostname, $description); + PVE::QemuServer::Ipam::update_net_gateway(4, $net); + $nets->{$opt} = PVE::QemuServer::print_net($net); + PVE::QemuServer::Ipam::add_net_ip(6,$net, $hostname, $description); + PVE::QemuServer::Ipam::update_net_gateway(6, $net); + $nets->{$opt} = PVE::QemuServer::print_net($net); + $conf->{$opt} = PVE::QemuServer::print_net($net); + if($opt =~ m/net(\d+)$/) { + my $ipconfigid = "ipconfig$1"; + my $ipconfig = {}; + $ipconfig->{ip} = $net->{ip} if $net->{ip}; + $ipconfig->{ip6} = $net->{ip6} if $net->{ip6}; + $ipconfig->{gw} = $net->{gw} if $net->{gw}; + $ipconfig->{gw6} = $net->{gw6} if $net->{gw6}; + $conf->{$ipconfigid} = PVE::QemuServer::print_ipconfig($ipconfig); + } + } + $vollist = &$create_disks($rpcenv, $authuser, $conf, $arch, $storecfg, $vmid, $pool, $param, $storage); if (!$conf->{boot}) { @@ -738,6 +762,14 @@ __PACKAGE__->register_method({ eval { PVE::Storage::vdisk_free($storecfg, $volid); }; warn $@ if $@; } + foreach my $opt (keys %{$nets}) { + my $net = PVE::QemuServer::parse_net($nets->{$opt}); + my $hostname = $conf->{name}; + eval { PVE::QemuServer::Ipam::delete_net_ip(6, $net, $hostname); }; + warn $@ if $@; + eval { PVE::QemuServer::Ipam::delete_net_ip(4, $net, $hostname); }; + warn $@ if $@; + } die "$emsg $err"; } -- 2.30.2