From e4c1fa91e0245dc6f673c5ac8880a99bd3d0dea1 Mon Sep 17 00:00:00 2001 From: Anthony Young Date: Thu, 23 Dec 2010 01:32:15 -0800 Subject: better bin name, and pep8 --- tools/euca-get-ajax-console | 47 ++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 22 deletions(-) (limited to 'tools') diff --git a/tools/euca-get-ajax-console b/tools/euca-get-ajax-console index 92996397e..8e45eeed0 100755 --- a/tools/euca-get-ajax-console +++ b/tools/euca-get-ajax-console @@ -42,8 +42,8 @@ Retrieves a url to an ajax console terminal euca-get-ajax-console [-h, --help] [--version] [--debug] instance_id REQUIRED PARAMETERS - -instance_id unique identifier for the instance show the console output for. + +instance_id: unique identifier for the instance show the console output for. OPTIONAL PARAMETERS @@ -55,45 +55,48 @@ def usage(status=1): Util().usage() sys.exit(status) + def version(): print Util().version() sys.exit() + def display_console_output(console_output): print console_output.instance_id print console_output.timestamp print console_output.output + def display_ajax_console_output(console_output): print console_output.url - + + def main(): try: - euca = Euca2ool() + euca = Euca2ool() except Exception, e: - print e + print e usage() - + instance_id = None for name, value in euca.opts: if name in ('-h', '--help'): usage(0) - elif name == '--version': - version() - elif name == '--debug': - debug = True - - for arg in euca.args: - instance_id = arg - break + elif name == '--version': + version() + elif name == '--debug': + debug = True + for arg in euca.args: + instance_id = arg + break if instance_id: try: - euca.validate_instance_id(instance_id) + euca.validate_instance_id(instance_id) except InstanceValidationError: - print 'Invalid instance id' + print 'Invalid instance id' sys.exit(1) try: @@ -101,15 +104,15 @@ def main(): except ConnectionFailed, e: print e.message sys.exit(1) - try: - console_output = euca_conn.get_ajax_console(instance_id) + try: + console_output = euca_conn.get_ajax_console(instance_id) except Exception, ex: euca.display_error_and_exit('%s' % ex) - display_ajax_console_output(console_output) + display_ajax_console_output(console_output) else: - print 'instance_id must be specified' - usage() + print 'instance_id must be specified' + usage() + if __name__ == "__main__": main() - -- cgit