implement delete parameter for rule update API

diff --git a/src/PVE/API2/Firewall/Rules.pm b/src/PVE/API2/Firewall/Rules.pm
index 9db899d2aea4ee432a5cf6bef44daf27f7901eb7..032631dc39accd40073128c39ebc53f0ca4f1d24 100644 (file)
--- a/src/PVE/API2/Firewall/Rules.pm
+++ b/src/PVE/API2/Firewall/Rules.pm
@@ -185,6 +185,12 @@ sub register_update_rule {
        optional => 1,
     };
 
        optional => 1,
     };
 

+    $properties->{delete} = {
+       type => 'string', format => 'pve-configid-list',
+       description => "A list of settings you want to delete.",
+       optional => 1,
+    };
+

     my $update_rule_properties = PVE::Firewall::add_rule_properties($properties);
 
     $class->register_method({
     my $update_rule_properties = PVE::Firewall::add_rule_properties($properties);
 
     $class->register_method({


@@ -229,6 +235,8 @@ sub register_update_rule {
                    if !defined($param->{action});
 
                PVE::Firewall::copy_rule_data($rule, $param);
                    if !defined($param->{action});
 
                PVE::Firewall::copy_rule_data($rule, $param);

+               
+               PVE::Firewall::delete_rule_properties($rule, $param->{'delete'}) if $param->{'delete'};

            }
 
            $class->save_rules($param, $fw_conf, $rules);
            }
 
            $class->save_rules($param, $fw_conf, $rules);

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index 8fd0f482c6353b38f3989f13e6862e3fb53a7c42..6d4127e8585917c51c841497959d902a8a8620cd 100644 (file)
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -775,6 +775,20 @@ sub add_rule_properties {
     return $properties;
 }
 
     return $properties;
 }
 

+sub delete_rule_properties {
+    my ($rule, $delete_str) = @_;
+    
+    foreach my $opt (PVE::Tools::split_list($delete_str)) {
+       raise_param_exc({ 'delete' => "no such property ('$opt')"})
+           if !defined($rule_properties->{$opt});
+       raise_param_exc({ 'delete' => "unable to delete required property '$opt'"})
+           if $opt eq 'type' || $opt eq 'action';
+       delete $rule->{$opt};
+    }
+
+    return $rule;
+}
+

 sub copy_rule_data {
     my ($rule, $param) = @_;
 
 sub copy_rule_data {
     my ($rule, $param) = @_;