sqlalchemy api fixups

diff --git a/debian/changelog b/debian/changelog
index 0dff448..c372036 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-remote (0.4.15~glasgall1) precise; urgency=low
+
+  * SQLAlchemy API fixups.
+
+ -- Adam Glasgall <glasgall@mit.edu>  Fri, 19 Apr 2013 18:17:44 -0400
+

 invirt-remote (0.4.14) unstable; urgency=low
 
   * Port packaging to dh_python2.
 invirt-remote (0.4.14) unstable; urgency=low
 
   * Port packaging to dh_python2.

diff --git a/server/usr/sbin/invirt-remote-create b/server/usr/sbin/invirt-remote-create
index 9f5817a..25a1120 100755 (executable)
--- a/server/usr/sbin/invirt-remote-create
+++ b/server/usr/sbin/invirt-remote-create
@@ -18,7 +18,7 @@ def maxMemory(owner, xmlist):
     """
     Return the memory available for a new machine.
     """
     """
     Return the memory available for a new machine.
     """

-    machines = invirt.database.Machine.query().filter_by(owner=owner)
+    machines = invirt.database.Machine.query.filter_by(owner=owner)

     (quota_total, quota_single) = invirt.database.Owner.getMemoryQuotas(owner)
 
     active_machines = [m for m in machines if m.name in xmlist]
     (quota_total, quota_single) = invirt.database.Owner.getMemoryQuotas(owner)
 
     active_machines = [m for m in machines if m.name in xmlist]

@@ -64,7 +64,7 @@ def main(argv):
         return 1
 
     if operation == "create":
         return 1
 
     if operation == "create":

-        machine = invirt.database.Machine.query().filter_by(name=machine_name).first()
+        machine = invirt.database.Machine.query.filter_by(name=machine_name).first()

 
         owner = machine.owner
         vm_memory = machine.memory
 
         owner = machine.owner
         vm_memory = machine.memory

diff --git a/server/usr/sbin/invirt-remote-listuser b/server/usr/sbin/invirt-remote-listuser
index 38bd744..edcfe23 100755 (executable)
--- a/server/usr/sbin/invirt-remote-listuser
+++ b/server/usr/sbin/invirt-remote-listuser
@@ -17,7 +17,7 @@ def main(argv):
 
     database.connect()
     output = {}
 
     database.connect()
     output = {}

-    for m in database.Machine.query().join('acl').filter_by(user=username):
+    for m in database.Machine.query.join('acl').filter_by(user=username):

         output[m.name] = dict(owner=m.owner, contact=m.contact)
 
     print yaml.dump(output, Dumper=yaml.CSafeDumper, default_flow_style=False)
         output[m.name] = dict(owner=m.owner, contact=m.contact)
 
     print yaml.dump(output, Dumper=yaml.CSafeDumper, default_flow_style=False)