Fixed naming of guest disk

[invirt/packages/invirt-web.git] / code / controls.py

diff --git a/code/controls.py b/code/controls.py
index bbc9f8c..0661927 100644 (file)
--- a/code/controls.py
+++ b/code/controls.py
@@ -47,12 +47,16 @@ def lvinstall(machine, autoinstall):
     memsize = machine.memory
     swapsize = getswap(disksize, memsize)
     imagesize = disksize - swapsize
-    ip = machine.nics[0].ip
-    remctl('control', machine.name, 'install', 
-           'dist=%s' % autoinstall.distribution,
-           'mirror=%s' % autoinstall.mirror,
-           'arch=%s' % autoinstall.arch,
-           'imagesize=%s' % imagesize)
+
+    installer_options = ['dist=%s' % autoinstall.distribution,
+                         'mirror=%s' % autoinstall.mirror,
+                         'arch=%s' % autoinstall.arch,
+                         'imagesize=%s' % imagesize]
+    if autoinstall.preseed:
+        installer_options += ['preseed=http://'+config.web.hostname+'/static/preseed/'+autoinstall.autoinstall_id+'.preseed']
+
+    remctl('control', machine.name, 'install',
+           *installer_options)
 
 def lvcopy(machine_orig_name, machine, rootpw):
     """Copy a golden image onto a machine's disk"""
@@ -73,6 +77,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))
@@ -93,17 +110,17 @@ def createVm(username, state, owner, contact, name, description, memory, disksiz
         machine.uuid = uuidToString(randomUUID())
         machine.boot_off_cd = True
         machine.type = machine_type
-        session.save_or_update(machine)
+        session.add(machine)
         disk = Disk(machine=machine,
-                    guest_device_name='hda', size=disksize)
-        nic = NIC.query().filter_by(machine_id=None).filter_by(reusable=True).first()
+                    guest_device_name='xvda', size=disksize)
+        nic = NIC.query.filter_by(machine_id=None).filter_by(reusable=True).first()
         if not nic: #No IPs left!
             raise CodeError("No IP addresses left!  "
-                            "Contact %s." % config.web.errormail)
+                            "Contact %s." % config.contact)
         nic.machine = machine
         nic.hostname = name
-        session.save_or_update(nic)
-        session.save_or_update(disk)
+        session.add(nic)
+        session.add(disk)
         cache_acls.refreshMachine(machine)
         makeDisks(machine)
         session.commit()
@@ -195,7 +212,7 @@ def deleteVM(machine):
         for nic in machine.nics:
             nic.machine_id = None
             nic.hostname = None
-            session.save_or_update(nic)
+            session.add(nic)
         for disk in machine.disks:
             session.delete(disk)
         session.delete(machine)
@@ -209,7 +226,7 @@ def commandResult(username, state, command_name, machine_id, fields):
     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():
+    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(" "):
         raise CodeError("Invalid action '%s'" % action)