import time
import re
import cache_acls
+import yaml
# ... and stolen from xend/uuid.py
def randomUUID():
machine.boot_off_cd = True
machine.type_id = machine_type.type_id
ctx.current.save(machine)
- disk = Disk(machine_id=machine.machine_id,
+ disk = Disk(machine_id=machine.machine_id,
guest_device_name='hda', size=disk_size)
open_nics = NIC.select_by(machine_id=None)
if not open_nics: #No IPs left!
raise CodeError("No IP addresses left! "
- "Contact sipb-xen@mit.edu.")
+ "Contact xvm@mit.edu.")
nic = open_nics[0]
nic.machine_id = machine.machine_id
nic.hostname = name
- ctx.current.save(nic)
+ ctx.current.save(nic)
ctx.current.save(disk)
cache_acls.refreshMachine(machine)
transaction.commit()
bootMachine(machine, cdrom)
return machine
-def getUptimes(machines=None):
- """Return a dictionary mapping machine names to uptime strings"""
+def getList():
+ """Return a dictionary mapping machine names to dicts."""
value_string = remctl('web', 'listvms')
- lines = value_string.splitlines()
- d = {}
- for line in lines:
- lst = line.split()
- name, id = lst[:2]
- uptime = ' '.join(lst[2:])
- d[name] = uptime
- ans = {}
- for m in machines:
- ans[m] = d.get(m.name)
- return ans
+ value_dict = yaml.load(value_string, yaml.CSafeLoader)
+ return value_dict
def parseStatus(s):
"""Parse a status string into nested tuples of strings.