Merge pull request #1466 from caberos/issue1464

add Billing and lastTransaction on slcli virtual detail

Author: allmightyspiff

SoftLayer/CLI/virt/detail.py

@@ -69,6 +69,11 @@ def cli(env, identifier, passwords=False, price=False):
     table.add_row(['transient', result.get('transientGuestFlag', False)])
     table.add_row(['created', result['createDate']])
     table.add_row(['modified', result['modifyDate']])
+    last_transaction = "{} ({})".format(utils.lookup(result, 'lastTransaction', 'transactionGroup', 'name'),
+                                        utils.clean_time(utils.lookup(result, 'lastTransaction', 'modifyDate')))
+
+    table.add_row(['last_transaction', last_transaction])
+    table.add_row(['billing', 'Hourly' if result['hourlyBillingFlag'] else'Monthly'])
     table.add_row(['preset', utils.lookup(result, 'billingItem',
                                           'orderItem',
                                           'preset',

SoftLayer/managers/vs.py

@@ -227,7 +227,7 @@ def get_instance(self, instance_id, **kwargs):
                 'maxMemory,'
                 'datacenter,'
                 'activeTransaction[id, transactionStatus[friendlyName,name]],'
-                'lastTransaction[transactionStatus],'
+                'lastTransaction[transactionStatus,modifyDate,transactionGroup[name]],'
                 'lastOperatingSystemReload.id,'
                 'blockDevices,'
                 'blockDeviceTemplateGroup[id, name, globalIdentifier],'