style and tox fixes

Author: allmightyspiff

SoftLayer/fixtures/SoftLayer_Location_Datacenter.py

@@ -9,4 +9,4 @@
         "longName": "Dallas 9",
         "name": "dal09"
     }
-]
+]

SoftLayer/managers/block.py

@@ -5,10 +5,8 @@
 
     :license: MIT, see LICENSE for more details.
 """
-from SoftLayer import exceptions
-from SoftLayer.managers import storage_utils
 from SoftLayer.managers.storage import StorageManager
-
+from SoftLayer.managers import storage_utils
 from SoftLayer import utils
 
 # pylint: disable=too-many-public-methods
@@ -81,7 +79,6 @@ def get_block_volume_details(self, volume_id, **kwargs):
         """
         return self.get_volume_details(volume_id, **kwargs)
 
-
     def get_block_volume_access_list(self, volume_id, **kwargs):
         """Returns a list of authorized hosts for a specified volume.
 
@@ -100,7 +97,6 @@ def get_block_volume_snapshot_list(self, volume_id, **kwargs):
         """
         return self.get_volume_snapshot_list(volume_id, **kwargs)
 
-
     def assign_subnets_to_acl(self, access_id, subnet_ids):
         """Assigns subnet records to ACL for the access host.
 

SoftLayer/managers/file.py

@@ -5,9 +5,8 @@
 
     :license: MIT, see LICENSE for more details.
 """
-from SoftLayer import exceptions
-from SoftLayer.managers import storage_utils
 from SoftLayer.managers.storage import StorageManager
+from SoftLayer.managers import storage_utils
 from SoftLayer import utils
 
 # pylint: disable=too-many-public-methods
@@ -125,7 +124,6 @@ def get_file_volume_snapshot_list(self, volume_id, **kwargs):
         """
         return self.get_volume_snapshot_list(volume_id, **kwargs)
 
-
     def order_file_volume(self, storage_type, location, size,
                           iops=None, tier_level=None, snapshot_size=None,
                           service_offering='storage_as_a_service',
@@ -159,5 +157,3 @@ def cancel_file_volume(self, volume_id, reason='No longer needed', immediate=Fal
         :param boolean immediate: Cancel immediately or on anniversary date
         """
         return self.cancel_volume(volume_id, reason, immediate)
-
-

SoftLayer/managers/storage.py

