[pve-devel] r5148 - pve-storage/pve2/PVE/API2/Storage

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-09-14 10:12:10 +0000 (Tue, 14 Sep 2010)
New Revision: 5148

Modified:
   pve-storage/pve2/PVE/API2/Storage/Content.pm
   pve-storage/pve2/PVE/API2/Storage/Status.pm
Log:


Modified: pve-storage/pve2/PVE/API2/Storage/Content.pm
===================================================================
--- pve-storage/pve2/PVE/API2/Storage/Content.pm	2010-09-14 10:09:49 UTC (rev 5147)
+++ pve-storage/pve2/PVE/API2/Storage/Content.pm	2010-09-14 10:12:10 UTC (rev 5148)
@@ -7,7 +7,7 @@
 use PVE::INotify qw(read_file);;
 use PVE::Storage;
 use PVE::Exception qw(raise_param_exc);
-
+use PVE::RPCEnvironment;
 use PVE::RESTHandler;
 
 use base qw(PVE::RESTHandler);
@@ -419,16 +419,8 @@
     code => sub {
 	my ($param) = @_;
 
-	# fixme: use the real list
-	my $nodes = [ 
-	    { node => 'node-0'},
-	    { node => 'node-1'},
-	    { node => 'node-2'},
-	    { node => 'node-3'},
-	    ];
-
-	return $nodes;
-
+	my $rpcenv = PVE::RPCEnvironment::get();
+	return $rpcenv->get_nodelist();
     }});
 
 1;

Modified: pve-storage/pve2/PVE/API2/Storage/Status.pm
===================================================================
--- pve-storage/pve2/PVE/API2/Storage/Status.pm	2010-09-14 10:09:49 UTC (rev 5147)
+++ pve-storage/pve2/PVE/API2/Storage/Status.pm	2010-09-14 10:12:10 UTC (rev 5148)
@@ -5,8 +5,8 @@
 
 use PVE::INotify qw(read_file write_file);;
 use PVE::Storage;
-
 use PVE::RESTHandler;
+use PVE::RPCEnvironment;
 
 use base qw(PVE::RESTHandler);
 
@@ -118,16 +118,8 @@
     code => sub {
 	my ($param) = @_;
 
-	# fixme: use the real list
-	my $nodes = [ 
-	    { node => 'node-0'},
-	    { node => 'node-1'},
-	    { node => 'node-2'},
-	    { node => 'node-3'},
-	    ];
-
-	return $nodes;
-
+	my $rpcenv = PVE::RPCEnvironment::get();
+	return $rpcenv->get_nodelist();
     }});
 
 1;