From 42ec8178189b0b27e083b0a0aa94e04670e492ae Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Wed, 28 May 2014 06:47:05 +0200 Subject: [PATCH] always pass cluster_conf to load_vmfw_conf --- src/PVE/API2/Firewall/Aliases.pm | 6 ++++-- src/PVE/API2/Firewall/VM.pm | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/PVE/API2/Firewall/Aliases.pm b/src/PVE/API2/Firewall/Aliases.pm index 1a637de..e25ae9c 100644 --- a/src/PVE/API2/Firewall/Aliases.pm +++ b/src/PVE/API2/Firewall/Aliases.pm @@ -324,7 +324,8 @@ __PACKAGE__->additional_parameters({ sub load_config { my ($class, $param) = @_; - my $fw_conf = PVE::Firewall::load_vmfw_conf('vm', $param->{vmid}); + my $cluster_conf = PVE::Firewall::load_clusterfw_conf(); + my $fw_conf = PVE::Firewall::load_vmfw_conf($cluster_conf, 'vm', $param->{vmid}); my $aliases = $fw_conf->{aliases}; return ($fw_conf, $aliases); @@ -355,7 +356,8 @@ __PACKAGE__->additional_parameters({ sub load_config { my ($class, $param) = @_; - my $fw_conf = PVE::Firewall::load_vmfw_conf('ct', $param->{vmid}); + my $cluster_conf = PVE::Firewall::load_clusterfw_conf(); + my $fw_conf = PVE::Firewall::load_vmfw_conf($cluster_conf, 'ct', $param->{vmid}); my $aliases = $fw_conf->{aliases}; return ($fw_conf, $aliases); diff --git a/src/PVE/API2/Firewall/VM.pm b/src/PVE/API2/Firewall/VM.pm index 040f23e..732f6bf 100644 --- a/src/PVE/API2/Firewall/VM.pm +++ b/src/PVE/API2/Firewall/VM.pm @@ -115,7 +115,8 @@ sub register_handlers { code => sub { my ($param) = @_; - my $vmfw_conf = PVE::Firewall::load_vmfw_conf($rule_env, $param->{vmid}); + my $cluster_conf = PVE::Firewall::load_clusterfw_conf(); + my $vmfw_conf = PVE::Firewall::load_vmfw_conf($cluster_conf, $rule_env, $param->{vmid}); return PVE::Firewall::copy_opject_with_digest($vmfw_conf->{options}); }}); @@ -144,7 +145,9 @@ sub register_handlers { code => sub { my ($param) = @_; - my $vmfw_conf = PVE::Firewall::load_vmfw_conf($rule_env, $param->{vmid}); + + my $cluster_conf = PVE::Firewall::load_clusterfw_conf(); + my $vmfw_conf = PVE::Firewall::load_vmfw_conf($cluster_conf, $rule_env, $param->{vmid}); my (undef, $digest) = PVE::Firewall::copy_opject_with_digest($vmfw_conf->{options}); PVE::Tools::assert_if_modified($digest, $param->{digest}); -- 2.39.2