Merge pull request #1882 from caberos/issue1879

Unable to determine file\block storage limits per datacenter

Author: allmightyspiff

SoftLayer/CLI/block/limit.py

@@ -15,17 +15,30 @@
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.option('--sortby', help='Column to sort by', default='Datacenter')
+@click.option('--datacenter', '-d', help='Filter by datacenter')
 @environment.pass_env
-def cli(env, sortby):
+def cli(env, sortby, datacenter):
     """List number of block storage volumes limit per datacenter."""
     block_manager = SoftLayer.BlockStorageManager(env.client)
     block_volumes = block_manager.list_block_volume_limit()
 
     table = formatting.KeyValueTable(DEFAULT_COLUMNS)
     table.sortby = sortby
-    for volume in block_volumes:
-        datacenter_name = volume['datacenterName']
-        maximum_available_count = volume['maximumAvailableCount']
-        provisioned_count = volume['provisionedCount']
-        table.add_row([datacenter_name, maximum_available_count, provisioned_count])
+
+    for volumen in block_volumes:
+        if datacenter:
+            if volumen.get('datacenterName') != '':
+                if volumen.get('datacenterName') == datacenter:
+                    table.add_row([volumen.get('datacenterName'),
+                                   volumen.get('maximumAvailableCount'),
+                                   volumen.get('provisionedCount')])
+                    break
+        else:
+            if volumen.get('datacenterName') != '':
+                table.add_row([volumen.get('datacenterName'), volumen.get('maximumAvailableCount'),
+                               volumen.get('provisionedCount')])
+            else:
+                table.add_row([' - ',
+                               volumen.get('maximumAvailableCount'),
+                               volumen.get('provisionedCount')])
     env.fout(table)

SoftLayer/CLI/file/limit.py

@@ -15,17 +15,29 @@
 
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.option('--sortby', help='Column to sort by', default='Datacenter')
+@click.option('--datacenter', '-d', help='Filter by datacenter')
 @environment.pass_env
-def cli(env, sortby):
+def cli(env, sortby, datacenter):
     """List number of block storage volumes limit per datacenter."""
     file_manager = SoftLayer.FileStorageManager(env.client)
     file_volumes = file_manager.list_file_volume_limit()
 
     table = formatting.KeyValueTable(DEFAULT_COLUMNS)
     table.sortby = sortby
-    for volume in file_volumes:
-        datacenter_name = volume['datacenterName']
-        maximum_available_count = volume['maximumAvailableCount']
-        provisioned_count = volume['provisionedCount']
-        table.add_row([datacenter_name, maximum_available_count, provisioned_count])
+    for volumen in file_volumes:
+        if datacenter:
+            if volumen.get('datacenterName') != '':
+                if volumen.get('datacenterName') == datacenter:
+                    table.add_row([volumen.get('datacenterName'),
+                                   volumen.get('maximumAvailableCount'),
+                                   volumen.get('provisionedCount')])
+                    break
+        else:
+            if volumen.get('datacenterName') != '':
+                table.add_row([volumen.get('datacenterName'), volumen.get('maximumAvailableCount'),
+                               volumen.get('provisionedCount')])
+            else:
+                table.add_row([' - ',
+                               volumen.get('maximumAvailableCount'),
+                               volumen.get('provisionedCount')])
     env.fout(table)

SoftLayer/fixtures/SoftLayer_Network_Storage.py

@@ -234,11 +234,21 @@
 enableSnapshots = True
 disableSnapshots = True
 
-getVolumeCountLimits = {
-    'datacenterName': 'global',
-    'maximumAvailableCount': 300,
-    'provisionedCount': 100
-}
+getVolumeCountLimits = [{
+    "datacenterName": "global",
+    "maximumAvailableCount": 700,
+    "provisionedCount": 2632
+},
+    {
+        "maximumAvailableCount": 50,
+        "provisionedCount": 2632
+    },
+    {
+        "datacenterName": "dal13",
+        "maximumAvailableCount": 52,
+        "provisionedCount": 30
+    },
+]
 
 refreshDuplicate = {
     'dependentDuplicate': 1

tests/CLI/modules/block_tests.py

@@ -779,6 +779,24 @@ def test_volume_limit(self, list_mock):
         result = self.run_command(['block', 'volume-limits'])
         self.assert_no_fail(result)
 
+    def test_volume_limit_empty_datacenter(self):
+        expect_result = {
+            'dal13': 52,
+            'global': 700,
+            'null': 50
+        }
+        result = self.run_command(['block', 'volume-limits'])
+        self.assert_no_fail(result)
+        self.assertEqual(json.loads(result.output), expect_result)
+
+    def test_volume_limit_datacenter(self):
+        expect_result = {
+            "dal13": 52
+        }
+        result = self.run_command(['block', 'volume-limits', '-d', 'dal13'])
+        self.assert_no_fail(result)
+        self.assertEqual(json.loads(result.output), expect_result)
+
     def test_dupe_refresh(self):
         result = self.run_command(['block', 'volume-refresh', '102', '103'])
 

tests/CLI/modules/file_tests.py

@@ -761,6 +761,24 @@ def test_volume_limit(self, list_mock):
         result = self.run_command(['file', 'volume-limits'])
         self.assert_no_fail(result)
 
+    def test_volume_limit_empty_datacenter(self):
+        expect_result = {
+            'dal13': 52,
+            'global': 700,
+            'null': 50
+        }
+        result = self.run_command(['file', 'volume-limits'])
+        self.assert_no_fail(result)
+        self.assertEqual(json.loads(result.output), expect_result)
+
+    def test_volume_limit_datacenter(self):
+        expect_result = {
+            "dal13": 52
+        }
+        result = self.run_command(['file', 'volume-limits', '-d', 'dal13'])
+        self.assert_no_fail(result)
+        self.assertEqual(json.loads(result.output), expect_result)
+
     def test_dupe_refresh(self):
         result = self.run_command(['file', 'volume-refresh', '102', '103'])