[haizea-commit] r479 - trunk/src/haizea/resourcemanager

[haizea-commit at mailman.cs.uchicago.edu]

Author: borja
Date: 2008-08-30 14:43:48 -0500 (Sat, 30 Aug 2008)
New Revision: 479

Modified:
   trunk/src/haizea/resourcemanager/rpcserver.py
Log:
- Fixed get_queue RPC method
- Added get_hosts RPC method

Modified: trunk/src/haizea/resourcemanager/rpcserver.py
===================================================================
--- trunk/src/haizea/resourcemanager/rpcserver.py	2008-08-30 19:42:57 UTC (rev 478)
+++ trunk/src/haizea/resourcemanager/rpcserver.py	2008-08-30 19:43:48 UTC (rev 479)
@@ -33,6 +33,7 @@
         self.register_rpc(self.get_leases)
         self.register_rpc(self.get_lease)
         self.register_rpc(self.get_queue)
+        self.register_rpc(self.get_hosts)
         self.register_rpc(self.notify_event)
 
     def start(self):
@@ -62,7 +63,10 @@
         return 0
 
     def get_queue(self):
-        return [l.xmlrpc_marshall() for l in self.rm.queue]
+        return [l.xmlrpc_marshall() for l in self.rm.scheduler.queue]
 
+    def get_hosts(self):
+        return [h.xmlrpc_marshall() for h in self.rm.resourcepool.nodes]
+
     def notify_event(self, lease_id, enactment_id, event):
         pass
\ No newline at end of file