Merge pull request #1866 from edsonarios/issue1860

Updated command `slcli image detail`

Author: allmightyspiff

SoftLayer/CLI/image/__init__.py

@@ -6,7 +6,8 @@
 MASK = ('id,accountId,name,globalIdentifier,parentId,publicFlag,flexImageFlag,'
         'imageType')
 DETAIL_MASK = MASK + (',firstChild,children[id,blockDevicesDiskSpaceTotal,datacenter,'
-                      'transaction[transactionGroup,transactionStatus]],'
-                      'note,createDate,status,transaction')
+                      'transaction[transactionGroup,transactionStatus],'
+                      'blockDevices[diskImage[capacity,name,units,softwareReferences[softwareDescription]],diskSpace]],'
+                      'note,createDate,status,transaction,accountReferences')
 PUBLIC_TYPE = formatting.FormattedItem('PUBLIC', 'Public')
 PRIVATE_TYPE = formatting.FormattedItem('PRIVATE', 'Private')

SoftLayer/CLI/image/detail.py

@@ -28,33 +28,35 @@ def cli(env, identifier):
     table.align['name'] = 'r'
     table.align['value'] = 'l'
 
-    table.add_row(['id', image['id']])
-    table.add_row(['global_identifier',
+    table.add_row(['Id', image['id']])
+    table.add_row(['Global Identifier',
                    image.get('globalIdentifier', formatting.blank())])
-    table.add_row(['name', image['name'].strip()])
-    table.add_row(['status', formatting.FormattedItem(
+    table.add_row(['Name', image['name'].strip()])
+    table.add_row(['Status', formatting.FormattedItem(
         utils.lookup(image, 'status', 'keyname'),
         utils.lookup(image, 'status', 'name'),
     )])
 
     table.add_row([
-        'active_transaction',
+        'Active Transaction',
         formatting.listing(_get_transaction_groups(children_images), separator=','),
     ])
-    table.add_row(['account', image.get('accountId', formatting.blank())])
-    table.add_row(['visibility',
+    table.add_row(['Account', image.get('accountId', formatting.blank())])
+    table.add_row(['Created', image.get('createDate')])
+    table.add_row(['Total Size', formatting.b_to_gb(total_size)])
+    table.add_row(['Visibility',
                    image_mod.PUBLIC_TYPE if image['publicFlag']
                    else image_mod.PRIVATE_TYPE])
-    table.add_row(['type',
+    table.add_row(['Type',
                    formatting.FormattedItem(
                        utils.lookup(image, 'imageType', 'keyName'),
                        utils.lookup(image, 'imageType', 'name'),
                    )])
-    table.add_row(['flex', image.get('flexImageFlag')])
-    table.add_row(['note', image.get('note')])
-    table.add_row(['created', image.get('createDate')])
-    table.add_row(['total_size', formatting.b_to_gb(total_size)])
-    table.add_row(['datacenters', _get_datacenter_table(children_images)])
+    table.add_row(['Flex', image.get('flexImageFlag')])
+    table.add_row(['Note', image.get('note')])
+    table.add_row(['Datacenters', _get_datacenter_table(children_images)])
+    table.add_row(['Virtual Disks', _get_virtual_disks(children_images)])
+    table.add_row(['Share Image', _get_share_image(image)])
 
     env.fout(table)
 
@@ -64,7 +66,7 @@ def _get_datacenter_table(children_images):
 
       :param children_images: A list of images.
       """
-    table_datacenter = formatting.Table(['DC', 'size', 'transaction'])
+    table_datacenter = formatting.Table(['DC', 'Size', 'Transaction'])
     for child in children_images:
         table_datacenter.add_row([
             utils.lookup(child, 'datacenter', 'name'),
@@ -85,3 +87,51 @@ def _get_transaction_groups(children_images):
         transactions.add(utils.lookup(child, 'transaction', 'transactionGroup', 'name'))
 
     return transactions
+
+
+def _get_virtual_disks(children_images):
+    """Returns datacenters as a table.
+
+      :param children_images: A list of images.
+      """
+
+    table_virtual_disks = formatting.Table(['Device', 'Capacity', 'Size On Disk'])
+
+    if utils.lookup(children_images[0], 'blockDevices'):
+        for block_devices in children_images[0]['blockDevices']:
+            device_name = utils.lookup(block_devices, 'diskImage', 'name')
+            software_references = utils.lookup(block_devices, 'diskImage', 'softwareReferences')
+            if len(software_references) > 0:
+                device_name = utils.lookup(software_references[0], 'softwareDescription', 'longDescription')
+
+            size_on_disk = formatting.b_to_gb(block_devices.get('diskSpace', 0))
+            if block_devices.get('diskSpace', 0) == 0:
+                size_on_disk = 'N/A'
+
+            capacity = str(utils.lookup(block_devices, 'diskImage', 'capacity')) + \
+                ' ' + utils.lookup(block_devices, 'diskImage', 'units')
+
+            table_virtual_disks.add_row([
+                device_name,
+                capacity,
+                size_on_disk
+            ])
+
+    return table_virtual_disks
+
+
+def _get_share_image(image):
+    """Returns shares image as a table.
+
+      :param image: Detail information about image.
+      """
+    table_share_account = formatting.Table(['Account', 'Shared On'])
+    if utils.lookup(image, 'accountReferences'):
+        for account in image['accountReferences']:
+            if account['accountId'] != image['accountId']:
+                table_share_account.add_row([
+                    utils.lookup(account, 'accountId'),
+                    utils.lookup(account, 'createDate'),
+                ])
+
+    return table_share_account