always pass cluster_conf to load_vmfw_conf

[pve-firewall.git] / src / PVE / API2 / Firewall / Aliases.pm

diff --git a/src/PVE/API2/Firewall/Aliases.pm b/src/PVE/API2/Firewall/Aliases.pm
index 86393e6d29192b03bf485997475e6a758b9380c2..e25ae9cb3b4fd5f98ecbc59e0e8acf5b34318c0c 100644 (file)
--- a/src/PVE/API2/Firewall/Aliases.pm
+++ b/src/PVE/API2/Firewall/Aliases.pm
@@ -15,10 +15,14 @@ my $api_properties = {
        type => 'string', format => 'IPv4orCIDR',
     },
     name => get_standard_option('pve-fw-alias'),
+    rename => get_standard_option('pve-fw-alias', {
+       description => "Rename an existing alias.",
+       optional => 1,
+    }),
     comment => {
        type => 'string',
        optional => 1,
-    }
+    },
 };
 
 sub load_config {
@@ -149,7 +153,6 @@ sub register_read_alias {
     my $properties = $class->additional_parameters();
 
     $properties->{name} = $api_properties->{name};
-    $properties->{cidr} = $api_properties->{cidr};
     
     $class->register_method({
        name => 'read_alias',
@@ -181,6 +184,7 @@ sub register_update_alias {
     my $properties = $class->additional_parameters();
 
     $properties->{name} = $api_properties->{name};
+    $properties->{rename} = $api_properties->{rename};
     $properties->{cidr} = $api_properties->{cidr};
     $properties->{comment} = $api_properties->{comment};
     $properties->{digest} = get_standard_option('pve-config-digest');
@@ -216,7 +220,19 @@ sub register_update_alias {
 
            $aliases->{$name} = $data;
 
+           my $rename = lc($param->{rename});
+
+           if ($rename && ($name ne $rename)) {
+               raise_param_exc({ name => "alias '$param->{rename}' already exists" }) 
+                   if defined($aliases->{$rename});
+               $aliases->{$name}->{name} = $param->{rename};
+               $aliases->{$rename} = $aliases->{$name};
+               delete $aliases->{$name};
+           }
+
            $class->save_aliases($param, $fw_conf, $aliases);
+
+           return undef;
        }});
 }
 
@@ -226,7 +242,6 @@ sub register_delete_alias {
     my $properties = $class->additional_parameters();
 
     $properties->{name} = $api_properties->{name};
-    $properties->{cidr} = $api_properties->{cidr};
     $properties->{digest} = get_standard_option('pve-config-digest');
 
     $class->register_method({
@@ -293,4 +308,68 @@ sub save_aliases {
 
 __PACKAGE__->register_handlers();
 
+package PVE::API2::Firewall::VMAliases;
+
+use strict;
+use warnings;
+use PVE::JSONSchema qw(get_standard_option);
+
+use base qw(PVE::API2::Firewall::AliasesBase);
+
+__PACKAGE__->additional_parameters({ 
+    node => get_standard_option('pve-node'),
+    vmid => get_standard_option('pve-vmid'),                              
+});
+
+sub load_config {
+    my ($class, $param) = @_;
+
+    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);
+}
+
+sub save_aliases {
+    my ($class, $param, $fw_conf, $aliases) = @_;
+
+    $fw_conf->{aliases} = $aliases;
+    PVE::Firewall::save_vmfw_conf($param->{vmid}, $fw_conf);
+}
+
+__PACKAGE__->register_handlers();
+
+package PVE::API2::Firewall::CTAliases;
+
+use strict;
+use warnings;
+use PVE::JSONSchema qw(get_standard_option);
+
+use base qw(PVE::API2::Firewall::AliasesBase);
+
+__PACKAGE__->additional_parameters({ 
+    node => get_standard_option('pve-node'),
+    vmid => get_standard_option('pve-vmid'),                              
+});
+
+sub load_config {
+    my ($class, $param) = @_;
+
+    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);
+}
+
+sub save_aliases {
+    my ($class, $param, $fw_conf, $aliases) = @_;
+
+    $fw_conf->{aliases} = $aliases;
+    PVE::Firewall::save_vmfw_conf($param->{vmid}, $fw_conf);
+}
+
+__PACKAGE__->register_handlers();
+
 1;