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 5124D9ED38 for ; Fri, 3 Nov 2023 12:54:24 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 473121CAED for ; Fri, 3 Nov 2023 12:53:53 +0100 (CET) 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 for ; Fri, 3 Nov 2023 12:53:48 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 2BBD94429D for ; Fri, 3 Nov 2023 12:53:45 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Fri, 3 Nov 2023 12:53:38 +0100 Message-Id: <20231103115343.4133611-6-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20231103115343.4133611-1-d.csapak@proxmox.com> References: <20231103115343.4133611-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.017 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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 - Subject: [pve-devel] [RFC PATCH qemu-server 3/4] api: add profile option to create vm api call 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: Fri, 03 Nov 2023 11:54:24 -0000 we use the the profile cfg as the 'param' hash, but overwrite the values with the ones from the api call, so one can overwrite options from the profile easily also we add the used profile to the meta info in the config, since it might be interesting which one was used Signed-off-by: Dominik Csapak --- PVE/API2/Qemu.pm | 27 ++++++++++++++++++++++++++- PVE/QemuServer.pm | 6 ++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 38bdaabd..ca18c796 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -49,6 +49,9 @@ use PVE::SSHInfo; use PVE::Replication; use PVE::StorageTunnel; +use PVE::Profiles::Plugin; +use PVE::Profiles::VM; + BEGIN { if (!$ENV{PVE_GENERATING_DOCS}) { require PVE::HA::Env::PVE2; @@ -837,6 +840,11 @@ __PACKAGE__->register_method({ default => 0, description => "Start VM after it was created successfully.", }, + profile => { + optional => 1, + type => 'string', + description => "The profile to use as base config.", + }, }, 1, # with_disk_alloc ), @@ -850,6 +858,23 @@ __PACKAGE__->register_method({ my $rpcenv = PVE::RPCEnvironment::get(); my $authuser = $rpcenv->get_user(); + my $profile = extract_param($param, 'profile'); + my $meta_opts = {}; + if (defined($profile)) { + $rpcenv->check_full($authuser, "/mapping/profiles/${profile}", ['Mapping.Use']); + $meta_opts->{profile} = $profile; + my $profile_cfgs = cfs_read_file('virtual-guest/profiles.cfg'); + my $profile_cfg = $profile_cfgs->{ids}->{$profile}; + die "no such profile '$profile'\n" if !defined($profile_cfg); + die "wrong type '$profile_cfg->{type}'\n" if $profile_cfg->{type} ne 'vm'; + + for my $opt (keys $param->%*) { + $profile_cfg->{$opt} = $param->{$opt}; + } + delete $profile_cfg->{type}; + $param = $profile_cfg; + } + my $node = extract_param($param, 'node'); my $vmid = extract_param($param, 'vmid'); @@ -1013,7 +1038,7 @@ __PACKAGE__->register_method({ my $conf = $param; my $arch = PVE::QemuServer::get_vm_arch($conf); - $conf->{meta} = PVE::QemuServer::new_meta_info_string(); + $conf->{meta} = PVE::QemuServer::new_meta_info_string($meta_opts); my $vollist = []; eval { diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index c22b1544..490bad9d 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -290,6 +290,12 @@ my $meta_info_fmt = { pattern => '\d+(\.\d+)+', optional => 1, }, + 'profile' => { + type => 'string', + description => 'The Profile used during creation.', + format => 'pve-configid', + optional => 1, + }, }; my $confdesc = { -- 2.30.2