Port vnc page to Mako and CherryPy

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

diff --git a/code/controls.py b/code/controls.py
index 4cd0e9c..e32b1c2 100644 (file)
--- a/code/controls.py
+++ b/code/controls.py
@@ -96,7 +96,7 @@ def createVm(username, state, owner, contact, name, description, memory, disksiz
         session.save_or_update(machine)
         disk = Disk(machine=machine,
                     guest_device_name='hda', size=disksize)
-        nic = NIC.query().filter_by(machine_id=None).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!  "
                             "Contact %s." % config.web.errormail)
@@ -105,11 +105,11 @@ def createVm(username, state, owner, contact, name, description, memory, disksiz
         session.save_or_update(nic)
         session.save_or_update(disk)
         cache_acls.refreshMachine(machine)
+        makeDisks(machine)
         session.commit()
     except:
         session.rollback()
         raise
-    makeDisks(machine)
     try:
         if autoinstall:
             lvinstall(machine, autoinstall)