Boot VMs as HVM when there is a boot CD, regardless of machine type

[invirt/packages/invirt-database.git] / client / etc / xen / sipb-database

diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database
index 0c30eff..1928bba 100644 (file)
--- a/client/etc/xen/sipb-database
+++ b/client/etc/xen/sipb-database
@@ -1,16 +1,32 @@
 # -*- mode: python; -*-
 import sipb_xen_database.models as models
 from sipb_xen_database import connect
 # -*- mode: python; -*-
 import sipb_xen_database.models as models
 from sipb_xen_database import connect

+import re
+import tempfile
+from subprocess import call

 
 connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
 
 connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')

-# `machine_name' should get passed in from the xm create call
+prefix = "d_"
+
+# 'machine_name', and optionally 'cdrom_image', should get passed in
+# from the xm create call
+
+def check(b):
+    if not b:
+        import sys
+        sys.exit(1)

 
 machine = models.Machine.get_by(name=machine_name)
 
 machine = models.Machine.get_by(name=machine_name)

-machine_type = models.Type.get_by(type_id=machine.type_id)
+check(machine is not None)
+hvm = machine.type.hvm
+if 'cdrom_image' in locals():
+    hvm = True

 
 memory = machine.memory
 maxmem = memory
 
 memory = machine.memory
 maxmem = memory

-name = machine.name
+check(re.match('^[A-Za-z0-9][A-Za-z0-9._-]*$', machine.name))
+name = prefix + machine.name
+check(re.match('^[0-9a-f-]+$', machine.uuid))

 uuid = machine.uuid
 
 vcpus = machine.cpus
 uuid = machine.uuid
 
 vcpus = machine.cpus

@@ -18,7 +34,7 @@ vcpus = machine.cpus
 diskioemu = ""
 viftype = ""
 
 diskioemu = ""
 viftype = ""
 

-if machine_type.hvm:
+if hvm:

     ioemu = "ioemu:"
     viftype = "type=ioemu, "
 
     ioemu = "ioemu:"
     viftype = "type=ioemu, "
 

@@ -27,32 +43,52 @@ if machine_type.hvm:
     vnc = 1
     vncpasswd = 'moocow'
     device_model = '/usr/sbin/qemu-dm-sipb'
     vnc = 1
     vncpasswd = 'moocow'
     device_model = '/usr/sbin/qemu-dm-sipb'

+    serial = 'pty'

 else:
 else:

-    kernel  = '/boot/vmlinuz-2.6.18-4-xen-amd64'
-    ramdisk = '/boot/initrd.img-2.6.18-4-xen-amd64'
+    kernel  = '/boot/vmlinuz-2.6.18-5-xen-amd64'
+    ramdisk = '/boot/initrd.img-2.6.18-5-xen-amd64'

     builder = 'linux'
 
     builder = 'linux'
 

-pae = machine_type.pae
-acpi = machine_type.acpi
-apic = machine_type.apic
+pae = machine.type.pae
+acpi = machine.type.acpi
+apic = machine.type.apic

 
 vif = []
 
 for n in machine.nics:
 
 vif = []
 
 for n in machine.nics:

+    check(re.match('^[0-9a-fA-F:]+$', n.mac_addr) and re.match('^[0-9.]*$', n.ip))

     d = '%smac=%s, ip=%s, bridge=xenbr0, script=vif-sipbroute' % (viftype, n.mac_addr, n.ip)
     vif.append(d)
 
 disk = []
 
 for d in machine.disks:
     d = '%smac=%s, ip=%s, bridge=xenbr0, script=vif-sipbroute' % (viftype, n.mac_addr, n.ip)
     vif.append(d)
 
 disk = []
 
 for d in machine.disks:

-    device = '/dev/xenvg/' + machine.name + '_' + d.guest_device_name
+    check(re.match('^[A-Za-z0-9]+$', d.guest_device_name))
+    device = '/dev/xenvg/' + prefix + machine.name + '_' + d.guest_device_name

     dspec = 'phy:%s,%s%s,w' % (device, diskioemu, d.guest_device_name)
     disk.append(dspec)
 
     dspec = 'phy:%s,%s%s,w' % (device, diskioemu, d.guest_device_name)
     disk.append(dspec)
 

-restart = 'destroy'
-if machine.autorestart:
-    restart = 'restart'
+if 'installer' in locals():
+    check(re.match('^[A-Za-z0-9][A-Za-z0-9_.-]*$', installer))
+    tmptree = tempfile.mkdtemp('', 'auto-install.', '/tmp')
+    call(['/usr/sbin/sipb-xen-make-iso', installer, tmptree]
+         + installer_options.split(' '))
+    disk.append('file:'+tmptree+'/install.iso,hdc:cdrom,r')
+    boot = 'd'
+
+elif 'disks' in locals(): # for the copying installer's use
+    disk = disks.split(' ')
+    boot = 'c'
+
+elif 'cdrom_image' in locals():
+    check(re.match('^[A-Za-z0-9][A-Za-z0-9_.-]*$', cdrom_image))
+    disk.append('file:/srv/images/' + cdrom_image + '.iso,hdc:cdrom,r')
+    boot = 'd'
+
+usbdevice = 'tablet'

 
 on_poweroff = 'destroy'
 on_reboot = 'restart'
 
 on_poweroff = 'destroy'
 on_reboot = 'restart'

-on_crash = restart
+on_crash = 'destroy'
+if machine.autorestart:
+    on_crash = 'restart'