X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/1acdba7805c9af8696244e6a5c44c931afa0cc07..29d4c7b59532a39298e21f0abbc774dcff546b73:/code/controls.py

diff --git a/code/controls.py b/code/controls.py
index d895364..bb12a1a 100644
--- a/code/controls.py
+++ b/code/controls.py
@@ -24,9 +24,9 @@ def uuidToString(u):
 # end stolen code
 
 def remctl(*args, **kwargs):
-    return gen_remctl(config.remote.hostname, *args,
+    return gen_remctl(config.remote.hostname,
                       principal='daemon/'+config.web.hostname,
-                      **kwargs)
+                      *args, **kwargs)
 
 def lvcreate(machine, disk):
     """Create a single disk for a machine"""
@@ -171,6 +171,13 @@ def listHost(machine):
         return None
     return out.strip()
 
+def vnctoken(machine):
+    """Return a time-stamped VNC token"""
+    out, err = remctl('control', machine.name, 'vnctoken', err=True)
+    if err:
+        return None
+    return out.strip()
+
 def deleteVM(machine):
     """Delete a VM."""
     remctl('control', machine.name, 'destroy', err=True)