proxmox-mirrors/pve-firewall
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-firewall synced 2025-10-04 08:48:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

firewall group API: change 'name' to 'group'

Browse Source
This commit is contained in:
Dietmar Maurer 2014-04-24 14:31:13 +02:00
parent 88733a748c
commit 9e553e576b
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/PVE/API2/Firewall/Groups.pm
View File

@ -18,7 +18,7 @@ my $get_security_group_list = sub {
my $res = []; my $res = [];
foreach my $group (keys %{$cluster_conf->{groups}}) { foreach my $group (keys %{$cluster_conf->{groups}}) {
my $data = { my $data = {
name => $group, group => $group,
}; };
if (my $comment = $cluster_conf->{group_comments}->{$group}) { if (my $comment = $cluster_conf->{group_comments}->{$group}) {
$data->{comment} = $comment; $data->{comment} = $comment;
@ -44,7 +44,7 @@ __PACKAGE__->register_method({
items => { items => {
type => "object", type => "object",
properties => { properties => {
name => get_standard_option('pve-security-group-name'), group => get_standard_option('pve-security-group-name'),
digest => get_standard_option('pve-config-digest', { optional => 0} ), digest => get_standard_option('pve-config-digest', { optional => 0} ),
comment => { comment => {
type => 'string', type => 'string',
@ -52,7 +52,7 @@ __PACKAGE__->register_method({
} }
}, },
}, },
links => [ { rel => 'child', href => "{name}" } ], links => [ { rel => 'child', href => "{group}" } ],
}, },
code => sub { code => sub {
my ($param) = @_; my ($param) = @_;
@ -71,7 +71,7 @@ __PACKAGE__->register_method({
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
name => get_standard_option('pve-security-group-name'), group => get_standard_option('pve-security-group-name'),
comment => { comment => {
type => 'string', type => 'string',
optional => 1, optional => 1,
@ -93,23 +93,23 @@ __PACKAGE__->register_method({
my (undef, $digest) = &$get_security_group_list($cluster_conf); my (undef, $digest) = &$get_security_group_list($cluster_conf);
PVE::Tools::assert_if_modified($digest, $param->{digest}); PVE::Tools::assert_if_modified($digest, $param->{digest});
raise_param_exc({ name => "Security group '$param->{rename}' does not exists" }) raise_param_exc({ group => "Security group '$param->{rename}' does not exists" })
if !$cluster_conf->{groups}->{$param->{rename}}; if !$cluster_conf->{groups}->{$param->{rename}};
my $data = delete $cluster_conf->{groups}->{$param->{rename}}; my $data = delete $cluster_conf->{groups}->{$param->{rename}};
$cluster_conf->{groups}->{$param->{name}} = $data; $cluster_conf->{groups}->{$param->{group}} = $data;
if (my $comment = delete $cluster_conf->{group_comments}->{$param->{rename}}) { if (my $comment = delete $cluster_conf->{group_comments}->{$param->{rename}}) {
$cluster_conf->{group_comments}->{$param->{name}} = $comment; $cluster_conf->{group_comments}->{$param->{group}} = $comment;
} }
$cluster_conf->{group_comments}->{$param->{name}} = $param->{comment} if defined($param->{comment}); $cluster_conf->{group_comments}->{$param->{group}} = $param->{comment} if defined($param->{comment});
} else { } else {
foreach my $name (keys %{$cluster_conf->{groups}}) { foreach my $name (keys %{$cluster_conf->{groups}}) {
raise_param_exc({ name => "Security group '$name' already exists" }) raise_param_exc({ group => "Security group '$name' already exists" })
if $name eq $param->{name}; if $name eq $param->{group};
} }
$cluster_conf->{groups}->{$param->{name}} = []; $cluster_conf->{groups}->{$param->{group}} = [];
$cluster_conf->{group_comments}->{$param->{name}} = $param->{comment} if defined($param->{comment}); $cluster_conf->{group_comments}->{$param->{group}} = $param->{comment} if defined($param->{comment});
} }
PVE::Firewall::save_clusterfw_conf($cluster_conf); PVE::Firewall::save_clusterfw_conf($cluster_conf);
@ -119,14 +119,14 @@ __PACKAGE__->register_method({
__PACKAGE__->register_method({ __PACKAGE__->register_method({
name => 'delete_security_group', name => 'delete_security_group',
path => '{name}', path => '{group}',
method => 'DELETE', method => 'DELETE',
description => "Delete security group.", description => "Delete security group.",
protected => 1, protected => 1,
parameters => { parameters => {
additionalProperties => 0, additionalProperties => 0,
properties => { properties => {
name => get_standard_option('pve-security-group-name'), group => get_standard_option('pve-security-group-name'),
digest => get_standard_option('pve-config-digest'), digest => get_standard_option('pve-config-digest'),
}, },
}, },
@ -136,15 +136,15 @@ __PACKAGE__->register_method({
my $cluster_conf = PVE::Firewall::load_clusterfw_conf(); my $cluster_conf = PVE::Firewall::load_clusterfw_conf();
return undef if !$cluster_conf->{groups}->{$param->{name}}; return undef if !$cluster_conf->{groups}->{$param->{group}};
my (undef, $digest) = &$get_security_group_list($cluster_conf); my (undef, $digest) = &$get_security_group_list($cluster_conf);
PVE::Tools::assert_if_modified($digest, $param->{digest}); PVE::Tools::assert_if_modified($digest, $param->{digest});
die "Security group '$param->{name}' is not empty\n" die "Security group '$param->{group}' is not empty\n"
if scalar(@{$cluster_conf->{groups}->{$param->{name}}}); if scalar(@{$cluster_conf->{groups}->{$param->{group}}});
delete $cluster_conf->{groups}->{$param->{name}}; delete $cluster_conf->{groups}->{$param->{group}};
PVE::Firewall::save_clusterfw_conf($cluster_conf); PVE::Firewall::save_clusterfw_conf($cluster_conf);