adding basic tests

Neetuj · Neetuj · commit c2124610eaae · 2015-01-02T14:26:44.000-06:00
diff --git a/SoftLayer/CLI/billing/info.py b/SoftLayer/CLI/billing/info.py
@@ -16,6 +16,7 @@ def cli(env):
     billing = SoftLayer.BillingManager(env.client)
     table = formatting.Table(['Name', 'Value'])
     info = billing.get_info()
+    table.add_row(['accountId', info['accountId']])
     table.add_row(['id', info['id']])
     table.add_row(['paymentTerms', info['paymentTerms']])
     table.add_row(['modifyDate', info['modifyDate']])
diff --git a/SoftLayer/CLI/billing/summary.py b/SoftLayer/CLI/billing/summary.py
@@ -15,9 +15,10 @@ def cli(env):
     """List billing summary."""
     billing = SoftLayer.BillingManager(env.client)
     table = formatting.Table(['Name', 'Value'])
-    balance = billing.get_balance()
-    next_balance = billing.get_next_balance()
-    last_bill_date = billing.get_latest_bill_date()
+    result = billing.get_summary()
+    balance = result['balance']
+    next_balance = result['nextbalance']
+    last_bill_date = result['lastbilldate']
     table.add_row(['Current Balance', balance])
     table.add_row(['Estimated Next Balance', next_balance])
     table.add_row(['Last Billing Date', last_bill_date])
diff --git a/SoftLayer/managers/billing.py b/SoftLayer/managers/billing.py
@@ -62,6 +62,18 @@ def get_latest_bill_date(self):
         result = self.account.getLatestBillDate()
         return result
 
+    def get_summary(self):
+        """get summary
+
+        :return: billing account info
+        """
+        result = {
+            'lastbilldate': self.get_latest_bill_date(),
+            'balance': self.get_balance(),
+            'nextbalance': self.get_next_balance()
+        }
+        return result
+
     def get_next_bill_items(self):
         """get next bill items
 
@@ -163,8 +175,8 @@ def list_resources(self, from_date=None, to_date=None, **kwargs):
                                             'operation':
                                                 item['billingItem']['id']}}}}})
                     if virtual_guest:
-                        cost = virtual_guest[0]['billingItem']['currentHourly' \
-                                                               'Charge']
+                        guest = virtual_guest[0]
+                        cost = guest['billingItem']['currentHourlyCharge']
 
                 else:
                     create_date = datetime.datetime.strptime(
diff --git a/SoftLayer/testing/fixtures/SoftLayer_Account.py b/SoftLayer/testing/fixtures/SoftLayer_Account.py
@@ -459,3 +459,35 @@
     'name': 'TestQuote1234',
     'quoteKey': '1234test4321',
 }]
+
+
+getOrders = [{
+    'id': 1234,
+    'resourceType': '1 x 2.0 GHz Core',
+    'hostName': 'test',
+    'createDate': '2014-05-01T14:03:04-07:00',
+    'cost': 0.0
+}]
+
+getBillingInfo = [{
+    'id': 1234,
+    'accountId': 123,
+    'resourceType': '1 x 2.0 GHz Core',
+    'hostName': 'test',
+    'modifyDate': '2014-05-01T14:03:04-07:00',
+    'createDate': '2014-05-01T14:03:04-07:00',
+    'anniversaryDayOfMonth': 2,
+    'percentDiscountOnetime': 2,
+    'sparePoolAmount': 0,
+    'currency': {
+        'KeyName': 'usd',
+        'id': 1,
+        'name': 'dollars'
+    }
+}]
+
+getLatestBillDate = '2014-05-01T14:03:04-07:00'
+
+getBalance = 40
+
+getNextInvoiceTotalAmount = 2
diff --git a/SoftLayer/testing/fixtures/SoftLayer_Billing_Order.py b/SoftLayer/testing/fixtures/SoftLayer_Billing_Order.py
@@ -0,0 +1,14 @@
+getItems = [{
+    'description': '1 x 2.0 GHz Core',
+    'billingItem': {
+        'setupFee': '0',
+        'createDate': '2014-11-12T14:54:05-06:00',
+        'oneTimeFee': '0', 'cancellationDate': '',
+        'id': 1234,
+        'hostName': 'testhost',
+        'laborFee': '0'
+    }
+}]
+
+getOrderTotalOneTime = 0.0
+getOrderTotalRecurring = 0.0
diff --git a/SoftLayer/tests/managers/billing_tests.py b/SoftLayer/tests/managers/billing_tests.py
@@ -0,0 +1,29 @@
+"""
+    SoftLayer.tests.managers.ticket_tests
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    :license: MIT, see LICENSE for more details.
+"""
+import SoftLayer
+from SoftLayer import testing
+
+
+class BillingTests(testing.TestCase):
+
+    def set_up(self):
+        self.billing = SoftLayer.BillingManager(self.client)
+
+    def test_list_billing_items(self):
+        self.billing.list_resources()
+        self.assert_called_with('SoftLayer_Account', 'getOrders')
+
+    def test_billing_info(self):
+        self.billing.get_info()
+        self.assert_called_with('SoftLayer_Account', 'getBillingInfo')
+
+    def test_billing_summary(self):
+        self.billing.get_summary()
+        self.assert_called_with('SoftLayer_Account',
+                                'getNextInvoiceTotalAmount')
+        self.assert_called_with('SoftLayer_Account', 'getLatestBillDate')
+        self.assert_called_with('SoftLayer_Account', 'getBalance')
