X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/e73cda9748a8726531dba4b309783dde1597549a..5956935c3de0811a27e96ca35f6b8f2518f04aa9:/code/controls.py diff --git a/code/controls.py b/code/controls.py index c51a6ba..2a86a89 100644 --- a/code/controls.py +++ b/code/controls.py @@ -73,6 +73,19 @@ def bootMachine(machine, cdtype): if 'already running' in err: raise InvalidInput('action', 'create', 'VM %s is already on' % machine.name) + elif 'I need' in err and 'but dom0_min_mem is' in err: + raise InvalidInput('action', 'create', + "We're really sorry, but our servers don't have enough capacity to create your VM right now. Try creating a VM with less RAM, or shutting down another VM of yours. Feel free to ask %s if you would like to know when we plan to have more resources." % (config.contact)) + elif ('Booting VMs is temporarily disabled for maintenance, sorry' in err or + 'LVM operations are temporarily disabled for maintenance, sorry' in err): + raise InvalidInput('action', 'create', + err) + elif "Boot loader didn't return any data!" in err: + raise InvalidInput('action', 'create', + "The ParaVM bootloader was unable to find an operating system to boot. Do you have GRUB configured correctly?") + elif 'xc_dom_find_loader: no loader found' in err: + raise InvalidInput('action', 'create', + "The ParaVM bootloader was unable to boot the kernel you have configured. Are you sure this kernel is capable of running as a Xen ParaVM guest?") elif err: raise CodeError('"%s" on "control %s create %s' % (err, machine.name, cdtype)) @@ -208,9 +221,7 @@ def commandResult(username, state, command_name, machine_id, fields): start_time = 0 machine = validation.Validate(username, state, machine_id=machine_id).machine action = command_name - cdrom = fields.get('cdrom') - if not cdrom: - cdrom = None + cdrom = fields.get('cdrom') or None if cdrom is not None and not CDROM.query().filter_by(cdrom_id=cdrom).one(): raise CodeError("Invalid cdrom type '%s'" % cdrom) if action not in "reboot create destroy shutdown delete".split(" "):