update from origin

Author: ATGE

SoftLayer/fixtures/SoftLayer_Billing_Order.py

@@ -45,3 +45,28 @@
         'orderApprovalDate': '2019-09-15T13:13:13-06:00',
         'orderTotalAmount': '0'
     }]
+
+getObject = {
+    'accountId': 1234,
+    'createDate': '2020-09-23T16:22:30-06:00',
+    'id': 6543210,
+    'impersonatingUserRecordId': None,
+    'initialInvoice': {
+        'amount': '0',
+        'id': 60012345,
+        'invoiceTotalAmount': '0'
+    },
+    'items': [{
+        'description': 'Dual Intel Xeon Silver 4210 (20 Cores, 2.20 GHz)'
+    }],
+    'modifyDate': '2020-09-23T16:22:32-06:00',
+    'orderQuoteId': None,
+    'orderTypeId': 11,
+    'presaleEventId': None,
+    'privateCloudOrderFlag': False,
+    'status': 'APPROVED',
+    'userRecord': {
+        'displayName': 'testUser'
+    },
+    'userRecordId': 7654321,
+}

tests/CLI/modules/order_tests.py

@@ -406,6 +406,13 @@ def _get_verified_order_return(self):
                   'recurringFee': '150'}
         return {'orderContainers': [{'prices': [price1, price2]}]}
 
+    def test_order_lookup(self):
+        result = self.run_command(['order', 'lookup', '12345'])
+        self.assert_no_fail(result)
+        self.assert_called_with('SoftLayer_Billing_Order', 'getObject', identifier='12345')
+        self.assertIn('Ordered By', result.output)
+        self.assertIn('Initial Invoice', result.output)
+
 
 def _get_all_packages():
     package_type = {'keyName': 'BARE_METAL_CPU'}

tests/managers/ordering_tests.py

@@ -731,7 +731,7 @@ def test_get_item_capacity_core(self):
                 "capacity": "1",
                 "id": 10201,
                 "keyName": "GUEST_CORE_1_DEDICATED",
-        }]
+            }]
 
         item_capacity = self.ordering.get_item_capacity(items, ['GUEST_CORE_1_DEDICATED', 'OS_RHEL_7_X_LAMP_64_BIT'])
 
@@ -748,7 +748,7 @@ def test_get_item_capacity_storage(self):
                 "capacity": "1",
                 "id": 10201,
                 "keyName": "READHEAVY_TIER",
-        }]
+            }]
 
         item_capacity = self.ordering.get_item_capacity(items, ['READHEAVY_TIER', 'STORAGE_SPACE_FOR_2_IOPS_PER_GB'])
 
@@ -766,7 +766,7 @@ def test_get_item_capacity_intel(self):
                 "capacity": "1",
                 "id": 10201,
                 "keyName": "GUEST_CORE_1_DEDICATED",
-        }]
+            }]
 
         item_capacity = self.ordering.get_item_capacity(items, ['INTEL_XEON_2690_2_60', 'BANDWIDTH_20000_GB'])
 
@@ -805,3 +805,24 @@ def test_get_item_prices_by_location(self):
 
         self.assertEqual(options[0]['item']['keyName'], item_prices[0]['item']['keyName'])
         self.assertEqual(options[0]['hourlyRecurringFee'], item_prices[0]['hourlyRecurringFee'])
+
+    def test_get_oder_detail_mask(self):
+        order_id = 12345
+        test_mask = 'mask[id]'
+        self.ordering.get_order_detail(order_id, mask=test_mask)
+        self.assert_called_with('SoftLayer_Billing_Order', 'getObject', identifier=order_id, mask=test_mask)
+
+    def test_get_oder_detail_default_mask(self):
+        order_id = 12345
+        _default_mask = (
+            'mask[orderTotalAmount,orderApprovalDate,'
+            'initialInvoice[id,amount,invoiceTotalAmount,'
+            'invoiceTopLevelItems[id, description, hostName, domainName, oneTimeAfterTaxAmount,'
+            'recurringAfterTaxAmount, createDate,'
+            'categoryCode,'
+            'category[name],'
+            'location[name],'
+            'children[id, category[name], description, oneTimeAfterTaxAmount,recurringAfterTaxAmount]]],'
+            'items[description],userRecord[displayName,userStatus]]')
+        self.ordering.get_order_detail(order_id)
+        self.assert_called_with('SoftLayer_Billing_Order', 'getObject', identifier=order_id, mask=_default_mask)