X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/d154e547fb2cef84db71dd48344a773a93a04595..43c105be35eb49744112ccb6f28644d0c794585a:/validation.py

diff --git a/validation.py b/validation.py
index 5443d54..fd2b979 100644
--- a/validation.py
+++ b/validation.py
@@ -37,13 +37,13 @@ def maxMemory(user, machine=None, on=True):
     memory for the machine to change to, if it is left off, is
     returned.
     """
-    if not on:
-        return MAX_MEMORY_SINGLE
-    if machine.memory > MAX_MEMORY_SINGLE:
+    if machine is not None and machine.memory > MAX_MEMORY_SINGLE:
         # If they've been blessed, let them have it
         return machine.memory
+    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)
 
@@ -55,7 +55,7 @@ def maxDisk(user, machine=None):
 
 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:
@@ -71,8 +71,6 @@ def validAddVm(user):
 
 def haveAccess(user, machine):
     """Return whether a user has administrative access to a machine"""
-    if user == 'moo':
-        return True
     if user in (machine.administrator, machine.owner):
         return True
     if getafsgroups.checkAfsGroup(user, machine.administrator, 
@@ -84,8 +82,6 @@ def haveAccess(user, machine):
 
 def owns(user, machine):
     """Return whether a user owns a machine"""
-    if user == 'moo':
-        return True
     return not getafsgroups.notLockerOwner(user, machine.owner)
 
 def validMachineName(name):