X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/f9904f2409d8fdc314676c624a414c27170c1551..eabe84bd3f3ea514893ec700d598a06c2418f37e:/code/controls.py?ds=inline

diff --git a/code/controls.py b/code/controls.py
index 6346002..09367e2 100644
--- a/code/controls.py
+++ b/code/controls.py
@@ -113,7 +113,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).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!  "
                             "Contact %s." % config.contact)
@@ -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
-    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)