X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/751aa520781a12c35b65b6f5f1b485f2548b7e3e..db3da6812e1c7d7855a2e53c0e3d153e84dcff79:/code/controls.py diff --git a/code/controls.py b/code/controls.py index 57107ef..622dd50 100644 --- a/code/controls.py +++ b/code/controls.py @@ -92,18 +92,19 @@ def bootMachine(machine, cdtype): raise CodeError('"%s" on "control %s create %s' % (err, machine.name, cdtype)) -def createVm(username, state, owner, contact, name, memory, disksize, machine_type, cdrom, clone_from): +def createVm(username, state, owner, contact, name, description, memory, disksize, machine_type, cdrom, clone_from): """Create a VM and put it in the database""" # put stuff in the table transaction = ctx.current.create_transaction() try: - validation.Validate(username, state, name=name, owner=owner, memory=memory, disksize=disksize/1024.) + validation.Validate(username, state, name=name, description=description, owner=owner, memory=memory, disksize=disksize/1024.) res = meta.engine.execute('select nextval(' '\'"machines_machine_id_seq"\')') id = res.fetchone()[0] machine = Machine() machine.machine_id = id machine.name = name + machine.description = description machine.memory = memory machine.owner = owner machine.administrator = owner