Added all the other quotas for great win.

svn path=/trunk/packages/invirt-remote/; revision=2134

diff --git a/debian/changelog b/debian/changelog
index 1c55796..069d9a8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,8 @@ invirt-remote (0.3.4) unstable; urgency=low
     /etc/invirt/nocreate; if it exists, they advertise zero free memory and
     refuse to create VMs
   * added memory quota validation to invirt-remote-create
     /etc/invirt/nocreate; if it exists, they advertise zero free memory and
     refuse to create VMs
   * added memory quota validation to invirt-remote-create

-  * added owner table to database with ram_quota_total and ram_quota_single

 
 

- -- Peter A. Iannucci <iannucci@mit.edu>  Mon, 16 Feb 2009 23:49:14 -0500
+ -- Peter A. Iannucci <iannucci@mit.edu>  Tue, 17 Feb 2009 01:31:20 -0500

 
 invirt-remote (0.3.3) unstable; urgency=low
 
 
 invirt-remote (0.3.3) unstable; urgency=low
 

diff --git a/server/usr/sbin/invirt-remote-create b/server/usr/sbin/invirt-remote-create
index bae10c0..3ec70a5 100755 (executable)
--- a/server/usr/sbin/invirt-remote-create
+++ b/server/usr/sbin/invirt-remote-create
@@ -19,7 +19,7 @@ def maxMemory(owner, xmlist):
     Return the memory available for a new machine.
     """
     machines = invirt.database.Machine.query().filter_by(owner=owner)
     Return the memory available for a new machine.
     """
     machines = invirt.database.Machine.query().filter_by(owner=owner)

-    (quota_total, quota_single) = invirt.database.Owner.getQuotas(owner)
+    (quota_total, quota_single) = invirt.database.Owner.getMemoryQuotas(owner)

 
     active_machines = [m for m in machines if m.name in xmlist]
     mem_usage = sum([x.memory for x in active_machines])
 
     active_machines = [m for m in machines if m.name in xmlist]
     mem_usage = sum([x.memory for x in active_machines])