Changeset 1615 for trunk/packages/invirt-web/code/main.py

Timestamp:

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

Author:

broder

Message:

Pull the vnctoken remctl into the controls module

File:

• trunk/packages/invirt-web/code/main.py (modified) (2 diffs)

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: