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
Switch to using YAML on the web interface for listvms
[invirt/packages/invirt-web.git]
/
code
/
controls.py
diff --git
a/code/controls.py
b/code/controls.py
index
841d21b
..
79aa311
100644
(file)
--- a/
code/controls.py
+++ b/
code/controls.py
@@
-11,7
+11,7
@@
import sys
import time
import re
import cache_acls
import time
import re
import cache_acls
-import cPickle
+import yaml
# ... and stolen from xend/uuid.py
def randomUUID():
# ... and stolen from xend/uuid.py
def randomUUID():
@@
-139,8
+139,8
@@
def createVm(owner, contact, name, memory, disk_size, machine_type, cdrom, clone
def getList(machines):
"""Return a dictionary mapping machine to dicts."""
def getList(machines):
"""Return a dictionary mapping machine to dicts."""
- value_string = remctl('web', 'listvms', '--pickle')
- value_dict = cPickle.loads(value_string)
+ value_string = remctl('web', 'listvms')
+ value_dict = yaml.safe_load(value_string)
d = dict((m, value_dict[m.name]) for m in machines if m.name in value_dict)
return d
d = dict((m, value_dict[m.name]) for m in machines if m.name in value_dict)
return d