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 0DA467045E for ; Tue, 21 Jun 2022 13:45:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 04B714AF5 for ; Tue, 21 Jun 2022 13:45:08 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS id 66A684AE1 for ; Tue, 21 Jun 2022 13:45:07 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 4072B43967; Tue, 21 Jun 2022 13:45:07 +0200 (CEST) Message-ID: <652b4a40-031a-e3de-33de-1035de61c05a@proxmox.com> Date: Tue, 21 Jun 2022 13:45:06 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Content-Language: en-US To: pve-devel@lists.proxmox.com, aderumier@odiso.com References: <20220620104502.1239272-1-aderumier@odiso.com> <20220620104502.1239272-8-aderumier@odiso.com> From: Fabian Ebner In-Reply-To: <20220620104502.1239272-8-aderumier@odiso.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.047 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [cloudinit.pm] Subject: Re: [pve-devel] [PATCH v6 qemu-server 7/9] api2: add cloudinit config api 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: Tue, 21 Jun 2022 11:45:38 -0000 Am 20.06.22 um 12:45 schrieb Alexandre Derumier: > diff --git a/PVE/QemuServer/Cloudinit.pm b/PVE/QemuServer/Cloudinit.pm > index cdaf4e5..2355953 100644 > --- a/PVE/QemuServer/Cloudinit.pm > +++ b/PVE/QemuServer/Cloudinit.pm > @@ -632,4 +633,81 @@ sub dump_cloudinit_config { > } > } > > +sub get_pending_config { > + my ($conf, $vmid) = @_; > + > + my $newconf = dclone($conf); > + > + my $cloudinit_current = $newconf->{cloudinit}; > + my @cloudinit_opts = keys %{PVE::QemuServer::cloudinit_config_properties()}; > + push @cloudinit_opts, 'name'; > + > + #add cloud-init drive > + my $drives = {}; > + PVE::QemuConfig->foreach_volume($newconf, sub { > + my ($ds, $drive) = @_; > + $drives->{$ds} = 1 if PVE::QemuServer::drive_is_cloudinit($drive); > + }); > + > + PVE::QemuConfig->foreach_volume($cloudinit_current, sub { > + my ($ds, $drive) = @_; > + $drives->{$ds} = 1 if PVE::QemuServer::drive_is_cloudinit($drive); > + }); > + foreach my $ds (keys %{$drives}) { Style nit: please use for > + push @cloudinit_opts, $ds; > + } > + > + $newconf->{name} = "VM$vmid" if !$newconf->{name}; > + $cloudinit_current->{name} = "VM$vmid" if !$cloudinit_current->{name}; > + > + #only mac-address is used in cloud-init config. Style nit: trailing whitespace > + #We don't want to display other pending net changes. > + my $print_cloudinit_net = sub { > + my ($conf, $opt) = @_; > + > + if (defined($conf->{$opt})) { > + my $net = PVE::QemuServer::parse_net($conf->{$opt}); > + $conf->{$opt} = "macaddr=".$net->{macaddr} if $net->{macaddr}; > + } > + }; > + > + my $cloudinit_options = {}; > + for my $opt (@cloudinit_opts) { > + if ($opt =~ m/^ipconfig(\d+)/) { > + my $netid = "net$1"; > + Style nit: trailing whitespace > + next if !defined($newconf->{$netid}) && !defined($cloudinit_current->{$netid}) && > + !defined($newconf->{$opt}) && !defined($cloudinit_current->{$opt}); > + > + &$print_cloudinit_net($newconf, $netid); > + &$print_cloudinit_net($cloudinit_current, $netid); > + $cloudinit_options->{$netid} = 1; > + } > + $cloudinit_options->{$opt} = 1; > + } > + > + my $res = []; > + > + for my $opt (keys %{$cloudinit_options}) { > + > + my $item = { > + key => $opt, > + }; > + if ($cloudinit_current->{$opt}) { > + $item->{value} = $cloudinit_current->{$opt}; > + if (defined($newconf->{$opt})) { > + $item->{pending} = $newconf->{$opt} if $newconf->{$opt} ne $cloudinit_current->{$opt}; Style nit: line too long > + } else { > + $item->{delete} = 1; > + } > + } else { > + $item->{pending} = $newconf->{$opt} if $newconf->{$opt} > + } > + > + push @$res, $item; > + } > + > + return $res; > +} > + > 1;