Merge pull request #1418 from FernandoOjeda/ft/block_storage_iops

Add IOPs data to slcli block volume-list.

Author: allmightyspiff

Diff for: SoftLayer/CLI/block/list.py

@@ -23,7 +23,7 @@
         mask="storageType.keyName"),
     column_helper.Column('capacity_gb', ('capacityGb',), mask="capacityGb"),
     column_helper.Column('bytes_used', ('bytesUsed',), mask="bytesUsed"),
-    column_helper.Column('iops', ('iops',), mask="iops"),
+    column_helper.Column('IOPs', ('provisionedIops',), mask="provisionedIops"),
     column_helper.Column('ip_addr', ('serviceResourceBackendIpAddress',),
                          mask="serviceResourceBackendIpAddress"),
     column_helper.Column('lunId', ('lunId',), mask="lunId"),
@@ -44,7 +44,7 @@
     'storage_type',
     'capacity_gb',
     'bytes_used',
-    'iops',
+    'IOPs',
     'ip_addr',
     'lunId',
     'active_transactions',

Diff for: tests/CLI/modules/block_tests.py

@@ -130,7 +130,7 @@ def test_volume_list(self):
                 'capacity_gb': 20,
                 'datacenter': 'dal05',
                 'id': 100,
-                'iops': None,
+                'IOPs': None,
                 'ip_addr': '10.1.2.3',
                 'lunId': None,
                 'notes': "{'status': 'availabl",