Merge pull request #1907 from caberos/issue1902

Issues with block/file volume-details on some volumes

Author: allmightyspiff

SoftLayer/CLI/block/detail.py

@@ -23,11 +23,14 @@ def cli(env, volume_id):
     table.align['Name'] = 'r'
     table.align['Value'] = 'l'
 
+    capacity = '0'
+    if block_volume['capacityGb'] != '':
+        capacity = "%iGB" % block_volume['capacityGb']
     storage_type = block_volume['storageType']['keyName'].split('_').pop(0)
     table.add_row(['ID', block_volume['id']])
     table.add_row(['Username', block_volume['username']])
     table.add_row(['Type', storage_type])
-    table.add_row(['Capacity (GB)', "%iGB" % block_volume['capacityGb']])
+    table.add_row(['Capacity (GB)', capacity])
     table.add_row(['LUN Id', "%s" % block_volume['lunId']])
 
     if block_volume.get('provisionedIops'):

SoftLayer/CLI/file/detail.py

@@ -9,6 +9,14 @@
 from SoftLayer import utils
 
 
+def get_capacity(file_volume):
+    """Get the capacity Gb with validate the data"""
+    capacity = '0'
+    if file_volume['capacityGb'] != '':
+        capacity = "%iGB" % file_volume['capacityGb']
+    return capacity
+
+
 @click.command(cls=SoftLayer.CLI.command.SLCommand, )
 @click.argument('volume_id')
 @environment.pass_env
@@ -27,7 +35,7 @@ def cli(env, volume_id):
     table.add_row(['ID', file_volume['id']])
     table.add_row(['Username', file_volume['username']])
     table.add_row(['Type', storage_type])
-    table.add_row(['Capacity (GB)', "%iGB" % file_volume['capacityGb']])
+    table.add_row(['Capacity (GB)', get_capacity(file_volume)])
 
     used_space = int(file_volume['bytesUsed']) \
         if file_volume['bytesUsed'] else 0