Fix parsing logic in volume-detail commands to handle invalid types

Some certain types of transactions which are currently returned in
a volume's activeTransactions contain transactionStatus sub-properties
of inconsistent types. There is a plan to fix the core issue in the
backend, but until that fix is added, the changes in this commit
should prevent the volume-detail commands from resulting in an
error if any invalid transactionStatus objects are returned.

Author: David Pickle

SoftLayer/CLI/block/detail.py

@@ -62,7 +62,7 @@ def cli(env, volume_id):
 
     if block_volume['activeTransactions']:
         for trans in block_volume['activeTransactions']:
-            if isinstance(utils.lookup(trans, 'transactionStatus', 'friendlyName'), str):
+            if 'transactionStatus' in trans and 'friendlyName' in trans['transactionStatus']:
                 table.add_row(['Ongoing Transaction', trans['transactionStatus']['friendlyName']])
 
     table.add_row(['Replicant Count', "%u" % block_volume.get('replicationPartnerCount', 0)])

SoftLayer/CLI/file/detail.py

@@ -78,7 +78,7 @@ def cli(env, volume_id):
 
     if file_volume['activeTransactions']:
         for trans in file_volume['activeTransactions']:
-            if isinstance(utils.lookup(trans, 'transactionStatus', 'friendlyName'), str):
+            if 'transactionStatus' in trans and 'friendlyName' in trans['transactionStatus']:
                 table.add_row(['Ongoing Transaction', trans['transactionStatus']['friendlyName']])
 
     table.add_row(['Replicant Count', "%u" % file_volume.get('replicationPartnerCount', 0)])