long timeouts in FastCGI, so the autoinstaller can work

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

diff --git a/code/controls.py b/code/controls.py
index 63221a2..57107ef 100644 (file)
--- a/code/controls.py
+++ b/code/controls.py
@@ -97,7 +97,7 @@ def createVm(username, state, owner, contact, name, memory, disksize, machine_ty
     # put stuff in the table
     transaction = ctx.current.create_transaction()
     try:
     # put stuff in the table
     transaction = ctx.current.create_transaction()
     try:

-        validation.Validate(username, state, owner=owner, memory=memory, disksize=disksize/1024.)
+        validation.Validate(username, state, name=name, owner=owner, memory=memory, disksize=disksize/1024.)

         res = meta.engine.execute('select nextval('
                                   '\'"machines_machine_id_seq"\')')
         id = res.fetchone()[0]
         res = meta.engine.execute('select nextval('
                                   '\'"machines_machine_id_seq"\')')
         id = res.fetchone()[0]

@@ -196,8 +196,6 @@ def deleteVM(machine):
             ctx.current.save(nic)
         for disk in machine.disks:
             ctx.current.delete(disk)
             ctx.current.save(nic)
         for disk in machine.disks:
             ctx.current.delete(disk)

-        for access in machine.acl:
-            ctx.current.delete(access)

         ctx.current.delete(machine)
         transaction.commit()
     except:
         ctx.current.delete(machine)
         transaction.commit()
     except: