X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/606c843a867528a38bdc58bcdea8c657be5de5fa..92d9dee2ecef8c8559ba342dfdcc1595994e49d2:/code/validation.py diff --git a/code/validation.py b/code/validation.py index ecd8b9f..bd3be91 100644 --- a/code/validation.py +++ b/code/validation.py @@ -10,7 +10,7 @@ from invirt.config import structs as config from invirt.common import InvalidInput MAX_MEMORY_TOTAL = 512 -MAX_MEMORY_SINGLE = 256 +MAX_MEMORY_SINGLE = 512 MIN_MEMORY_SINGLE = 16 MAX_DISK_TOTAL = 50 MAX_DISK_SINGLE = 50 @@ -66,6 +66,8 @@ class Validate: raise CodeError("Invalid cdrom type '%s'" % cdrom) self.cdrom = cdrom if autoinstall is not None: + #raise InvalidInput('autoinstall', 'install', + # "The autoinstaller has been temporarily disabled") self.autoinstall = Autoinstall.query().get(autoinstall) @@ -239,8 +241,6 @@ def testOwner(user, owner, machine=None): If machine is None, this is the owner of a new machine. """ - if owner == user: - return owner if machine is not None and owner in (machine.owner, None): return machine.owner if owner is None: