Changeset 2134 for trunk/packages/invirt-web

Timestamp:

Feb 17, 2009, 1:54:26 AM (16 years ago)

Author:

iannucci

Message:

Added all the other quotas for great win.

Location:

trunk/packages/invirt-web

Files:

• code/validation.py (modified) (4 diffs)
• debian/changelog (modified) (1 diff)

trunk/packages/invirt-web/code/validation.py

@@ -11 +11 @@
 
 MIN_MEMORY_SINGLE = 16
-MAX_DISK_TOTAL = 50
-MAX_DISK_SINGLE = 50
 MIN_DISK_SINGLE = 0.1
-MAX_VMS_TOTAL = 10
-MAX_VMS_ACTIVE = 4
 
 class Validate:
@@ -90 +86 @@
     returned.
     """
-    (quota_total, quota_single) = Owner.getQuotas(machine.owner if machine else owner)
+    (quota_total, quota_single) = Owner.getMemoryQuotas(machine.owner if machine else owner)
 
     if not on:
@@ -105 +101 @@
     return the maximum that a given machine can be changed to.
     """
+    (quota_total, quota_single) = Owner.getDiskQuotas(machine.owner if machine else owner)
+
     if machine is not None:
         machine_id = machine.machine_id
@@ -112 +110 @@
                      join('machine').\
                      filter_by(owner=owner).sum(Disk.c.size) or 0
-    return min(MAX_DISK_SINGLE, MAX_DISK_TOTAL-disk_usage/1024.)
+    return min(quota_single, quota_total-disk_usage/1024.)
 
 def cantAddVm(owner, g):
     machines = getMachinesByOwner(owner)
     active_machines = [m for m in machines if m.name in g.xmlist_raw]
-    if machines.count() >= MAX_VMS_TOTAL:
+    (quota_total, quota_active) = Owner.getVMQuotas(machine.owner if machine else owner)
+    if machines.count() >= quota_total:
         return 'You have too many VMs to create a new one.'
-    if len(active_machines) >= MAX_VMS_ACTIVE:
+    if len(active_machines) >= quota_active:
         return ('You already have the maximum number of VMs turned on.  '
                 'To create more, turn one off.')

trunk/packages/invirt-web/debian/changelog

@@ -3 +3 @@
   * modified quota checking to refer to invirt.database.Owner for quotas and defaults
 
- -- Peter A. Iannucci <iannucci@mit.edu>  Mon, 16 Feb 2009 23:49:21 -0500
+ -- Peter A. Iannucci <iannucci@mit.edu>  Tue, 17 Feb 2009 01:31:01 -0500
 
 invirt-web (0.0.18) unstable; urgency=low