Changeset 1615 for trunk

Timestamp:

Nov 11, 2008, 4:32:18 AM (16 years ago)

Author:

broder

Message:

Pull the vnctoken remctl into the controls module

Location:

trunk/packages/invirt-web/code

Files:

• controls.py (modified) (1 diff)
• main.py (modified) (2 diffs)

trunk/packages/invirt-web/code/controls.py

@@ -168 +168 @@
     """Return the host a machine is running on"""
     out, err = remctl('control', machine.name, 'listhost', err=True)
+    if err:
+        return None
+    return out.strip()
+
+def vnctoken(machine):
+    """Return a time-stamped VNC token"""
+    out, err = remctl('control', machine.name, 'vnctoken')
     if err:
         return None

trunk/packages/invirt-web/code/main.py

@@ -44 +44 @@
 from invirt.config import structs as config
 from invirt.common import InvalidInput, CodeError
-from invirt.remctl import remctl
 
 def pathSplit(path):
@@ -248 +247 @@
     machine = validation.Validate(username, state, machine_id=fields.getfirst('machine_id')).machine
 
-    token = controls.remctl('control', machine.name, 'vnctoken').strip()
+    token = control.vnctoken(machine)
     host = controls.listHost(machine)
     if host: