Merge pull request #1780 from BrianSantivanez/issue1777

Match `virtual detail --prices` option with `hardware detail --prices` option

Author: allmightyspiff

SoftLayer/CLI/virt/detail.py

@@ -97,12 +97,9 @@ def cli(env, identifier, passwords=False, price=False):
         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])
+        if total_price != 0:
+            table.add_row(['Prices', _price_table(utils.lookup(result, 'billingItem'), total_price)])
+            table.add_row(['Price rate', total_price])
 
     if passwords:
         pass_table = formatting.Table(['software', 'username', 'password'])
@@ -156,6 +153,17 @@ def _bw_table(bw_data):
     return table
 
 
+def _price_table(billing_item, total_price):
+    """Returns an item table"""
+    price_table = formatting.Table(['Item', 'CategoryCode', 'Recurring Price'])
+    price_table.add_row(['Total', '-', total_price])
+    items = billing_item['nextInvoiceChildren']
+    for item in items:
+        if item.get('recurringFee') is not None:
+            price_table.add_row([item['description'], item['categoryCode'], item['recurringFee']])
+    return price_table
+
+
 def _cli_helper_dedicated_host(env, result, table):
     """Get details on dedicated host for a virtual server."""
 

SoftLayer/fixtures/SoftLayer_Virtual_Guest.py

@@ -34,6 +34,60 @@
                 'nextInvoiceTotalRecurringAmount': 1
             }
         ],
+        "nextInvoiceChildren": [
+            {
+                "allowCancellationFlag": 1,
+                "associatedBillingItemId": "738974962",
+                "cancellationDate": "2022-11-03T23:00:01-06:00",
+                "categoryCode": "os_usage",
+                "createDate": "2022-10-04T17:00:08-06:00",
+                "cycleStartDate": "2022-10-04T17:00:08-06:00",
+                "description": "CentOS 8.x Usage is 743.9997 hours Used",
+                "id": 999303609,
+                "laborFee": "0",
+                "laborFeeTaxRate": "0",
+                "lastBillDate": None,
+                "modifyDate": None,
+                "nextBillDate": "2022-11-03T23:00:00-06:00",
+                "oneTimeFee": "0",
+                "oneTimeFeeTaxRate": "0",
+                "orderItemId": None,
+                "parentId": None,
+                "recurringFee": "0",
+                "recurringFeeTaxRate": "0",
+                "recurringMonths": 1,
+                "serviceProviderId": 1,
+                "setupFee": "0",
+                "setupFeeTaxRate": "0",
+                "associatedBillingItem": None
+            },
+            {
+                "allowCancellationFlag": 1,
+                "associatedBillingItemId": "738974962",
+                "cancellationDate": "2022-11-03T23:00:01-06:00",
+                "categoryCode": "guest_core_usage",
+                "createDate": "2022-10-04T17:00:09-06:00",
+                "cycleStartDate": "2022-10-04T17:00:09-06:00",
+                "description": "CPU Cores: a suspendable product.",
+                "id": 999303621,
+                "laborFee": "0",
+                "laborFeeTaxRate": "0",
+                "lastBillDate": None,
+                "modifyDate": None,
+                "nextBillDate": "2022-11-03T23:00:00-06:00",
+                "oneTimeFee": "0",
+                "oneTimeFeeTaxRate": "0",
+                "orderItemId": None,
+                "parentId": None,
+                "recurringFee": "1.54",
+                "recurringFeeTaxRate": "0",
+                "recurringMonths": 1,
+                "serviceProviderId": 1,
+                "setupFee": "0",
+                "setupFeeTaxRate": "0",
+                "associatedBillingItem": None
+            },
+        ],
         'package': {
             "id": 835,
             "keyName": "PUBLIC_CLOUD_SERVER"

SoftLayer/managers/vs.py

@@ -246,6 +246,10 @@ def get_instance(self, instance_id, **kwargs):
                 '''billingItem[id,nextInvoiceTotalRecurringAmount,
                                package[id,keyName],
                                children[description,categoryCode,nextInvoiceTotalRecurringAmount],
+                               nextInvoiceChildren[description,
+                                                   categoryCode,
+                                                   recurringFee,
+                                                   nextInvoiceTotalRecurringAmount],
                                orderItem[id,
                                          order.userRecord[username],
                                          preset.keyName]],'''

tests/CLI/modules/vs/vs_tests.py

@@ -167,7 +167,7 @@ def test_detail_vs(self):
         self.assert_no_fail(result)
         output = json.loads(result.output)
         self.assertEqual(output['notes'], 'notes')
-        self.assertEqual(output['price_rate'], 6.54)
+        self.assertEqual(output['Price rate'], 1.54)
         self.assertEqual(output['users'][0]['username'], 'user')
         self.assertEqual(output['vlans'][0]['number'], 23)
         self.assertEqual(output['owner'], 'chechu')