Merge pull request #1700 from caberos/issue1692

block|file volume-options improvements

Author: allmightyspiff

SoftLayer/CLI/block/options.py

@@ -22,9 +22,12 @@ def cli(env):
 
     iops_table = formatting.Table(['Id', 'Description', 'KeyName'], title='IOPS')
     snapshot_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Snapshot')
-    storage_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Storage')
+    storage_table = formatting.Table(['Id', 'Description', 'KeyName', 'Capacity Minimum'], title='Storage')
     datacenter_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Datacenter')
 
+    storage_table.align['Description'] = 'l'
+    storage_table.align['KeyName'] = 'l'
+    storage_table.sortby = 'Id'
     for datacenter in datacenters:
         datacenter_table.add_row([datacenter['location']['locationId'],
                                   datacenter.get('description'),
@@ -33,7 +36,7 @@ def cli(env):
     for item in items:
         if item['itemCategory']['categoryCode'] == 'performance_storage_space':
             storage_table.add_row([item.get('id'), item.get('description'),
-                                   item.get('keyName')])
+                                   item.get('keyName'), item.get('capacityMinimum') or '-'])
 
         if item['itemCategory']['categoryCode'] == 'storage_tier_level':
             iops_table.add_row([item.get('id'), item.get('description'),

SoftLayer/CLI/file/options.py

@@ -8,7 +8,6 @@
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
 
-
 PACKAGE_STORAGE = 759
 
 
@@ -23,18 +22,21 @@ def cli(env):
 
     iops_table = formatting.Table(['Id', 'Description', 'KeyName'], title='IOPS')
     snapshot_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Snapshot')
-    storage_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Storage')
+    file_storage_table = formatting.Table(['Id', 'Description', 'KeyName', 'Capacity Minimum'], title='Storage')
     datacenter_table = formatting.Table(['Id', 'Description', 'KeyName'], title='Datacenter')
 
+    file_storage_table.align['Description'] = 'l'
+    file_storage_table.align['KeyName'] = 'l'
+    file_storage_table.sortby = 'Id'
     for datacenter in datacenters:
         datacenter_table.add_row([datacenter['location']['locationId'],
                                   datacenter.get('description'),
                                   datacenter['keyname']])
 
     for item in items:
         if item['itemCategory']['categoryCode'] == 'performance_storage_space':
-            storage_table.add_row([item.get('id'), item.get('description'),
-                                   item.get('keyName')])
+            file_storage_table.add_row([item.get('id'), item.get('description'),
+                                        item.get('keyName'), item.get('capacityMinimum') or '-'])
 
         if item['itemCategory']['categoryCode'] == 'storage_tier_level':
             iops_table.add_row([item.get('id'), item.get('description'),
@@ -46,5 +48,5 @@ def cli(env):
 
     env.fout(datacenter_table)
     env.fout(iops_table)
-    env.fout(storage_table)
+    env.fout(file_storage_table)
     env.fout(snapshot_table)