Merge pull request #1446 from caberos/issue1445

add billing and lastTransaction on hardware detail

Author: allmightyspiff

SoftLayer/CLI/hardware/detail.py

@@ -62,6 +62,12 @@ def cli(env, identifier, passwords, price):
     table.add_row(['created', result['provisionDate'] or formatting.blank()])
     table.add_row(['owner', owner or formatting.blank()])
 
+    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'])
+
     vlan_table = formatting.Table(['type', 'number', 'id'])
     for vlan in result['networkVlans']:
         vlan_table.add_row([vlan['networkSpace'], vlan['vlanNumber'], vlan['id']])

SoftLayer/managers/hardware.py

@@ -265,6 +265,7 @@ def get_hardware(self, hardware_id, **kwargs):
                 'nextInvoiceChildren[nextInvoiceTotalRecurringAmount],'
                 'orderItem.order.userRecord[username]'
                 '],'
+                'lastTransaction[transactionGroup],'
                 'hourlyBillingFlag,'
                 'tagReferences[id,tag[name,id]],'
                 'networkVlans[id,vlanNumber,networkSpace],'