feature/VolumeLimit Address the code style issues

Author: Samson Yerraguntla

SoftLayer/CLI/block/limit.py

@@ -14,10 +14,9 @@
 
 
 @click.command()
-@click.option('--datacenter', '-d', help='Datacenter shortname')
 @click.option('--sortby', help='Column to sort by', default='Datacenter')
 @environment.pass_env
-def cli(env, sortby, datacenter):
+def cli(env, sortby):
     """List number of block storage volumes limit per datacenter."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
     block_volumes = block_manager.list_block_volume_limit()
@@ -29,4 +28,4 @@ def cli(env, sortby, datacenter):
         maximum_available_count = volume['maximumAvailableCount']
         provisioned_count = volume['provisionedCount']
         table.add_row([datacenter_name, maximum_available_count, provisioned_count])
-    env.fout(table)
+    env.fout(table)

SoftLayer/CLI/file/limit.py

@@ -14,10 +14,9 @@
 
 
 @click.command()
-@click.option('--datacenter', '-d', help='Datacenter shortname')
 @click.option('--sortby', help='Column to sort by', default='Datacenter')
 @environment.pass_env
-def cli(env, sortby, datacenter):
+def cli(env, sortby):
     """List number of block storage volumes limit per datacenter."""
     file_manager = SoftLayer.FileStorageManager(env.client)
     file_volumes = file_manager.list_file_volume_limit()
@@ -29,4 +28,4 @@ def cli(env, sortby, datacenter):
         maximum_available_count = volume['maximumAvailableCount']
         provisioned_count = volume['provisionedCount']
         table.add_row([datacenter_name, maximum_available_count, provisioned_count])
-    env.fout(table)
+    env.fout(table)

tests/CLI/modules/block_tests.py

@@ -669,11 +669,11 @@ def test_set_password(self):
     @mock.patch('SoftLayer.BlockStorageManager.list_block_volume_limit')
     def test_volume_limit(self, list_mock):
         list_mock.return_value = [
-                 {
-                    "datacenterName": "global",
-                    "maximumAvailableCount": 300,
-                    "provisionedCount": 100
-                 }]
+            {
+                "datacenterName": "global",
+                "maximumAvailableCount": 300,
+                "provisionedCount": 100
+            }]
 
         result = self.run_command(['block', 'volume-limit'])
         self.assert_no_fail(result)

tests/CLI/modules/file_tests.py

@@ -666,14 +666,13 @@ def test_modify_order(self, order_mock):
         self.assertEqual('Order #24602 placed successfully!\n > Storage as a Service\n > 1000 GBs\n > 4 IOPS per GB\n',
                          result.output)
 
-
     @mock.patch('SoftLayer.FileStorageManager.list_file_volume_limit')
     def test_volume_limit(self, list_mock):
         list_mock.return_value = [
-                 {
-                    "datacenterName": "global",
-                    "maximumAvailableCount": 300,
-                    "provisionedCount": 100
-                  }]
+            {
+                'datacenterName': 'global',
+                'maximumAvailableCount': 300,
+                'provisionedCount': 100
+            }]
         result = self.run_command(['file', 'volume-limit'])
         self.assert_no_fail(result)

tests/managers/block_tests.py

@@ -939,4 +939,4 @@ def test_setCredentialPassword(self):
 
     def test_list_block_volume_limit(self):
         result = self.block.list_block_volume_limit()
-        self.assertEqual(fixtures.SoftLayer_Network_Storage.getVolumeCountLimits,result)
+        self.assertEqual(fixtures.SoftLayer_Network_Storage.getVolumeCountLimits, result)

tests/managers/cdn_tests.py

@@ -49,16 +49,16 @@ def test_add_origin(self):
                                    cache_query="include all")
 
         args = ({
-                    'uniqueId': "12345",
-                    'origin': '10.10.10.1',
-                    'path': '/example/videos',
+            'uniqueId': "12345",
+            'origin': '10.10.10.1',
+            'path': '/example/videos',
                     'originType': 'HOST_SERVER',
                     'header': 'test.example.com',
                     'httpPort': 80,
                     'protocol': 'HTTP',
                     'performanceConfiguration': 'General web delivery',
                     'cacheKeyQueryRule': "include all"
-                },)
+        },)
         self.assert_called_with('SoftLayer_Network_CdnMarketplace_Configuration_Mapping_Path',
                                 'createOriginPath',
                                 args=args)
@@ -69,9 +69,9 @@ def test_add_origin_with_bucket_and_file_extension(self):
                                    protocol='http', optimize_for="web", cache_query="include all")
 
         args = ({
-                    'uniqueId': "12345",
-                    'origin': '10.10.10.1',
-                    'path': '/example/videos',
+            'uniqueId': "12345",
+            'origin': '10.10.10.1',
+            'path': '/example/videos',
                     'originType': 'OBJECT_STORAGE',
                     'header': 'test.example.com',
                     'httpPort': 80,
@@ -80,7 +80,7 @@ def test_add_origin_with_bucket_and_file_extension(self):
                     'fileExtension': 'jpg',
                     'performanceConfiguration': 'General web delivery',
                     'cacheKeyQueryRule': "include all"
-                },)
+        },)
         self.assert_called_with('SoftLayer_Network_CdnMarketplace_Configuration_Mapping_Path',
                                 'createOriginPath',
                                 args=args)

tests/managers/file_tests.py

@@ -668,7 +668,6 @@ def test_order_file_duplicate_performance_no_duplicate_snapshot(self):
     def test_order_file_duplicate_performance(self):
         mock = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
         mock.return_value = [fixtures.SoftLayer_Product_Package.SAAS_PACKAGE]
-
         mock_volume = copy.deepcopy(fixtures.SoftLayer_Network_Storage.STAAS_TEST_VOLUME)
         mock_volume['storageType']['keyName'] = 'PERFORMANCE_FILE_STORAGE'
         mock = self.set_mock('SoftLayer_Network_Storage', 'getObject')

tests/managers/ordering_tests.py

@@ -722,7 +722,7 @@ def test_get_item_capacity_core(self):
                 "capacity": "1",
                 "id": 10201,
                 "keyName": "GUEST_CORE_1_DEDICATED",
-            }]
+        }]
 
         item_capacity = self.ordering.get_item_capacity(items, ['GUEST_CORE_1_DEDICATED', 'OS_RHEL_7_X_LAMP_64_BIT'])
 
@@ -739,7 +739,7 @@ def test_get_item_capacity_storage(self):
                 "capacity": "1",
                 "id": 10201,
                 "keyName": "READHEAVY_TIER",
-            }]
+        }]
 
         item_capacity = self.ordering.get_item_capacity(items, ['READHEAVY_TIER', 'STORAGE_SPACE_FOR_2_IOPS_PER_GB'])