X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/36c143099b46d2bf77569d4f1d660505ed9d37d6..58ca9122cce463bcd75474944b1b353e355f729d:/code/main.py diff --git a/code/main.py b/code/main.py index c4eff65..a494046 100755 --- a/code/main.py +++ b/code/main.py @@ -230,7 +230,7 @@ console will suffer artifacts. d['err'] = err if err: for field, value in fields.items(): - setattr(d['defaults'], field, value)) + setattr(d['defaults'], field, value) else: d['new_machine'] = parsed_fields['name'] return d @@ -254,8 +254,7 @@ console will suffer artifacts. def __getattr__(self, name): try: - machine_id = int(name) - cherrypy.request.params['machine_id'] = machine_id + cherrypy.request.params['machine_id'] = int(name) return self except ValueError: return None @@ -341,12 +340,13 @@ console will suffer artifacts. port=port, authtoken=token) return d + @cherrypy.expose @cherrypy.tools.mako(filename="/command.mako") @cherrypy.tools.require_POST() def command(self, command_name, machine_id, **kwargs): """Handler for running commands like boot and delete on a VM.""" - back = kwargs.get('back', None) + back = kwargs.get('back') try: d = controls.commandResult(cherrypy.request.login, cherrypy.request.state, @@ -683,4 +683,4 @@ Subject: %s p.stdin.close() p.wait() -random.seed() +random.seed() #sigh