fix return format

[pve-access-control.git] / PVE / API2 / Pool.pm

diff --git a/PVE/API2/Pool.pm b/PVE/API2/Pool.pm
index f224777cc6fdcd837cda2312eddef0d356d95c2b..08823f619825d7b9f660180325c3958387df4f6b 100644 (file)
--- a/PVE/API2/Pool.pm
+++ b/PVE/API2/Pool.pm
@@ -14,22 +14,6 @@ use PVE::RESTHandler;
 
 use base qw(PVE::RESTHandler);
 
-my $extract_pool_data = sub {
-    my ($data, $full) = @_;
-
-    my $res = {};
-
-    $res->{comment} = $data->{comment} if defined($data->{comment});
-
-    return $res if !$full;
-
-    $res->{vms} = $data->{vms} ? [ keys %{$data->{vms}} ] : [];
- 
-    $res->{storages} = $data->{storage} ? [ keys %{$data->{storage}} ] : [];
-
-    return $res;
-};
-
 __PACKAGE__->register_method ({
     name => 'index', 
     path => '', 
@@ -61,9 +45,10 @@ __PACKAGE__->register_method ({
 
        my $usercfg = $rpcenv->{user_cfg};
 
-       foreach my $poolpath (keys %{$usercfg->{pools}}) {
-           my $entry = &$extract_pool_data($usercfg->{pools}->{$poolpath});
-           $entry->{poolid} = $poolpath;
+       foreach my $pool (keys %{$usercfg->{pools}}) {
+           my $entry = { poolid => $pool };
+           my $data = $usercfg->{pools}->{$pool};
+           $entry->{comment} = $data->{comment} if defined($data->{comment});
            push @$res, $entry;
        }
 
@@ -199,7 +184,6 @@ __PACKAGE__->register_method ({
        return undef;
     }});
 
-# fixme: return format!
 __PACKAGE__->register_method ({
     name => 'read_pool', 
     path => '{poolid}', 
@@ -214,7 +198,26 @@ __PACKAGE__->register_method ({
            poolid => {type => 'string', format => 'pve-poolid' },
        },
     },
-    returns => {},
+    returns => {
+       type => "object",
+       additionalProperties => 0,
+       properties => {
+           comment => { type => 'string', optional => 1 },
+           members => {
+               type => 'array',
+               items => {
+                   type => "object",
+                   additionalProperties => 0,
+                   properties => {
+                       type => { type => 'string', enum => ['vm', 'storage'] },
+                       id => { type => 'string' },
+                       vmid => { type => 'integer', optional => 1 },
+                       storage => { type => 'string', optional => 1 },
+                   },
+               },
+           },
+       },
+    },
     code => sub {
        my ($param) = @_;
 
@@ -227,7 +230,28 @@ __PACKAGE__->register_method ({
        die "pool '$pool' does not exist\n" 
            if !$data;
  
-       return &$extract_pool_data($data, 1);
+       my $members = [];
+
+       foreach my $vmid (keys %{$data->{vms}}) {
+           push @$members, {
+               id => "vm/$vmid",
+               vmid => $vmid + 0, 
+               type => 'vm',
+           };
+       }
+
+       foreach my $storage (keys %{$data->{storage}}) {
+           push @$members, {
+               id => "storage/$storage",
+               storage => $storage, 
+               type => 'storage',
+           };
+       }
+
+       my $res = { members => $members };
+       $res->{comment} = $data->{comment} if defined($data->{comment});
+
+       return $res;
     }});