API: add ability to restrict ref list to specified type

diff --git a/src/PVE/API2/Firewall/Cluster.pm b/src/PVE/API2/Firewall/Cluster.pm
index 8f1deefece76041d065f58e72dcadaaa1b7ff792..e8b44d2f6568b06a9764d4c9b93021790f1d4d8b 100644 (file)
--- a/src/PVE/API2/Firewall/Cluster.pm
+++ b/src/PVE/API2/Firewall/Cluster.pm
@@ -216,7 +216,14 @@ __PACKAGE__->register_method({
     description => "Lists possible IPSet/Alias reference which are allowed in source/dest properties.",
     parameters => {
        additionalProperties => 0,
-       properties => {},
+       properties => {
+           type => {
+               description => "Only list references of specified type.",
+               type => 'string',
+               enum => ['alias', 'ipset'],
+               optional => 1,
+           },
+       },
     },
     returns => {
        type => 'array',
@@ -247,27 +254,31 @@ __PACKAGE__->register_method({
 
        my $res = [];
 
-       foreach my $name (keys %{$conf->{ipset}}) {
-           my $data = {
-               type => 'ipset',
-               name => $name,
-               ref => "+$name",
-           };
-           if (my $comment = $conf->{ipset_comments}->{$name}) {
-               $data->{comment} = $comment;
+       if (!$param->{type} || $param->{type} eq 'ipset') {
+           foreach my $name (keys %{$conf->{ipset}}) {
+               my $data = {
+                   type => 'ipset',
+                   name => $name,
+                   ref => "+$name",
+               };
+               if (my $comment = $conf->{ipset_comments}->{$name}) {
+                   $data->{comment} = $comment;
+               }
+               push @$res, $data;
            }
-           push @$res, $data;
        }
 
-       foreach my $name (keys %{$conf->{aliases}}) {
-           my $e = $conf->{aliases}->{$name};
-           my $data = {
-               type => 'alias',
-               name => $name,
-               ref => $name,
-           };
-           $data->{comment} = $e->{comment} if $e->{comment};
-           push @$res, $data;
+       if (!$param->{type} || $param->{type} eq 'alias') {
+           foreach my $name (keys %{$conf->{aliases}}) {
+               my $e = $conf->{aliases}->{$name};
+               my $data = {
+                   type => 'alias',
+                   name => $name,
+                   ref => $name,
+               };
+               $data->{comment} = $e->{comment} if $e->{comment};
+               push @$res, $data;
+           }
        }
 
        return $res;

diff --git a/src/PVE/API2/Firewall/VM.pm b/src/PVE/API2/Firewall/VM.pm
index 3e49e8887c93aa6838ee6ec296d41ca31114fac2..63d7090e0f93cf78bc20f1570fa8cb55dadc0ed1 100644 (file)
--- a/src/PVE/API2/Firewall/VM.pm
+++ b/src/PVE/API2/Firewall/VM.pm
@@ -246,6 +246,12 @@ sub register_handlers {
            properties => {
                node => get_standard_option('pve-node'),
                vmid => get_standard_option('pve-vmid'),
+               type => {
+                   description => "Only list references of specified type.",
+                   type => 'string',
+                   enum => ['alias', 'ipset'],
+                   optional => 1,
+               },
            },
        },
        returns => {
@@ -278,27 +284,31 @@ sub register_handlers {
 
            foreach my $conf (($cluster_conf, $fw_conf)) {
                next if !$conf;
-               foreach my $name (keys %{$conf->{ipset}}) {
-                   my $data = { 
-                       type => 'ipset',
-                       name => $name,
-                       ref => "+$name",
-                   };
-                   if (my $comment = $conf->{ipset_comments}->{$name}) {
-                       $data->{comment} = $comment;
+               if (!$param->{type} || $param->{type} eq 'ipset') {
+                   foreach my $name (keys %{$conf->{ipset}}) {
+                       my $data = { 
+                           type => 'ipset',
+                           name => $name,
+                           ref => "+$name",
+                       };
+                       if (my $comment = $conf->{ipset_comments}->{$name}) {
+                           $data->{comment} = $comment;
+                       }
+                       $ipsets->{$name} = $data;
                    }
-                   $ipsets->{$name} = $data;
                }
 
-               foreach my $name (keys %{$conf->{aliases}}) {
-                   my $e = $conf->{aliases}->{$name};
-                   my $data = { 
-                       type => 'alias',
-                       name => $name,
-                       ref => $name,
-                   };
-                   $data->{comment} = $e->{comment} if $e->{comment};
-                   $aliases->{$name} = $data;
+               if (!$param->{type} || $param->{type} eq 'alias') {
+                   foreach my $name (keys %{$conf->{aliases}}) {
+                       my $e = $conf->{aliases}->{$name};
+                       my $data = { 
+                           type => 'alias',
+                           name => $name,
+                           ref => $name,
+                       };
+                       $data->{comment} = $e->{comment} if $e->{comment};
+                       $aliases->{$name} = $data;
+                   }
                }
            }