fixed tox errors

Author: Brian Flores

SoftLayer/CLI/core.py

@@ -52,11 +52,11 @@ def get_latest_version():
     return latest
 
 
-CONTEXT_SETTINGS = dict(
-    help_option_names=['--help', '-h'],
-    auto_envvar_prefix='SLCLI',
-    max_content_width=999
-)
+CONTEXT_SETTINGS = {
+    "help_option_names": ['--help', '-h'],
+    "auto_envvar_prefix": 'SLCLI',
+    "max_content_width": 999
+}
 
 
 def get_version_message(ctx, param, value):

SoftLayer/CLI/hardware/reload.py

@@ -13,7 +13,7 @@
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('identifier')
 @click.option('--postinstall', '-i',
-              help=("Post-install script to download (Only HTTPS executes, HTTP leaves file in /root"))
+              help="Post-install script to download (Only HTTPS executes, HTTP leaves file in /root")
 @helpers.multi_option('--key', '-k', help="SSH keys to add to the root user")
 @click.option('--lvm', '-l', is_flag=True, default=False, show_default=True,
               help="A flag indicating that the provision should use LVM for all logical drives.")

SoftLayer/CLI/order/place.py

@@ -28,7 +28,7 @@
 @click.option('--billing', type=click.Choice(['hourly', 'monthly']), default='hourly', show_default=True,
               help="Billing rate")
 @click.option('--complex-type',
-              help=("The complex type of the order. Starts with 'SoftLayer_Container_Product_Order'."))
+              help="The complex type of the order. Starts with 'SoftLayer_Container_Product_Order'.")
 @click.option('--extras',
               help="JSON string denoting extra data that needs to be sent with the order")
 @click.argument('order_items', nargs=-1)

SoftLayer/CLI/order/quote.py

@@ -75,7 +75,7 @@ def _parse_create_args(client, args):
 @click.option('--quantity', type=int, default=None,
               help="The quantity of the item being ordered if different from quoted value")
 @click.option('--complex-type', default='SoftLayer_Container_Product_Order_Hardware_Server', show_default=True,
-              help=("The complex type of the order. Starts with 'SoftLayer_Container_Product_Order'."))
+              help="The complex type of the order. Starts with 'SoftLayer_Container_Product_Order'.")
 @click.option('--userdata', '-u', help="User defined metadata string")
 @click.option('--userfile', '-F', type=click.Path(exists=True, readable=True, resolve_path=True),
               help="Read userdata from file")

SoftLayer/CLI/storage_utils.py

@@ -65,7 +65,7 @@ def _format_name(obj):
 
         return name
     else:
