X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/d1f005abfe2c33a368260ab73566906f95f83dab..c5de4def3ee8581b5fdafe9bc34f1520e4bc8252:/code/main.py diff --git a/code/main.py b/code/main.py index 2e95361..e119e0e 100755 --- a/code/main.py +++ b/code/main.py @@ -12,7 +12,7 @@ import simplejson import sys import time import urllib -import os +import socket from StringIO import StringIO def revertStandardError(): @@ -151,7 +151,7 @@ def parseCreate(username, state, fields): kws = dict([(kw, fields.getfirst(kw)) for kw in 'name description owner memory disksize vmtype cdrom autoinstall'.split()]) validate = validation.Validate(username, state, strict=True, **kws) return dict(contact=username, name=validate.name, description=validate.description, memory=validate.memory, - disksize=validate.disksize, owner=validate.owner, machine_type=validate.vmtype, + disksize=validate.disksize, owner=validate.owner, machine_type=getattr(validate, 'vmtype', Defaults.type), cdrom=getattr(validate, 'cdrom', None), autoinstall=getattr(validate, 'autoinstall', None))