fixed a minor bug in validation.py

[invirt/packages/invirt-web.git] / code / validation.py

diff --git a/code/validation.py b/code/validation.py
index bd3be91..480d007 100644 (file)
--- a/code/validation.py
+++ b/code/validation.py
@@ -5,18 +5,12 @@ import getafsgroups
 import re
 import string
 import dns.resolver
-from invirt.database import Machine, NIC, Type, Disk, CDROM, Autoinstall
+from invirt.database import Machine, NIC, Type, Disk, CDROM, Autoinstall, Owner
 from invirt.config import structs as config
-from invirt.common import InvalidInput
+from invirt.common import InvalidInput, CodeError
 
-MAX_MEMORY_TOTAL = 512
-MAX_MEMORY_SINGLE = 512
 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:
     def __init__(self, username, state, machine_id=None, name=None, description=None, owner=None,
@@ -91,15 +85,14 @@ def maxMemory(owner, g, machine=None, on=True):
     memory for the machine to change to, if it is left off, is
     returned.
     """
-    if machine is not None and machine.memory > MAX_MEMORY_SINGLE:
-        # If they've been blessed, let them have it
-        return machine.memory
+    (quota_total, quota_single) = Owner.getMemoryQuotas(machine.owner if machine else owner)
+
     if not on:
-        return MAX_MEMORY_SINGLE
+        return quota_single
     machines = getMachinesByOwner(owner, machine)
     active_machines = [m for m in machines if m.name in g.xmlist_raw]
     mem_usage = sum([x.memory for x in active_machines if x != machine])
-    return min(MAX_MEMORY_SINGLE, MAX_MEMORY_TOTAL-mem_usage)
+    return min(quota_single, quota_total-mem_usage)
 
 def maxDisk(owner, machine=None):
     """Return the maximum disk that a machine can reach.
@@ -107,6 +100,8 @@ def maxDisk(owner, machine=None):
     If machine is None, the maximum disk for a new machine. Otherwise,
     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
     else:
@@ -114,14 +109,15 @@ def maxDisk(owner, machine=None):
     disk_usage = Disk.query().filter(Disk.c.machine_id != machine_id).\
                      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(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.')
     return False