Fix - disk list size

vcd_cli/disk.py

@@ -13,19 +13,14 @@
 #
 
 import click
+
 import humanfriendly
 from pyvcloud.vcd.client import VCLOUD_STATUS_MAP
 from pyvcloud.vcd.org import Org
-from pyvcloud.vcd.utils import disk_to_dict
-from pyvcloud.vcd.utils import extract_id
+from pyvcloud.vcd.utils import disk_to_dict, extract_id
 from pyvcloud.vcd.vdc import VDC
-
-from vcd_cli.utils import extract_name_and_id
-from vcd_cli.utils import restore_session
-from vcd_cli.utils import stderr
-from vcd_cli.utils import stdout
-from vcd_cli.vcd import abort_if_false
-from vcd_cli.vcd import vcd
+from vcd_cli.utils import extract_name_and_id, restore_session, stderr, stdout
+from vcd_cli.vcd import abort_if_false, vcd
 
 
 @vcd.group(short_help='manage independent disks')
@@ -87,6 +82,10 @@ def list_disks(ctx):
             if hasattr(disk, 'attached_vms') and \
                hasattr(disk.attached_vms, 'VmReference'):
                 attached_vms = disk.attached_vms.VmReference.get('name')
+            if 'size' in disk.keys():
+                size_in_bytes = int(disk.get('size'))
+            else:
+                size_in_bytes = int(disk.get('sizeMb')) * (1024 * 1024)
             result.append({
                 'name':
                 disk.get('name'),
@@ -95,9 +94,8 @@ def list_disks(ctx):
                 'owner':
                 disk.Owner.User.get('name'),
                 'size':
-                humanfriendly.format_size(int(disk.get('size'))),
-                'size_bytes':
-                disk.get('size'),
+                humanfriendly.format_size(size_in_bytes),
+                'size_bytes': size_in_bytes,
                 'status':
                 VCLOUD_STATUS_MAP.get(int(disk.get('status'))),
                 'vms_attached':