def parseCreate(username, state, fields):
kws = dict([(kw, fields.getfirst(kw)) for kw in 'name owner memory disksize vmtype cdrom clone_from'.split()])
- validate = validation.Validate(username, state, **kws)
+ validate = validation.Validate(username, state, strict=True, **kws)
return dict(contact=username, name=validate.name, memory=validate.memory,
disksize=validate.disksize, owner=validate.owner, machine_type=validate.vmtype,
cdrom=getattr(validate, 'cdrom', None),
"""Handler for create requests."""
try:
parsed_fields = parseCreate(username, state, fields)
- machine = controls.createVm(username, **parsed_fields)
+ machine = controls.createVm(username, state, **parsed_fields)
except InvalidInput, err:
pass
else:
err = None
state.clear() #Changed global state
- d = getListDict(username)
+ d = getListDict(username, state)
d['err'] = err
if err:
for field in fields.keys():
return templates.command(searchList=[d])
if back == 'list':
state.clear() #Changed global state
- d = getListDict(username)
+ d = getListDict(username, state)
d['result'] = result
return templates.list(searchList=[d])
elif back == 'info':
kws = dict([(kw, fields.getfirst(kw)) for kw in 'machine_id owner admin contact name memory vmtype disksize'.split()])
validate = validation.Validate(username, state, **kws)
machine = validate.machine
- print >> sys.stderr, machine, machine.administrator, kws['admin']
oldname = machine.name
if hasattr(validate, 'memory'):