cleanup and ran autopep8 which added a few new lines here and there

Author: allmightyspiff

.pytest_cache/v/cache/lastfailed

@@ -0,0 +1,5 @@
+{
+  "tests/CLI/modules/block_tests.py::BlockTests::test_volume_order_performance_iops_not_multiple_of_100": true,
+  "tests/CLI/modules/file_tests.py::FileTests::test_volume_order_performance_iops_not_multiple_of_100": true,
+  "tests/managers/ordering_tests.py::OrderingTests::test_get_location_id_fixture": true
+}

.pytest_cache/v/cache/nodeids

@@ -333,6 +333,7 @@ class Service(object):
         :param name str: The service name
 
     """
+
     def __init__(self, client, name):
         self.client = client
         self.name = name

SoftLayer/API.py

@@ -14,6 +14,7 @@
 
 class Column(object):
     """Column desctribes an attribute and how to fetch/display it."""
+
     def __init__(self, name, path, mask=None):
         self.name = name
         self.path = path
@@ -26,6 +27,7 @@ def __init__(self, name, path, mask=None):
 
 class ColumnFormatter(object):
     """Maps each column using a function"""
+
     def __init__(self):
         self.columns = []
         self.column_funcs = []

SoftLayer/CLI/columns.py

@@ -121,17 +121,17 @@ def cli(env,
     env.format = format
     env.ensure_client(config_file=config, is_demo=demo, proxy=proxy)
     env.vars['_start'] = time.time()
+    logger = logging.getLogger()
 
     if demo is False:
-        logger = logging.getLogger()
         logger.addHandler(logging.StreamHandler())
-        logger.setLevel(DEBUG_LOGGING_MAP.get(verbose, logging.DEBUG))
-        env.vars['_timings'] = SoftLayer.DebugTransport(env.client.transport)
     else:
         # This section is for running CLI tests.
         logging.getLogger("urllib3").setLevel(logging.WARNING)
-        env.vars['_timings'] = SoftLayer.TimingTransport(env.client.transport)
+        logger.addHandler(logging.NullHandler())
 
+    logger.setLevel(DEBUG_LOGGING_MAP.get(verbose, logging.DEBUG))
+    env.vars['_timings'] = SoftLayer.DebugTransport(env.client.transport)
     env.client.transport = env.vars['_timings']
 
 

SoftLayer/CLI/core.py

@@ -10,6 +10,7 @@
 # pylint: disable=keyword-arg-before-vararg
 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
@@ -23,13 +24,15 @@ def __str__(self):
 
 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

SoftLayer/CLI/exceptions.py

@@ -63,7 +63,7 @@ def cli(env, volume_id):
             file_schedule_type,
             replication,
             schedule.get('createDate', '')
-            ]
+        ]
         table_row.extend(schedule_properties)
         table.add_row(table_row)
 

SoftLayer/CLI/file/snapshot/schedule_list.py

@@ -232,6 +232,7 @@ class SequentialOutput(list):
 
     :param separator str: string to use as a default separator
     """
+
     def __init__(self, separator=os.linesep, *args, **kwargs):
         self.separator = separator
         super(SequentialOutput, self).__init__(*args, **kwargs)
@@ -246,6 +247,7 @@ def __str__(self):
 
 class CLIJSONEncoder(json.JSONEncoder):
     """A JSON encoder which is able to use a .to_python() method on objects."""
+
     def default(self, obj):
         """Encode object if it implements to_python()."""
         if hasattr(obj, 'to_python'):
@@ -258,6 +260,7 @@ class Table(object):
 
     :param list columns: a list of column names
     """
+
     def __init__(self, columns, title=None):
         duplicated_cols = [col for col, count
                            in collections.Counter(columns).items()
@@ -311,6 +314,7 @@ def prettytable(self):
 
 class KeyValueTable(Table):
     """A table that is oriented towards key-value pairs."""
+
     def to_python(self):
         """Decode this KeyValueTable object to standard Python types."""
         mapping = {}
@@ -325,6 +329,7 @@ class FormattedItem(object):
         :param original: raw (machine-readable) value
         :param string formatted: human-readable value
     """
+
     def __init__(self, original, formatted=None):
         self.original = original
         if formatted is not None:

SoftLayer/CLI/formatting.py

@@ -9,7 +9,6 @@
 from SoftLayer.CLI import helpers
 from SoftLayer import utils
 
-from pprint import pprint as pp
 
 @click.command()
 @click.argument('identifier')
@@ -28,7 +27,7 @@
 @environment.pass_env
 def cli(env, identifier, keys, permissions, hardware, virtual, logins, events):
     """User details."""
-    
+
     mgr = SoftLayer.UserManager(env.client)
     user_id = helpers.resolve_id(mgr.resolve_ids, identifier, 'username')
     object_mask = "userStatus[name], parent[id, username], apiAuthenticationKeys[authenticationKey], "\
