X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/89e13567a64d63163ca622fb8e45be5f3ca6d443..5956935c3de0811a27e96ca35f6b8f2518f04aa9:/code/controls.py

diff --git a/code/controls.py b/code/controls.py
index 911c41a..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))
@@ -105,11 +118,11 @@ def createVm(username, state, owner, contact, name, description, memory, disksiz
         session.save_or_update(nic)
         session.save_or_update(disk)
         cache_acls.refreshMachine(machine)
+        makeDisks(machine)
         session.commit()
     except:
         session.rollback()
         raise
-    makeDisks(machine)
     try:
         if autoinstall:
             lvinstall(machine, autoinstall)
@@ -204,17 +217,16 @@ def deleteVM(machine):
         session.rollback()
         raise
 
-def commandResult(username, state, fields):
+def commandResult(username, state, command_name, machine_id, fields):
     start_time = 0
-    machine = validation.Validate(username, state, machine_id=fields.getfirst('machine_id')).machine
-    action = fields.getfirst('action')
-    cdrom = fields.getfirst('cdrom')
+    machine = validation.Validate(username, state, machine_id=machine_id).machine
+    action = command_name
+    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', 'Power on', 'Power off', 'Shutdown', 
-                      'Delete VM'):
+    if action not in "reboot create destroy shutdown delete".split(" "):
         raise CodeError("Invalid action '%s'" % action)
-    if action == 'Reboot':
+    if action == 'reboot':
         if cdrom is not None:
             out, err = remctl('control', machine.name, 'reboot', cdrom,
                               err=True)
@@ -230,13 +242,13 @@ def commandResult(username, state, fields):
                 print >> sys.stderr, err
                 raise CodeError('ERROR on remctl')
                 
-    elif action == 'Power on':
+    elif action == 'create':
         if validation.maxMemory(username, state, machine) < machine.memory:
             raise InvalidInput('action', 'Power on',
                                "You don't have enough free RAM quota "
                                "to turn on this machine.")
         bootMachine(machine, cdrom)
-    elif action == 'Power off':
+    elif action == 'destroy':
         out, err = remctl('control', machine.name, 'destroy', err=True)
         if err:
             if re.match("machine '.*' is not on", err):
@@ -246,7 +258,7 @@ def commandResult(username, state, fields):
                 print >> sys.stderr, 'Error on power off:'
                 print >> sys.stderr, err
                 raise CodeError('ERROR on remctl')
-    elif action == 'Shutdown':
+    elif action == 'shutdown':
         out, err = remctl('control', machine.name, 'shutdown', err=True)
         if err:
             if re.match("machine '.*' is not on", err):
@@ -256,7 +268,7 @@ def commandResult(username, state, fields):
                 print >> sys.stderr, 'Error on Shutdown:'
                 print >> sys.stderr, err
                 raise CodeError('ERROR on remctl')
-    elif action == 'Delete VM':
+    elif action == 'delete':
         deleteVM(machine)
 
     d = dict(user=username,