Fix bug resulting from partial uptimes list from r261

svn path=/trunk/web/; revision=277

diff --git a/validation.py b/validation.py
index 3ed4938..fd2b979 100644 (file)
--- a/validation.py
+++ b/validation.py
@@ -43,7 +43,7 @@ def maxMemory(user, machine=None, on=True):
     if not on:
         return MAX_MEMORY_SINGLE
     machines = getMachinesByOwner(user, machine)
     if not on:
         return MAX_MEMORY_SINGLE
     machines = getMachinesByOwner(user, machine)

-    active_machines = [x for x in machines if g.uptimes[x]]
+    active_machines = [x for x in machines if g.uptimes.get(x)]

     mem_usage = sum([x.memory for x in active_machines if x != machine])
     return min(MAX_MEMORY_SINGLE, MAX_MEMORY_TOTAL-mem_usage)
 
     mem_usage = sum([x.memory for x in active_machines if x != machine])
     return min(MAX_MEMORY_SINGLE, MAX_MEMORY_TOTAL-mem_usage)
 

@@ -55,7 +55,7 @@ def maxDisk(user, machine=None):
 
 def cantAddVm(user):
     machines = getMachinesByOwner(user)
 
 def cantAddVm(user):
     machines = getMachinesByOwner(user)

-    active_machines = [x for x in machines if g.uptimes[x]]
+    active_machines = [x for x in machines if g.uptimes.get(x)]

     if len(machines) >= MAX_VMS_TOTAL:
         return 'You have too many VMs to create a new one.'
     if len(active_machines) >= MAX_VMS_ACTIVE:
     if len(machines) >= MAX_VMS_TOTAL:
         return 'You have too many VMs to create a new one.'
     if len(active_machines) >= MAX_VMS_ACTIVE: