sqlalchemy fixes to get web to display

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

diff --git a/code/controls.py b/code/controls.py
index faa27a7..a5f1693 100644 (file)
--- a/code/controls.py
+++ b/code/controls.py
@@ -53,7 +53,7 @@ def lvinstall(machine, autoinstall):
                          'arch=%s' % autoinstall.arch,
                          'imagesize=%s' % imagesize]
     if autoinstall.preseed:
                          'arch=%s' % autoinstall.arch,
                          'imagesize=%s' % imagesize]
     if autoinstall.preseed:

-        installer_options += ['preseed=http://'+config.web.hostname+'/static/preseed/'+autoinstall.distribution+'/'+autoinstall.arch+'.preseed']
+        installer_options += ['preseed=http://'+config.web.hostname+'/static/preseed/'+autoinstall.autoinstall_id+'.preseed']

 
     remctl('control', machine.name, 'install',
            *installer_options)
 
     remctl('control', machine.name, 'install',
            *installer_options)

@@ -110,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
         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)
         disk = Disk(machine=machine,
                     guest_device_name='hda', size=disksize)

-        nic = NIC.query().filter_by(machine_id=None).filter_by(reusable=True).first()
+        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!  "
         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
         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()
         cache_acls.refreshMachine(machine)
         makeDisks(machine)
         session.commit()

@@ -212,7 +212,7 @@ def deleteVM(machine):
         for nic in machine.nics:
             nic.machine_id = None
             nic.hostname = None
         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)
         for disk in machine.disks:
             session.delete(disk)
         session.delete(machine)

@@ -226,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
     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)
         raise CodeError("Invalid cdrom type '%s'" % cdrom)    
     if action not in "reboot create destroy shutdown delete".split(" "):
         raise CodeError("Invalid action '%s'" % action)