Autoinstallers for Debian Buster and Ubuntu Bionic

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

diff --git a/code/validation.py b/code/validation.py
index 26a49a3..da01d8d 100755 (executable)
--- a/code/validation.py
+++ b/code/validation.py
@@ -99,19 +99,26 @@ def maxDisk(owner, machine=None):
     """Return the maximum disk that a machine can reach.
 
     If machine is None, the maximum disk for a new machine. Otherwise,
     """Return the maximum disk that a machine can reach.
 
     If machine is None, the maximum disk for a new machine. Otherwise,

-    return the maximum that a given machine can be changed to.
+    return the maximum that a given machine can be changed to.  If the
+    disk currently exceeds the quotas, it can be changed to anything up
+    to its current size.

     """
     (quota_total, quota_single) = Owner.getDiskQuotas(machine.owner if machine else owner)
 
     """
     (quota_total, quota_single) = Owner.getDiskQuotas(machine.owner if machine else owner)
 

-    if machine is not None:
+    machine_id, current_size = None, 0
+    if machine is not None and machine.disks:

         machine_id = machine.machine_id
         machine_id = machine.machine_id

-    else:
-        machine_id = None
+        # XXX The machine modification form doesn't currently handle the
+        # case of machines with multiple disks.  It simply addresses the "first"
+        # disk (which is possibly nondeterministic and wrong).  Since we're
+        # doing validation for that form, we have to use the same logic it
+        # does.
+        current_size = machine.disks[0].size / 1024.

     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
     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.)
+    return max(current_size, min(quota_single, quota_total-disk_usage/1024.))

 
 def cantAddVm(owner, g):
     machines = getMachinesByOwner(owner)
 
 def cantAddVm(owner, g):
     machines = getMachinesByOwner(owner)

@@ -244,7 +251,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