Merge pull request #1564 from caberos/issue1562

Add Item names to vs billing report

Author: allmightyspiff

SoftLayer/CLI/virt/billing.py

@@ -28,11 +28,11 @@ def cli(env, identifier):
     table.add_row(['Billing Item Id', utils.lookup(result, 'billingItem', 'id')])
     table.add_row(['Recurring Fee', utils.lookup(result, 'billingItem', 'recurringFee')])
     table.add_row(['Total', utils.lookup(result, 'billingItem', 'nextInvoiceTotalRecurringAmount')])
-    table.add_row(['Provision Date', utils.lookup(result, 'billingItem', 'provisionDate')])
+    table.add_row(['Provision Date', utils.lookup(result, 'provisionDate')])
 
-    price_table = formatting.Table(['Recurring Price'])
+    price_table = formatting.Table(['Description', 'Recurring Price'])
     for item in utils.lookup(result, 'billingItem', 'children') or []:
-        price_table.add_row([item['nextInvoiceTotalRecurringAmount']])
+        price_table.add_row([item['description'], item['nextInvoiceTotalRecurringAmount']])
 
     table.add_row(['prices', price_table])
     env.fout(table)

SoftLayer/fixtures/SoftLayer_Virtual_Guest.py

@@ -8,16 +8,31 @@
         'id': 6327,
         'nextInvoiceTotalRecurringAmount': 1.54,
         'children': [
-            {'categoryCode': 'port_speed',
-             'nextInvoiceTotalRecurringAmount': 1},
-            {'categoryCode': 'guest_core',
-             'nextInvoiceTotalRecurringAmount': 1},
-            {'categoryCode': 'ram',
-             'nextInvoiceTotalRecurringAmount': 1},
-            {'categoryCode': 'guest_core',
-             'nextInvoiceTotalRecurringAmount': 1},
-            {'categoryCode': 'guest_disk1',
-             'nextInvoiceTotalRecurringAmount': 1},
+            {
+                'categoryCode': 'ram',
+                'description': '1 GB',
+                'nextInvoiceTotalRecurringAmount': 1
+            },
+            {
+                'categoryCode': 'remote_management',
+                'description': 'Reboot / Remote Console',
+                'nextInvoiceTotalRecurringAmount': 1
+            },
+            {
+                'categoryCode': 'port_speed',
+                'description': '1 Gbps Public & Private Network Uplinks',
+                'nextInvoiceTotalRecurringAmount': 1
+            },
+            {
+                'categoryCode': 'public_port',
+                'description': '1 Gbps Public Uplink',
+                'nextInvoiceTotalRecurringAmount': 1
+            },
+            {
+                'categoryCode': 'service_port',
+                'description': '1 Gbps Private Uplink',
+                'nextInvoiceTotalRecurringAmount': 1
+            }
         ],
         'package': {
             "id": 835,

SoftLayer/managers/vs.py

@@ -245,7 +245,7 @@ def get_instance(self, instance_id, **kwargs):
                 'userData,'
                 '''billingItem[id,nextInvoiceTotalRecurringAmount,
                                package[id,keyName],
-                               children[categoryCode,nextInvoiceTotalRecurringAmount],
+                               children[description,categoryCode,nextInvoiceTotalRecurringAmount],
                                orderItem[id,
                                          order.userRecord[username],
                                          preset.keyName]],'''

tests/CLI/modules/vs/vs_tests.py

@@ -323,7 +323,7 @@ def test_create_options_prices(self):
 
     def test_create_options_prices_location(self):
         result = self.run_command(['vs', 'create-options', '--prices', 'dal13',
-                                  '--vsi-type', 'TRANSIENT_CLOUD_SERVER'])
+                                   '--vsi-type', 'TRANSIENT_CLOUD_SERVER'])
         self.assert_no_fail(result)
 
     @mock.patch('SoftLayer.CLI.formatting.confirm')
@@ -345,19 +345,19 @@ def test_dns_sync_both(self, confirm_mock):
                                            'getResourceRecords')
         getResourceRecords.return_value = []
         createAargs = ({
-            'type': 'a',
-            'host': 'vs-test1',
-            'domainId': 12345,  # from SoftLayer_Account::getDomains
-            'data': '172.16.240.2',
-            'ttl': 7200
-        },)
+                           'type': 'a',
+                           'host': 'vs-test1',
+                           'domainId': 12345,  # from SoftLayer_Account::getDomains
+                           'data': '172.16.240.2',
+                           'ttl': 7200
+                       },)
         createPTRargs = ({
-            'type': 'ptr',
-            'host': '2',
-            'domainId': 123456,
-            'data': 'vs-test1.test.sftlyr.ws',
-            'ttl': 7200
-        },)
+                             'type': 'ptr',
+                             'host': '2',
+                             'domainId': 123456,
+                             'data': 'vs-test1.test.sftlyr.ws',
+                             'ttl': 7200
+                         },)
 
         result = self.run_command(['vs', 'dns-sync', '100'])
 
@@ -400,12 +400,12 @@ def test_dns_sync_v6(self, confirm_mock):
             }
         }
         createV6args = ({
-            'type': 'aaaa',
-            'host': 'vs-test1',
-            'domainId': 12345,
-            'data': '2607:f0d0:1b01:0023:0000:0000:0000:0004',
-            'ttl': 7200
-        },)
+                            'type': 'aaaa',
+                            'host': 'vs-test1',
+                            'domainId': 12345,
+                            'data': '2607:f0d0:1b01:0023:0000:0000:0000:0004',
+                            'ttl': 7200
+                        },)
         guest.return_value = test_guest
         result = self.run_command(['vs', 'dns-sync', '--aaaa-record', '100'])
         self.assert_no_fail(result)
@@ -822,11 +822,11 @@ def test_billing(self):
             'Recurring Fee': None,
             'Total': 1.54,
             'prices': [
-                {'Recurring Price': 1},
-                {'Recurring Price': 1},
-                {'Recurring Price': 1},
-                {'Recurring Price': 1},
-                {'Recurring Price': 1}
+                {'Description': '1 GB', 'Recurring Price': 1},
+                {'Description': 'Reboot / Remote Console', 'Recurring Price': 1},
+                {'Description': '1 Gbps Public & Private Network Uplinks', 'Recurring Price': 1},
+                {'Description': '1 Gbps Public Uplink', 'Recurring Price': 1},
+                {'Description': '1 Gbps Private Uplink', 'Recurring Price': 1}
             ]
         }
         self.assert_no_fail(result)