From: Quentin Smith Date: Sat, 15 Dec 2007 02:13:43 +0000 (-0500) Subject: Allow users to change memory of machines if the machine is blessed X-Git-Tag: sipb-xen-www/1~25 X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/commitdiff_plain/7851ddf7c04bce0c49ff70b7a9e75eab9969df7b Allow users to change memory of machines if the machine is blessed svn path=/trunk/web/; revision=253 --- diff --git a/validation.py b/validation.py index 0626f86..07b3f3d 100644 --- a/validation.py +++ b/validation.py @@ -37,11 +37,11 @@ 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 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]] mem_usage = sum([x.memory for x in active_machines if x != machine])