Merge pull request #1303 from ATGE/issues1298

#1298 Fix Unhandled exception in CLI - vs detail

Author: allmightyspiff

SoftLayer/CLI/virt/detail.py

@@ -9,6 +9,7 @@
 from SoftLayer.CLI import environment
 from SoftLayer.CLI import formatting
 from SoftLayer.CLI import helpers
+from SoftLayer.CLI.virt.storage import get_local_type
 from SoftLayer import utils
 
 LOGGER = logging.getLogger(__name__)
@@ -200,15 +201,3 @@ def _get_security_table(result):
         return secgroup_table
     else:
         return None
-
-
-def get_local_type(disks):
-    """Returns the virtual server local disk type.
-
-    :param disks: virtual serve local disks.
-    """
-    disk_type = 'System'
-    if 'SWAP' in disks['diskImage']['description']:
-        disk_type = 'Swap'
-
-    return disk_type

SoftLayer/CLI/virt/storage.py

@@ -67,7 +67,7 @@ def get_local_type(disks):
     :param disks: virtual serve local disks.
     """
     disk_type = 'System'
-    if 'SWAP' in disks['diskImage']['description']:
+    if 'SWAP' in disks.get('diskImage', {}).get('description', []):
         disk_type = 'Swap'
 
     return disk_type