Fix machine UUID assignment after SQLAlchemy started returning Unicode objects.

[invirt/packages/invirt-xen-config.git] / invirt-database

diff --git a/invirt-database b/invirt-database
index 9350316..b99b548 100644 (file)
--- a/invirt-database
+++ b/invirt-database
@@ -31,7 +31,7 @@ else:
 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))
 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
+uuid = str(machine.uuid)

 
 vcpus = machine.cpus
 
 
 vcpus = machine.cpus
 

@@ -107,10 +107,9 @@ elif cdrom is not None:
     codepath = 'hvm'
 
 if codepath == 'hvm':
     codepath = 'hvm'
 
 if codepath == 'hvm':

-    # Disable PVHVM for now until we figure out the best way to do this
-    xen_platform_pci = 0
+    xen_platform_pci = 1

     ioemu = "ioemu:"
     ioemu = "ioemu:"

-    viftype = "type=ioemu,model=pcnet, "
+    viftype = "model=pcnet, "

     kernel = '/usr/lib/xen-4.1/boot/hvmloader'
     builder = 'hvm'
     vnc = 1
     kernel = '/usr/lib/xen-4.1/boot/hvmloader'
     builder = 'hvm'
     vnc = 1

@@ -122,6 +121,8 @@ elif codepath == 'paravm':
 
 for n in machine.nics:
     check(re.match('^[0-9a-fA-F:]+$', n.mac_addr) and re.match('^[0-9.]*$', n.ip))
 
 for n in machine.nics:
     check(re.match('^[0-9a-fA-F:]+$', n.mac_addr) and re.match('^[0-9.]*$', n.ip))

+    if n.nic_type:
+        viftype = viftype.replace("pcnet", n.nic_type)

     d = ('%smac=%s, ip=%s, script=vif-invirtroute netdev=%s'
          % (viftype, n.mac_addr, n.ip, config.xen.iface))
     vif.append(d)
     d = ('%smac=%s, ip=%s, script=vif-invirtroute netdev=%s'
          % (viftype, n.mac_addr, n.ip, config.xen.iface))
     vif.append(d)