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 33875788E9 for ; Wed, 29 Jun 2022 11:08:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 234D01B91D for ; Wed, 29 Jun 2022 11:08:44 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [IPv6:2a0a:1580:2000::2d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 29 Jun 2022 11:08:42 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 8B776A8BF; Wed, 29 Jun 2022 11:08:35 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 7850D19B46C; Wed, 29 Jun 2022 11:08:35 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Wed, 29 Jun 2022 11:08:28 +0200 Message-Id: <20220629090833.456340-2-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220629090833.456340-1-aderumier@odiso.com> References: <20220629090833.456340-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.026 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% HEADER_FROM_DIFFERENT_DOMAINS 0.249 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 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH qemu-server 1/2] api2: use firewall helpers 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: Wed, 29 Jun 2022 09:08:44 -0000 Signed-off-by: Alexandre Derumier --- PVE/API2/Qemu.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 99b426e..fe1465e 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -31,7 +31,7 @@ use PVE::RPCEnvironment; use PVE::AccessControl; use PVE::INotify; use PVE::Network; -use PVE::Firewall; +use PVE::Firewall::Helpers qw(remove_vmfw_conf clone_vmfw_conf); use PVE::API2::Firewall::VM; use PVE::API2::Qemu::Agent; use PVE::VZDump::Plugin; @@ -1911,7 +1911,7 @@ __PACKAGE__->register_method({ ); PVE::AccessControl::remove_vm_access($vmid); - PVE::Firewall::remove_vmfw_conf($vmid); + remove_vmfw_conf($vmid); if ($param->{purge}) { print "purging VM $vmid from related configurations..\n"; PVE::ReplicationConfig::remove_vmid_jobs($vmid); @@ -3416,7 +3416,7 @@ __PACKAGE__->register_method({ # FIXME use PVE::QemuConfig->create_and_lock_config and adapt code PVE::Tools::file_set_contents($conffile, "# qmclone temporary file\nlock: clone\n"); - PVE::Firewall::clone_vmfw_conf($vmid, $newid); + clone_vmfw_conf($vmid, $newid); my $newvollist = []; my $jobs = {}; @@ -3512,7 +3512,7 @@ __PACKAGE__->register_method({ warn $@ if $@; } - PVE::Firewall::remove_vmfw_conf($newid); + remove_vmfw_conf($newid); unlink $conffile; # avoid races -> last thing before die -- 2.30.2