Merge pull request #1556 from ATGE/issues/1555-hw-billing

Fix hw billing reports 0 items

Author: allmightyspiff

SoftLayer/CLI/hardware/billing.py

@@ -31,7 +31,7 @@ def cli(env, identifier):
     table.add_row(['Provision Date', utils.lookup(result, 'billingItem', 'provisionDate')])
 
     price_table = formatting.Table(['Item', 'Recurring Price'])
-    for item in utils.lookup(result, 'billingItem', 'children') or []:
+    for item in utils.lookup(result, 'billingItem', 'nextInvoiceChildren') or []:
         price_table.add_row([item['description'], item['nextInvoiceTotalRecurringAmount']])
 
     table.add_row(['prices', price_table])

tests/CLI/modules/server_tests.py

@@ -868,19 +868,25 @@ def test_hardware_storage(self):
 
     def test_billing(self):
         result = self.run_command(['hw', 'billing', '123456'])
-        billing_json = {
+        hardware_server_billing = {
             'Billing Item Id': 6327,
             'Id': '123456',
             'Provision Date': None,
             'Recurring Fee': 1.54,
             'Total': 16.08,
-            'prices': [{
-                'Item': 'test',
-                'Recurring Price': 1
-            }]
+            'prices': [
+                {
+                    'Item': 'test',
+                    'Recurring Price': 1
+                },
+                {
+                    'Item': 'test2',
+                    'Recurring Price': 2
+                },
+            ]
         }
         self.assert_no_fail(result)
-        self.assertEqual(json.loads(result.output), billing_json)
+        self.assertEqual(json.loads(result.output), hardware_server_billing)
 
     @mock.patch('SoftLayer.CLI.formatting.confirm')
     def test_create_hw_no_confirm(self, confirm_mock):