@@ -139,8 +139,8 @@ def deauthorize_host_to_volume(self, volume_id, hardware_ids=None, virtual_guest
         :return: Returns an array of SoftLayer_Network_Storage_Allowed_Host objects
                 which have access to the given File volume
         """
-        host_templates =  storage_utils.populate_host_templates(hardware_ids, virtual_guest_ids,
-                                                                ip_address_ids, subnet_ids)
+        host_templates = storage_utils.populate_host_templates(hardware_ids, virtual_guest_ids,
+                                                               ip_address_ids, subnet_ids)
 
         return self.client.call('Network_Storage', 'removeAccessFromHostList', host_templates, id=volume_id)
 
@@ -182,8 +182,8 @@ def order_replicant_volume(self, volume_id, snapshot_schedule, location, tier=No
         storage_class = storage_utils.block_or_file(block_volume['storageType']['keyName'])
 
         order = storage_utils.prepare_replicant_order_object(
-                self, snapshot_schedule, location, tier, block_volume, storage_class
-            )
+            self, snapshot_schedule, location, tier, block_volume, storage_class
+        )
 
         if storage_class == 'block':
             if os_type is None:
@@ -219,7 +219,6 @@ def order_duplicate_volume(self, origin_volume_id, origin_snapshot_id=None,
         origin_volume = self.get_volume_details(origin_volume_id, mask=block_mask)
         storage_class = storage_utils.block_or_file(origin_volume['storageType']['keyName'])
 
-
         order = storage_utils.prepare_duplicate_order_object(
             self, origin_volume, duplicate_iops, duplicate_tier_level,
             duplicate_size, duplicate_snapshot_size, storage_class, hourly_billing_flag
@@ -238,7 +237,6 @@ def order_duplicate_volume(self, origin_volume_id, origin_snapshot_id=None,
 
         return self.client.call('Product_Order', 'placeOrder', order)
 
-
     def order_modified_volume(self, volume_id, new_size=None, new_iops=None, new_tier_level=None):
         """Places an order for modifying an existing block volume.
 
@@ -268,7 +266,6 @@ def order_modified_volume(self, volume_id, new_size=None, new_iops=None, new_tie
 
         return self.client.call('Product_Order', 'placeOrder', order)
 
-
     def delete_snapshot(self, snapshot_id):
         """Deletes the specified snapshot object.
 
@@ -297,7 +294,7 @@ def order_snapshot_space(self, volume_id, capacity, tier, upgrade, **kwargs):
         object_mask = 'id,billingItem[location,hourlyFlag],'\
             'storageType[keyName],storageTierLevel,provisionedIops,'\
             'staasVersion,hasEncryptionAtRest'
-        volume = self.get_volume_details(volume_id, mask=object_mask,  **kwargs)
+        volume = self.get_volume_details(volume_id, mask=object_mask, **kwargs)
 
         order = storage_utils.prepare_snapshot_order_object(self, volume, capacity, tier, upgrade)
 

SoftLayer/managers/storage_utils.py

@@ -985,6 +985,7 @@ def prepare_modify_order_object(manager, volume, new_iops, new_tier, new_size):
 
     return modify_order
 
+
 def block_or_file(storage_type_keyname):
     """returns either 'block' or 'file'
 
@@ -993,6 +994,7 @@ def block_or_file(storage_type_keyname):
     """
     return 'block' if 'BLOCK_STORAGE' in storage_type_keyname else 'file'
 
+
 def _has_category(categories, category_code):
     return any(
         True
@@ -1022,4 +1024,3 @@ def _find_price_id(prices, category, restriction_type=None, restriction_value=No
             continue
 
         return {'id': price['id']}
-

tests/managers/block_tests.py

@@ -9,10 +9,10 @@
 import SoftLayer
 from SoftLayer import exceptions
 from SoftLayer.fixtures import SoftLayer_Account
-from SoftLayer.fixtures import SoftLayer_Product_Package
-from SoftLayer.fixtures import SoftLayer_Product_Order
 from SoftLayer.fixtures import SoftLayer_Network_Storage
 from SoftLayer.fixtures import SoftLayer_Network_Storage_Allowed_Host
+from SoftLayer.fixtures import SoftLayer_Product_Order
+from SoftLayer.fixtures import SoftLayer_Product_Package
 from SoftLayer import testing
 
 

tests/managers/file_tests.py

@@ -9,10 +9,9 @@
 import SoftLayer
 from SoftLayer import exceptions
 from SoftLayer.fixtures import SoftLayer_Account
-from SoftLayer.fixtures import SoftLayer_Product_Package
-from SoftLayer.fixtures import SoftLayer_Product_Order
 from SoftLayer.fixtures import SoftLayer_Network_Storage
-from SoftLayer.fixtures import SoftLayer_Network_Storage_Allowed_Host
+from SoftLayer.fixtures import SoftLayer_Product_Order
+from SoftLayer.fixtures import SoftLayer_Product_Package
 from SoftLayer import testing
 
 

tests/managers/storage_utils_tests.py

@@ -23,30 +23,20 @@ def set_up(self):
     # Tests for populate_host_templates()
     # ---------------------------------------------------------------------
     def test_populate_host_templates_no_ids_given(self):
-        host_templates = []
-
-        storage_utils.populate_host_templates(host_templates)
-
+        host_templates = storage_utils.populate_host_templates()
         self.assertEqual([], host_templates)
 
     def test_populate_host_templates_empty_arrays_given(self):
-        host_templates = []
-
-        storage_utils.populate_host_templates(
-            host_templates,
+        host_templates = storage_utils.populate_host_templates(
             hardware_ids=[],
             virtual_guest_ids=[],
             ip_address_ids=[],
             subnet_ids=[]
         )
-
         self.assertEqual([], host_templates)
 
     def test_populate_host_templates(self):
-        host_templates = []
-
-        storage_utils.populate_host_templates(
-            host_templates,
+        host_templates = storage_utils.populate_host_templates(
             hardware_ids=[1111],
             virtual_guest_ids=[2222],
             ip_address_ids=[3333],