Merge pull request #497 from sergiocarlosmorales/fix-server-recurring…

…-cost Fix server cost reporting
softlayer · Mar 5, 2015 · 84a5a7f · 84a5a7f
2 parents 61710a2 + 3817497
commit 84a5a7f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/SoftLayer/CLI/server/detail.py b/SoftLayer/CLI/server/detail.py
@@ -80,7 +80,9 @@ def cli(env, identifier, passwords, price):
 
     if price:
         table.add_row(['price rate',
-                       result['billingItem']['recurringFee']])
+                       utils.lookup(result,
+                                    'billingItem',
+                                    'nextInvoiceTotalRecurringAmount')])
 
     if passwords:
         pass_table = formatting.Table(['username', 'password'])

diff --git a/SoftLayer/managers/hardware.py b/SoftLayer/managers/hardware.py
@@ -288,7 +288,7 @@ def get_hardware(self, hardware_id, **kwargs):
                                                         version,
                                                         referenceCode]],
                     passwords[username,password]]''',
-                'billingItem.recurringFee',
+                'billingItem.nextInvoiceTotalRecurringAmount',
                 'hourlyBillingFlag',
                 'tagReferences[id,tag[name,id]]',
                 'networkVlans[id,vlanNumber,networkSpace]',

diff --git a/SoftLayer/testing/fixtures/SoftLayer_Hardware_Server.py b/SoftLayer/testing/fixtures/SoftLayer_Hardware_Server.py
@@ -6,6 +6,7 @@
     'billingItem': {
         'id': 6327,
         'recurringFee': 1.54,
+        'nextInvoiceTotalRecurringAmount': 16.08,
         'orderItem': {
             'order': {
                 'userRecord': {

diff --git a/SoftLayer/tests/CLI/modules/server_tests.py b/SoftLayer/tests/CLI/modules/server_tests.py
@@ -116,7 +116,7 @@ def test_server_details(self):
             'notes': 'These are test notes.',
             'os': 'Ubuntu',
             'owner': 'chechu',
-            'price rate': 1.54,
+            'price rate': 16.08,
             'private_ip': '10.1.0.2',
             'ptr': '2.0.1.10.in-addr.arpa',
             'public_ip': '172.16.1.100',