Fix a typo in sipb-database's CDROM image path

[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 164cef0..568a68f 100644 (file)
--- a/client/etc/xen/sipb-database
+++ b/client/etc/xen/sipb-database
@@ -1,9 +1,12 @@
 # -*- mode: python; -*-
-import sipb_xen_database.models as models
-from sipb_xen_database import connect
+from invirt.database import models, connect
+from invirt.config import structs as config
 import re
+import tempfile
+from subprocess import call
 
-connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
+connect()
+prefix = "d_"
 
 # 'machine_name', and optionally 'cdrom_image', should get passed in
 # from the xm create call
@@ -13,14 +16,18 @@ def check(b):
         import sys
         sys.exit(1)
 
-machine = models.Machine.get_by(name=machine_name)
+machine = models.Machine.query().filter_by(name=machine_name).one()
 check(machine is not None)
-machine_type = models.Type.get_by(type_id=machine.type_id)
+machine_type = machine.type
+cdrom = None
+if 'cdrom_image' in locals():
+    cdrom = models.CDROM.query().filter_by(cdrom_id=cdrom_image).one()
+    check(cdrom is not None)
 
 memory = machine.memory
 maxmem = memory
 check(re.match('^[A-Za-z0-9][A-Za-z0-9._-]*$', machine.name))
-name = machine.name
+name = prefix + machine.name
 check(re.match('^[0-9a-f-]+$', machine.uuid))
 uuid = machine.uuid
 
@@ -29,43 +36,64 @@ vcpus = machine.cpus
 diskioemu = ""
 viftype = ""
 
+pae = machine_type.pae
+acpi = machine_type.acpi
+apic = machine_type.apic
+
+vif = []
+
+disk = []
+
 if machine_type.hvm:
+    codepath = 'hvm'
+else:
+    codepath = 'paravm'
+
+if 'installer_options' in locals(): #Installer
+    disk.append('phy:/dev/xenvg/s_install_hda,hdb,r')
+
+    kernel = '/boot/vmlinuz-2.6.24-19-xen' #From hardy
+    ramdisk = '/boot/initrd.img-2.6.24-19-xen'
+
+    if not machine.nics:
+        raise RuntimeError('You must have a nic to autoinstall')
+    n = machine.nics[0]
+    extra = 'ro noresume'
+    extra += (' ip=%s::%s:%s:%s:eth0:off'
+         % (n.ip, config.dhcp.gateway, config.dhcp.netmask, machine.name))
+    extra += ' %s' % installer_options
+    root = '/dev/hdb1'
+    codepath = None
+elif cdrom is not None:
+    disk.append('phy:/dev/xenvg/image_' + cdrom.cdrom_id + ',hdc:cdrom,r')
+    boot = 'd'
+    codepath = 'hvm'
+
+if codepath == 'hvm':
     ioemu = "ioemu:"
     viftype = "type=ioemu, "
-
-    kernel = 'hvmloader'
+    kernel = '/usr/lib/xen/boot/hvmloader'
     builder = 'hvm'
     vnc = 1
     vncpasswd = 'moocow'
     device_model = '/usr/sbin/qemu-dm-sipb'
-else:
-    kernel  = '/boot/vmlinuz-2.6.18-4-xen-amd64'
-    ramdisk = '/boot/initrd.img-2.6.18-4-xen-amd64'
-    builder = 'linux'
+    serial = "pty"
+elif codepath == 'paravm':
+    bootloader = '/usr/bin/pygrub'
 
-pae = machine_type.pae
-acpi = machine_type.acpi
-apic = machine_type.apic
-
-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:
     check(re.match('^[A-Za-z0-9]+$', d.guest_device_name))
-    device = '/dev/xenvg/' + machine.name + '_' + 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)
 
-if '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'