Change VM creation auth failure message

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

diff --git a/code/validation.py b/code/validation.py
index 18666be..003df61 100755 (executable)
--- a/code/validation.py
+++ b/code/validation.py
@@ -107,9 +107,10 @@ def maxDisk(owner, machine=None):
         machine_id = machine.machine_id
     else:
         machine_id = None
         machine_id = machine.machine_id
     else:
         machine_id = None

-    disk_usage = Disk.query.filter(Disk.c.machine_id != machine_id).\
-                     join('machine').\
-                     filter_by(owner=owner).sum(Disk.c.size) or 0
+    disk_usage_query = Disk.query.filter(Disk.machine_id != machine_id).\
+        join('machine').filter_by(owner=owner)
+
+    disk_usage = sum([m.size for m in disk_usage_query]) or 0

     return min(quota_single, quota_total-disk_usage/1024.)
 
 def cantAddVm(owner, g):
     return min(quota_single, quota_total-disk_usage/1024.)
 
 def cantAddVm(owner, g):

@@ -243,7 +244,8 @@ def testOwner(user, owner, machine=None):
     try:
         if user not in authz.expandOwner(owner):
             raise InvalidInput('owner', owner, 'You do not have access to the '
     try:
         if user not in authz.expandOwner(owner):
             raise InvalidInput('owner', owner, 'You do not have access to the '

-                               + owner + ' locker')
+                               + owner + ' locker (Is system:anyuser missing '
+                               + 'the l permission?)')

     except getafsgroups.AfsProcessError, e:
         raise InvalidInput('owner', owner, str(e))
     return owner
     except getafsgroups.AfsProcessError, e:
         raise InvalidInput('owner', owner, str(e))
     return owner