Merge pull request #1443 from FernandoOjeda/ft/vs_detail_prices

Refactor slcli hw detail prices.

Author: allmightyspiff

SoftLayer/CLI/hardware/detail.py

@@ -78,11 +78,13 @@ def cli(env, identifier, passwords, price):
     if price:
         total_price = utils.lookup(result, 'billingItem', 'nextInvoiceTotalRecurringAmount') or 0
 
-        price_table = formatting.Table(['Item', 'Recurring Price'])
-        price_table.add_row(['Total', total_price])
+        price_table = formatting.Table(['Item', 'CategoryCode', 'Recurring Price'])
+        price_table.align['Item'] = 'l'
 
-        for item in utils.lookup(result, 'billingItem', 'children') or []:
-            price_table.add_row([item['description'], item['nextInvoiceTotalRecurringAmount']])
+        price_table.add_row(['Total', '-', total_price])
+
+        for item in utils.lookup(result, 'billingItem', 'nextInvoiceChildren') or []:
+            price_table.add_row([item['description'], item['categoryCode'], item['nextInvoiceTotalRecurringAmount']])
 
         table.add_row(['prices', price_table])
 

SoftLayer/managers/hardware.py

@@ -260,7 +260,7 @@ def get_hardware(self, hardware_id, **kwargs):
                     passwords[username,password]],'''
                 'billingItem['
                 'id,nextInvoiceTotalRecurringAmount,'
-                'children[nextInvoiceTotalRecurringAmount],'
+                'nextInvoiceChildren[nextInvoiceTotalRecurringAmount],'
                 'orderItem.order.userRecord[username]'
                 '],'
                 'hourlyBillingFlag,'