Skip to content

Iscsi #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
amol wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Iscsi #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
268854a
Created new iSCSI Manager
aparnapatil Mar 25, 2014
a53243a
Added 50% Unit tests
aparnapatil Mar 26, 2014
808af0d
Unit Tests
aparnapatil Mar 27, 2014
df978c2
Unit Tests
aparnapatil Mar 27, 2014
bac474c
Corrected PEP8 Errors
aparnapatil Mar 27, 2014
7744fa9
Corrected PEP8 Errors
aparnapatil Mar 27, 2014
cc7cf70
Corrected PEP8 Errors
aparnapatil Mar 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 35 additions & 53 deletions SoftLayer/CLI/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
sshkey Manage SSH keys on your account

Networking:
cdn Content Delivery Network service management
dns Domain Name System
firewall Firewall rule and security management
globalip Global IP address management
Expand All @@ -33,7 +32,6 @@

General:
config View and edit configuration for this tool
ticket Manage account tickets
summary Display an overall summary of your account
help Show help

Expand Down Expand Up @@ -66,25 +64,18 @@


class CommandParser(object):
""" Helper class to parse commands

:param env: Environment instance
"""
def __init__(self, env):
self.env = env

def get_main_help(self):
""" Get main help text """
return __doc__.strip()

def get_module_help(self, module_name):
""" Get help text for a module """
module = self.env.load_module(module_name)
arg_doc = module.__doc__
return arg_doc.strip()

def get_command_help(self, module_name, command_name):
""" Get help text for a specific command """
command = self.env.get_command(module_name, command_name)

default_format = 'raw'
Expand All @@ -102,18 +93,16 @@ def get_command_help(self, module_name, command_name):
if '[options]' in arg_doc:
arg_doc += """
Standard Options:
--format=ARG Output format. [Options: table, raw] [Default: %s]
-C FILE --config=FILE Config file location. [Default: ~/.softlayer]
--debug=LEVEL Specifies the debug noise level
--format=ARG Output format. [Options: table, raw] [Default: %s]
-C FILE --config=FILE Config file location. [Default: ~/.softlayer]
--debug=LEVEL Specifies the debug noise level
1=warn, 2=info, 3=debug
--timings Time each API call and display after results
--proxy=PROTO:PROXY_URL HTTP[s] proxy to be use to make API calls
-h --help Show this screen
--timings Time each API call and display after results
-h --help Show this screen
""" % default_format
return arg_doc.strip()

def parse_main_args(self, args):
""" Parse root arguments """
main_help = self.get_main_help()
arguments = docopt(
main_help,
Expand All @@ -124,7 +113,6 @@ def parse_main_args(self, args):
return arguments

def parse_module_args(self, module_name, args):
""" Parse module arguments """
arg_doc = self.get_module_help(module_name)
arguments = docopt(
arg_doc,
Expand All @@ -134,14 +122,12 @@ def parse_module_args(self, module_name, args):
return arguments

def parse_command_args(self, module_name, command_name, args):
""" Parse command arguments """
command = self.env.get_command(module_name, command_name)
arg_doc = self.get_command_help(module_name, command_name)
arguments = docopt(arg_doc, version=VERSION, argv=[module_name] + args)
return command, arguments

def parse(self, args):
""" Parse entire tree of arguments """
# handle `sl ...`
main_args = self.parse_main_args(args)
module_name = main_args['<module>']
Expand Down Expand Up @@ -173,18 +159,14 @@ def main(args=sys.argv[1:], env=Environment()):
debug_level = command_args.get('--debug')
if debug_level:
logger = logging.getLogger()
handler = logging.StreamHandler()
logger.addHandler(handler)
h = logging.StreamHandler()
logger.addHandler(h)
logger.setLevel(DEBUG_LOGGING_MAP.get(debug_level, logging.DEBUG))

kwargs = {
'proxy': command_args.get('--proxy'),
'config_file': command_args.get('--config')
}
if command_args.get('--timings'):
client = TimedClient(**kwargs)
client = TimedClient(config_file=command_args.get('--config'))
else:
client = Client(**kwargs)
client = Client(config_file=command_args.get('--config'))

# Do the thing
runnable = command(client=client, env=env)
Expand All @@ -193,56 +175,56 @@ def main(args=sys.argv[1:], env=Environment()):
out_format = command_args.get('--format', 'table')
if out_format not in VALID_FORMATS:
raise ArgumentError('Invalid format "%s"' % out_format)
output = format_output(data, fmt=out_format)
if output:
env.out(output)
s = format_output(data, fmt=out_format)
if s:
env.out(s)

if command_args.get('--timings'):
out_format = command_args.get('--format', 'table')
api_calls = client.get_last_calls()
timing_table = KeyValueTable(['call', 'time'])
t = KeyValueTable(['call', 'time'])

for call, _, duration in api_calls:
timing_table.add_row([call, duration])
t.add_row([call, duration])

env.err(format_output(timing_table, fmt=out_format))
env.err(format_output(t, fmt=out_format))

except InvalidCommand as ex:
env.err(resolver.get_module_help(ex.module_name))
if ex.command_name:
except InvalidCommand as e:
env.err(resolver.get_module_help(e.module_name))
if e.command_name:
env.err('')
env.err(str(ex))
env.err(str(e))
exit_status = 1
except InvalidModule as ex:
except InvalidModule as e:
env.err(resolver.get_main_help())
if ex.module_name:
if e.module_name:
env.err('')
env.err(str(ex))
env.err(str(e))
exit_status = 1
except DocoptExit as ex:
env.err(ex.usage)
except DocoptExit as e:
env.err(e.usage)
env.err(
'\nUnknown argument(s), use -h or --help for available options')
exit_status = 127
except KeyboardInterrupt:
env.out('')
exit_status = 1
except CLIAbort as ex:
env.err(str(ex.message))
exit_status = ex.code
except SystemExit as ex:
exit_status = ex.code
except SoftLayerAPIError as ex:
if 'invalid api token' in ex.faultString.lower():
except CLIAbort as e:
env.err(str(e.message))
exit_status = e.code
except SystemExit as e:
exit_status = e.code
except SoftLayerAPIError as e:
if 'invalid api token' in e.faultString.lower():
env.out("Authentication Failed: To update your credentials, use "
"'sl config setup'")
else:
env.err(str(ex))
env.err(str(e))
exit_status = 1
except SoftLayerError as ex:
env.err(str(ex))
except SoftLayerError as e:
env.err(str(e))
exit_status = 1
except Exception:
except Exception as e:
import traceback
env.err(traceback.format_exc())
exit_status = 1
Expand Down
3 changes: 0 additions & 3 deletions SoftLayer/CLI/exceptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,18 @@


class CLIHalt(SystemExit):
""" Smoothly halt the execution of the command. No error """
def __init__(self, code=0, *args):
super(CLIHalt, self).__init__(*args)
self.code = code


class CLIAbort(CLIHalt):
""" Halt the execution of the command. Gives an exit code of 2 """
def __init__(self, msg, *args):
super(CLIAbort, self).__init__(code=2, *args)
self.message = msg


class ArgumentError(CLIAbort):
""" Halt the execution of the command because of invalid arguments. """
def __init__(self, msg, *args):
super(ArgumentError, self).__init__(msg, *args)
self.message = "Argument Error: %s" % msg
Loading