From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-container 2/2] api2 : use firewall helpers
Date: Wed, 29 Jun 2022 11:08:32 +0200 [thread overview]
Message-ID: <20220629090833.456340-6-aderumier@odiso.com> (raw)
In-Reply-To: <20220629090833.456340-1-aderumier@odiso.com>
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
src/PVE/API2/LXC.pm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index e909cb0..b15e327 100644
--- a/src/PVE/API2/LXC.pm
+++ b/src/PVE/API2/LXC.pm
@@ -11,7 +11,7 @@ use PVE::Cluster qw(cfs_read_file);
use PVE::RRD;
use PVE::DataCenterConfig;
use PVE::AccessControl;
-use PVE::Firewall;
+use PVE::Firewall::Helpers qw(remove_vmfw_conf clone_vmfw_conf);
use PVE::Storage;
use PVE::RESTHandler;
use PVE::RPCEnvironment;
@@ -761,7 +761,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 CT $vmid from related configurations..\n";
PVE::ReplicationConfig::remove_vmid_jobs($vmid);
@@ -1462,7 +1462,7 @@ __PACKAGE__->register_method({
my $running;
PVE::LXC::Config->create_and_lock_config($newid, 0);
- PVE::Firewall::clone_vmfw_conf($vmid, $newid);
+ clone_vmfw_conf($vmid, $newid);
my $lock_and_reload = sub {
my ($vmid, $code) = @_;
@@ -1569,7 +1569,7 @@ __PACKAGE__->register_method({
eval {
$lock_and_reload->($newid, sub {
PVE::LXC::Config->destroy_config($newid);
- PVE::Firewall::remove_vmfw_conf($newid);
+ remove_vmfw_conf($newid);
});
};
warn "Failed to remove target CT config - $@\n" if $@;
@@ -1661,7 +1661,7 @@ __PACKAGE__->register_method({
eval {
$lock_and_reload->($newid, sub {
PVE::LXC::Config->destroy_config($newid);
- PVE::Firewall::remove_vmfw_conf($newid);
+ remove_vmfw_conf($newid);
});
};
warn "Failed to remove target CT config - $@\n" if $@;
--
2.30.2
next prev parent reply other threads:[~2022-06-29 9:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-29 9:08 [pve-devel] [PATCH SERIES common/firewall/qemu-server/container 0/1] Cleanup use of PVE::Firewall Alexandre Derumier
2022-06-29 9:08 ` [pve-devel] [PATCH qemu-server 1/2] api2: use firewall helpers Alexandre Derumier
2022-06-29 9:08 ` [pve-devel] [PATCH pve-firewall 1/1] move clone_vmfw_conf && remove_vmfw_conf to a Helpers Alexandre Derumier
2022-11-16 17:09 ` [pve-devel] applied: " Thomas Lamprecht
2022-06-29 9:08 ` [pve-devel] [PATCH pve-container 1/2] remove unused use PVE::Firewall Alexandre Derumier
2022-06-29 9:08 ` [pve-devel] [PATCH pve-common 1/1] schema: add pve-targetstorage (moved from qemu-server) Alexandre Derumier
2022-06-29 9:34 ` Thomas Lamprecht
2022-06-29 9:46 ` Fabian Ebner
2022-06-29 9:48 ` Thomas Lamprecht
2022-06-30 7:30 ` DERUMIER, Alexandre
2022-06-30 7:51 ` Thomas Lamprecht
2022-06-29 9:08 ` Alexandre Derumier [this message]
2022-06-29 9:08 ` [pve-devel] [PATCH qemu-server 2/2] qemu-server: remove json schema pve-targetstorage (moved to pve-common) 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=20220629090833.456340-6-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox