projects
/
invirt/packages/invirt-web.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Another oversight in the web remctl code
[invirt/packages/invirt-web.git]
/
code
/
controls.py
diff --git
a/code/controls.py
b/code/controls.py
index
d895364
..
bb12a1a
100644
(file)
--- a/
code/controls.py
+++ b/
code/controls.py
@@
-24,9
+24,9
@@
def uuidToString(u):
# end stolen code
def remctl(*args, **kwargs):
# 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,
principal='daemon/'+config.web.hostname,
- **kwargs)
+ *args, **kwargs)
def lvcreate(machine, disk):
"""Create a single disk for a machine"""
def lvcreate(machine, disk):
"""Create a single disk for a machine"""
@@
-171,6
+171,13
@@
def listHost(machine):
return None
return out.strip()
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)
def deleteVM(machine):
"""Delete a VM."""
remctl('control', machine.name, 'destroy', err=True)