issues877 changed pricing in the HW details to show sub items, along with properly calculating total cost

Author: allmightyspiff

SoftLayer/CLI/hardware/detail.py

@@ -84,15 +84,15 @@ def cli(env, identifier, passwords, price):
         table.add_row(['notes', result['notes']])
 
     if price:
-        total_price = utils.lookup(result,
-                                   'billingItem',
-                                   'nextInvoiceTotalRecurringAmount') or 0
-        total_price += sum(p['nextInvoiceTotalRecurringAmount']
-                           for p
-                           in utils.lookup(result,
-                                           'billingItem',
-                                           'children') or [])
-        table.add_row(['price_rate', total_price])
+        price_table = formatting.Table(['Item', 'Recurring Price'])
+
+        total_price = utils.lookup(result, 'billingItem', 'nextInvoiceTotalRecurringAmount') or 0
+        price_table.add_row(['Total', total_price])
+
+        for item in utils.lookup(result, 'billingItem', 'children') or []:
+            price_table.add_row([item['description'], item['nextInvoiceTotalRecurringAmount']])
+
+        table.add_row(['prices', price_table])
 
     if passwords:
         pass_table = formatting.Table(['username', 'password'])

SoftLayer/fixtures/SoftLayer_Hardware_Server.py

@@ -8,11 +8,7 @@
         'recurringFee': 1.54,
         'nextInvoiceTotalRecurringAmount': 16.08,
         'children': [
-            {'nextInvoiceTotalRecurringAmount': 1},
-            {'nextInvoiceTotalRecurringAmount': 1},
-            {'nextInvoiceTotalRecurringAmount': 1},
-            {'nextInvoiceTotalRecurringAmount': 1},
-            {'nextInvoiceTotalRecurringAmount': 1},
+            {'description': 'test', 'nextInvoiceTotalRecurringAmount': 1},
         ],
         'orderItem': {
             'order': {

tests/CLI/modules/server_tests.py

@@ -44,7 +44,8 @@ def test_server_details(self):
             'os': 'Ubuntu',
             'os_version': 'Ubuntu 12.04 LTS',
             'owner': 'chechu',
-            'price_rate': 21.08,
+            'prices': [{'Item': 'Total', 'Recurring Price': 16.08},
+                       {'Item': 'test', 'Recurring Price': 1}],
             'private_ip': '10.1.0.2',
             'ptr': '2.0.1.10.in-addr.arpa',
             'public_ip': '172.16.1.100',