-        raise Exception('Unknown type %s' % obj['type'])
+        raise ValueError('Unknown type %s' % obj['type'])
 
 
 COLUMNS = [

SoftLayer/CLI/virt/create.py

@@ -199,9 +199,9 @@ def _parse_create_args(client, args):
 @click.option('--router-private', type=click.INT,
               help="The ID of the private ROUTER on which you want the virtual server placed")
 @helpers.multi_option('--public-security-group', '-S',
-                      help=('Security group ID to associate with the public interface'))
+                      help='Security group ID to associate with the public interface')
 @helpers.multi_option('--private-security-group', '-s',
-                      help=('Security group ID to associate with the private interface'))
+                      help='Security group ID to associate with the private interface')
 @click.option('--wait', type=click.INT,
               help="Wait until VS is finished provisioning for up to X seconds before returning")
 @click.option('--placementgroup',

SoftLayer/managers/block.py

@@ -52,8 +52,7 @@ def list_block_volumes(self, datacenter=None, username=None, storage_type=None,
 
         _filter = utils.NestedDict(kwargs.get('filter') or {})
 
-        _filter['iscsiNetworkStorage']['serviceResource']['type']['type'] = \
-            (utils.query_filter('!~ ISCSI'))
+        _filter['iscsiNetworkStorage']['serviceResource']['type']['type'] = utils.query_filter('!~ ISCSI')
 
         _filter['iscsiNetworkStorage']['storageType']['keyName'] = (
             utils.query_filter('*BLOCK_STORAGE*'))
@@ -63,15 +62,14 @@ def list_block_volumes(self, datacenter=None, username=None, storage_type=None,
 
         if datacenter:
             _filter['iscsiNetworkStorage']['serviceResource']['datacenter'][
-                'name'] = (utils.query_filter(datacenter))
+                'name'] = utils.query_filter(datacenter)
 
         if username:
-            _filter['iscsiNetworkStorage']['username'] = \
-                (utils.query_filter(username))
+            _filter['iscsiNetworkStorage']['username'] = utils.query_filter(username)
 
         if order:
             _filter['iscsiNetworkStorage']['billingItem']['orderItem'][
-                'order']['id'] = (utils.query_filter(order))
+                'order']['id'] = utils.query_filter(order)
 
         kwargs['filter'] = _filter.to_dict()
         return self.client.call('Account', 'getIscsiNetworkStorage', iter=True, **kwargs)

SoftLayer/managers/dedicated_host.py

@@ -233,7 +233,7 @@ def get_host(self, host_id, **kwargs):
 
         """
         if 'mask' not in kwargs:
-            kwargs['mask'] = ('''
+            kwargs['mask'] = '''
                 id,
                 name,
                 cpuCount,
@@ -272,7 +272,7 @@ def get_host(self, host_id, **kwargs):
                     uuid
                 ],
                 guestCount
-            ''')
+            '''
 
         return self.host.getObject(id=host_id, **kwargs)
 

SoftLayer/managers/file.py

@@ -48,8 +48,7 @@ def list_file_volumes(self, datacenter=None, username=None, storage_type=None, o
 
         _filter = utils.NestedDict(kwargs.get('filter') or {})
 
-        _filter['nasNetworkStorage']['serviceResource']['type']['type'] = \
-            (utils.query_filter('!~ NAS'))
+        _filter['nasNetworkStorage']['serviceResource']['type']['type'] = utils.query_filter('!~ NAS')
 
         _filter['nasNetworkStorage']['storageType']['keyName'] = (
             utils.query_filter('*FILE_STORAGE*'))
@@ -59,15 +58,14 @@ def list_file_volumes(self, datacenter=None, username=None, storage_type=None, o
 
         if datacenter:
             _filter['nasNetworkStorage']['serviceResource']['datacenter'][
-                'name'] = (utils.query_filter(datacenter))
+                'name'] = utils.query_filter(datacenter)
 
         if username:
-            _filter['nasNetworkStorage']['username'] = \
-                (utils.query_filter(username))
+            _filter['nasNetworkStorage']['username'] = utils.query_filter(username)
 
         if order:
             _filter['nasNetworkStorage']['billingItem']['orderItem'][
-                'order']['id'] = (utils.query_filter(order))
+                'order']['id'] = utils.query_filter(order)
 
         kwargs['filter'] = _filter.to_dict()
         return self.client.call('Account', 'getNasNetworkStorage', iter=True, **kwargs)

SoftLayer/managers/firewall.py

@@ -173,12 +173,12 @@ def _get_fwl_port_speed(self, server_id, is_virt=True):
 
         fwl_port_speed = 0
         if is_virt:
-            mask = ('primaryNetworkComponent[maxSpeed]')
+            mask = 'primaryNetworkComponent[maxSpeed]'
             svc = self.client['Virtual_Guest']
             primary = svc.getObject(mask=mask, id=server_id)
             fwl_port_speed = primary['primaryNetworkComponent']['maxSpeed']
         else:
-            mask = ('id,maxSpeed,networkComponentGroup.networkComponents')
+            mask = 'id,maxSpeed,networkComponentGroup.networkComponents'
             svc = self.client['Hardware_Server']
             network_components = svc.getFrontendNetworkComponents(
                 mask=mask, id=server_id)