Changeset 2516 for trunk/packages/invirt-remote

Timestamp:

Oct 29, 2009, 12:52:59 AM (14 years ago)

Author:

price

Message:

Style fixes in, and Debian changelog for, list and listuser.

Location:

trunk/packages/invirt-remote

Files:

• debian/changelog (modified) (1 diff)
• server/usr/sbin/invirt-remote-list (modified) (3 diffs)
• server/usr/sbin/invirt-remote-listuser (modified) (2 diffs)

trunk/packages/invirt-remote/debian/changelog

@@ +1 @@
+invirt-remote (0.4.4) unstable; urgency=low
+
+  [Paul Weaver]
+  * Add methods "listuser", "list" to list the VMs belonging to a
+    specified user or the requesting user.
+
+ -- Greg Price <price@mit.edu>  Thu, 29 Oct 2009 00:51:58 -0400
+
 invirt-remote (0.4.3) unstable; urgency=low
 

trunk/packages/invirt-remote/server/usr/sbin/invirt-remote-list

@@ -1 +1 @@
 #!/usr/bin/python
 """
-Returns a user's list of vm's
+Lists the VMs belonging to the remote user.
 """
 
@@ -7 +7 @@
 import sys
 import os
-import yaml
+
 
 def main(argv):
     if len(argv) < 1:
-        print >>sys.stderr, "usage: invirt-remote-list "
+        print >>sys.stderr, "usage: invirt-remote-list"
         return 2
-    username = os.environ['REMUSER'].rsplit('@ATHENA.MIT.EDU')[0]
+
+    username = os.environ['REMOTE_USER'].rsplit('@ATHENA.MIT.EDU')[0]
     p = Popen(['/usr/sbin/invirt-remote-listuser', username], stdout=PIPE)
     output = p.communicate()[0]
@@ -20 +21 @@
     return p.returncode
 
+
 if __name__ == '__main__':
     sys.exit(main(sys.argv))
-
-# vim:et:sw=4:ts=4

trunk/packages/invirt-remote/server/usr/sbin/invirt-remote-listuser

@@ -1 +1 @@
 #!/usr/bin/python
 """
-Lists what a user's VM's are
+Lists the VMs belonging to a given user.
 """
 
-from subprocess import PIPE, Popen, call
 import sys
 import yaml
 
 from invirt import database
-from invirt.database import Machine, MachineAccess
 
 
@@ -19 +17 @@
 
     database.connect()
-    machines = Machine.query().join('acl').filter_by(user=username)
     output = {}
-    for m in machines:
-        
-        data = {}
-        data['owner']=m.owner
-        data['contact'] = m.contact
-        output[m.name] = data
+    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)
     return 0
+
+
 if __name__ == '__main__':
     sys.exit(main(sys.argv))
-
-# vim:et:sw=4:ts=4