@@ -55,7 +54,6 @@ def cli(env, identifier, keys, permissions, hardware, virtual, logins, events):
     if events:
         event_log = mgr.get_events(user_id)
         env.fout(print_events(event_log))
-        
 
 
 def basic_info(user, keys):
@@ -74,7 +72,7 @@ def basic_info(user, keys):
     table.add_row(['Email', user.get('email')])
     table.add_row(['OpenID', user.get('openIdConnectUserName')])
     address = "%s %s %s %s %s %s" % (
-        user.get('address1'), user.get('address2'), user.get('city'), user.get('state'), 
+        user.get('address1'), user.get('address2'), user.get('city'), user.get('state'),
         user.get('country'), user.get('postalCode'))
     table.add_row(['Address', address])
     table.add_row(['Company', user.get('companyName')])
@@ -85,17 +83,18 @@ def basic_info(user, keys):
     table.add_row(['Status', utils.lookup(user, 'userStatus', 'name')])
     table.add_row(['PPTP VPN', user.get('pptpVpnAllowedFlag', 'No')])
     table.add_row(['SSL VPN', user.get('sslVpnAllowedFlag', 'No')])
-    for login in  user.get('unsuccessfulLogins'):
+    for login in user.get('unsuccessfulLogins'):
         login_string = "%s From: %s" % (login.get('createDate'), login.get('ipAddress'))
         table.add_row(['Last Failed Login', login_string])
         break
-    for login in  user.get('successfulLogins'):
+    for login in user.get('successfulLogins'):
         login_string = "%s From: %s" % (login.get('createDate'), login.get('ipAddress'))
         table.add_row(['Last Login', login_string])
         break
 
     return table
 
+
 def print_permissions(permissions):
     """Prints out a users permissions"""
 
@@ -104,12 +103,13 @@ def print_permissions(permissions):
         table.add_row([perm['keyName'], perm['name']])
     return table
 
+
 def print_access(access, title):
     """Prints out the hardware or virtual guests a user can access"""
 
     columns = ['id', 'hostname', 'Primary Public IP', 'Primary Private IP', 'Created']
     table = formatting.Table(columns, title)
-      
+
     for host in access:
         host_id = host.get('id')
         host_fqdn = host.get('fullyQualifiedDomainName', '-')
@@ -119,6 +119,7 @@ def print_access(access, title):
         table.add_row([host_id, host_fqdn, host_primary, host_private, host_created])
     return table
 
+
 def print_dedicated_access(access):
     """Prints out the dedicated hosts a user can access"""
 
@@ -133,19 +134,20 @@ def print_dedicated_access(access):
         table.add_row([host_id, host_fqdn, host_cpu, host_mem, host_disk, host_created])
     return table
 
+
 def print_logins(logins):
     """Prints out the login history for a user"""
     table = formatting.Table(['Date', 'IP Address', 'Successufl Login?'])
     for login in logins:
         table.add_row([login.get('createDate'), login.get('ipAddress'), login.get('successFlag')])
     return table
 
+
 def print_events(events):
     """Prints out the event log for a user"""
     columns = ['Date', 'Type', 'IP Address', 'label', 'username']
     table = formatting.Table(columns)
     for event in events:
-        table.add_row([event.get('eventCreateDate'), event.get('eventName'), 
-                      event.get('ipAddress'), event.get('label'), event.get('username')])
+        table.add_row([event.get('eventCreateDate'), event.get('eventName'),
+                       event.get('ipAddress'), event.get('label'), event.get('username')])
     return table
-

SoftLayer/CLI/user/detail.py

@@ -5,30 +5,28 @@
 
 import SoftLayer
 from SoftLayer.CLI import environment
-from SoftLayer.CLI import formatting
 from SoftLayer.CLI import helpers
-from SoftLayer import utils
-
-from pprint import pprint as pp
 
 
 @click.command()
 @click.argument('identifier')
 @click.option('--enable/--disable', default=True,
-                help="Enable or Disable selected permissions")
+              help="Enable or Disable selected permissions")
 @click.option('--permission', '-p', multiple=True,
-                help="Permission keyName to set, multiple instances allowed.")
+              help="Permission keyName to set, multiple instances allowed.")
 @environment.pass_env
 def cli(env, identifier, enable, permission):
     """Enable or Disable specific permissions."""
-    
+
     mgr = SoftLayer.UserManager(env.client)
     user_id = helpers.resolve_id(mgr.resolve_ids, identifier, 'username')
-    object_mask = "mask[id,permissions,isMasterUserFlag]"
+    result = False
     if enable:
         result = mgr.add_permissions(user_id, permission)
-        click.secho("Permissions added successfully: %s" % ", ".join(permission), fg='green')
     else:
         result = mgr.remove_permissions(user_id, permission)
-        click.secho("Permissions removed successfully: %s" % ", ".join(permission), fg='green')
 
+    if result:
+        click.secho("Permissions updated successfully: %s" % ", ".join(permission), fg='green')
+    else:
+        click.secho("Failed to update permissions: %s" % ", ".join(permission), fg='red')