From 0a2655ecb6aa6df02014d7ab30b43dd5b615a31a Mon Sep 17 00:00:00 2001 From: Anthony Young Date: Thu, 23 Dec 2010 00:40:41 -0800 Subject: move euca-get-ajax-console up one directory --- tools/euca-get-ajax-console | 95 +++++++++++++++++++++++++++++ tools/euca_additions/euca-get-ajax-console | 96 ------------------------------ 2 files changed, 95 insertions(+), 96 deletions(-) create mode 100755 tools/euca-get-ajax-console delete mode 100755 tools/euca_additions/euca-get-ajax-console diff --git a/tools/euca-get-ajax-console b/tools/euca-get-ajax-console new file mode 100755 index 000000000..49e7c378f --- /dev/null +++ b/tools/euca-get-ajax-console @@ -0,0 +1,95 @@ +#!/usr/bin/env python + +import getopt +import os +import sys + +# If ../nova/__init__.py exists, add ../ to Python search path, so that +# it will override what happens to be installed in /usr/(local/)lib/python... +possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), + os.pardir, + os.pardir)) +if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): + sys.path.insert(0, possible_topdir) + +import nova +from euca2ools import Euca2ool, InstanceValidationError, Util, ConnectionFailed +from nova.boto_extensions import * + +usage_string = """ +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. + +OPTIONAL PARAMETERS + +""" + + +def usage(status=1): + print usage_string + 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() + except Exception, 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 + + + if instance_id: + try: + euca.validate_instance_id(instance_id) + except InstanceValidationError: + print 'Invalid instance id' + sys.exit(1) + + try: + euca_conn = euca.make_connection() + except ConnectionFailed, e: + print e.message + sys.exit(1) + 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) + else: + print 'instance_id must be specified' + usage() +if __name__ == "__main__": + main() + diff --git a/tools/euca_additions/euca-get-ajax-console b/tools/euca_additions/euca-get-ajax-console deleted file mode 100755 index 608726a5b..000000000 --- a/tools/euca_additions/euca-get-ajax-console +++ /dev/null @@ -1,96 +0,0 @@ -#!/usr/bin/env python - -import getopt -import os -import sys - -# If ../nova/__init__.py exists, add ../ to Python search path, so that -# it will override what happens to be installed in /usr/(local/)lib/python... -possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]), - os.pardir, - os.pardir)) -if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): - sys.path.insert(0, possible_topdir) - -sys.path.insert(0, "/root/anso/nova") -import nova -from euca2ools import Euca2ool, InstanceValidationError, Util, ConnectionFailed -from nova.boto_extensions import * - -usage_string = """ -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. - -OPTIONAL PARAMETERS - -""" - - -def usage(status=1): - print usage_string - 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() - except Exception, 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 - - - if instance_id: - try: - euca.validate_instance_id(instance_id) - except InstanceValidationError: - print 'Invalid instance id' - sys.exit(1) - - try: - euca_conn = euca.make_connection() - except ConnectionFailed, e: - print e.message - sys.exit(1) - 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) - else: - print 'instance_id must be specified' - usage() -if __name__ == "__main__": - main() - -- cgit