Update /etc/xen/sipb-database to work with newer SQLAlchemy and Xen

[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 d6c8b3c..70eed41 100644 (file)
--- a/client/etc/xen/sipb-database
+++ b/client/etc/xen/sipb-database
@@ -16,9 +16,9 @@ def check(b):
         import sys
         sys.exit(1)
 
         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)
 check(machine is not None)

-machine_type = models.Type.get_by(type_id=machine.type_id)
+machine_type = models.Type.query().filter_by(type_id=machine.type_id).one()

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

@@ -72,7 +72,7 @@ elif 'cdrom_image' in locals():
 if codepath == 'hvm':
     ioemu = "ioemu:"
     viftype = "type=ioemu, "
 if codepath == 'hvm':
     ioemu = "ioemu:"
     viftype = "type=ioemu, "

-    kernel = 'hvmloader'
+    kernel = '/usr/lib/xen/boot/hvmloader'

     builder = 'hvm'
     vnc = 1
     vncpasswd = 'moocow'
     builder = 'hvm'
     vnc = 1
     vncpasswd = 'moocow'