Skip to content

Fix unit tests #1048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 3, 2018
Merged

Fix unit tests #1048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec04e85
Fix unit tests
Oct 3, 2018
363266b
Removed unused import
Oct 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions SoftLayer/fixtures/SoftLayer_Account.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,11 +553,11 @@
'name': 'dal05'
},
'memoryCapacity': 242,
'name': 'khnguyendh',
'name': 'test-dedicated',
'diskCapacity': 1200,
'guestCount': 1,
'cpuCount': 56,
'id': 44701
'id': 12345
}]


Expand Down
38 changes: 19 additions & 19 deletions SoftLayer/fixtures/SoftLayer_Virtual_DedicatedHost.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,57 +11,57 @@


getAvailableRouters = [
{'hostname': 'bcr01a.dal05', 'id': 51218},
{'hostname': 'bcr02a.dal05', 'id': 83361},
{'hostname': 'bcr03a.dal05', 'id': 122762},
{'hostname': 'bcr04a.dal05', 'id': 147566}
{'hostname': 'bcr01a.dal05', 'id': 12345},
{'hostname': 'bcr02a.dal05', 'id': 12346},
{'hostname': 'bcr03a.dal05', 'id': 12347},
{'hostname': 'bcr04a.dal05', 'id': 12348}
]

getObjectById = {
'datacenter': {
'id': 138124,
'id': 12345,
'name': 'dal05',
'longName': 'Dallas 5'
},
'memoryCapacity': 242,
'modifyDate': '2017-11-06T11:38:20-06:00',
'name': 'khnguyendh',
'name': 'test-dedicated',
'diskCapacity': 1200,
'backendRouter': {
'domain': 'softlayer.com',
'domain': 'test.com',
'hostname': 'bcr01a.dal05',
'id': 51218
'id': 12345
},
'guestCount': 1,
'cpuCount': 56,
'guests': [{
'domain': 'Softlayer.com',
'hostname': 'khnguyenDHI',
'id': 43546081,
'uuid': '806a56ec-0383-4c2e-e6a9-7dc89c4b29a2'
'domain': 'test.com',
'hostname': 'test-dedicated',
'id': 12345,
'uuid': 'F9329795-4220-4B0A-B970-C86B950667FA'
}],
'billingItem': {
'nextInvoiceTotalRecurringAmount': 1515.556,
'orderItem': {
'id': 263060473,
'id': 12345,
'order': {
'status': 'APPROVED',
'privateCloudOrderFlag': False,
'modifyDate': '2017-11-02T11:42:50-07:00',
'orderQuoteId': '',
'userRecordId': 6908745,
'userRecordId': 12345,
'createDate': '2017-11-02T11:40:56-07:00',
'impersonatingUserRecordId': '',
'orderTypeId': 7,
'presaleEventId': '',
'userRecord': {
'username': '232298_khuong'
'username': 'test-dedicated'
},
'id': 20093269,
'accountId': 232298
'id': 12345,
'accountId': 12345
}
},
'id': 235379377,
'id': 12345,
'children': [
{
'nextInvoiceTotalRecurringAmount': 0.0,
Expand All @@ -73,6 +73,6 @@
}
]
},
'id': 44701,
'id': 12345,
'createDate': '2017-11-02T11:40:56-07:00'
}
120 changes: 49 additions & 71 deletions tests/CLI/modules/dedicatedhost_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"""
import json
import mock
import os
import SoftLayer

from SoftLayer.CLI import exceptions
Expand All @@ -29,21 +28,17 @@ def test_list_dedicated_hosts(self):
'datacenter': 'dal05',
'diskCapacity': 1200,
'guestCount': 1,
'id': 44701,
'id': 12345,
'memoryCapacity': 242,
'name': 'khnguyendh'
'name': 'test-dedicated'
}]
)

def tear_down(self):
if os.path.exists("test.txt"):
os.remove("test.txt")

def test_details(self):
mock = self.set_mock('SoftLayer_Virtual_DedicatedHost', 'getObject')
mock.return_value = SoftLayer_Virtual_DedicatedHost.getObjectById

result = self.run_command(['dedicatedhost', 'detail', '44701', '--price', '--guests'])
result = self.run_command(['dedicatedhost', 'detail', '12345', '--price', '--guests'])
self.assert_no_fail(result)

self.assertEqual(json.loads(result.output),
Expand All @@ -54,19 +49,19 @@ def test_details(self):
'disk capacity': 1200,
'guest count': 1,
'guests': [{
'domain': 'Softlayer.com',
'hostname': 'khnguyenDHI',
'id': 43546081,
'uuid': '806a56ec-0383-4c2e-e6a9-7dc89c4b29a2'
'domain': 'test.com',
'hostname': 'test-dedicated',
'id': 12345,
'uuid': 'F9329795-4220-4B0A-B970-C86B950667FA'
}],
'id': 44701,
'id': 12345,
'memory capacity': 242,
'modify date': '2017-11-06T11:38:20-06:00',
'name': 'khnguyendh',
'owner': '232298_khuong',
'name': 'test-dedicated',
'owner': 'test-dedicated',
'price_rate': 1515.556,
'router hostname': 'bcr01a.dal05',
'router id': 51218}
'router id': 12345}
)

def test_details_no_owner(self):
Expand All @@ -85,18 +80,18 @@ def test_details_no_owner(self):
'disk capacity': 1200,
'guest count': 1,
'guests': [{
'domain': 'Softlayer.com',
'hostname': 'khnguyenDHI',
'id': 43546081,
'uuid': '806a56ec-0383-4c2e-e6a9-7dc89c4b29a2'}],
'id': 44701,
'domain': 'test.com',
'hostname': 'test-dedicated',
'id': 12345,
'uuid': 'F9329795-4220-4B0A-B970-C86B950667FA'}],
'id': 12345,
'memory capacity': 242,
'modify date': '2017-11-06T11:38:20-06:00',
'name': 'khnguyendh',
'name': 'test-dedicated',
'owner': None,
'price_rate': 0,
'router hostname': 'bcr01a.dal05',
'router id': 51218}
'router id': 12345}
)

def test_create_options(self):
Expand Down Expand Up @@ -159,29 +154,29 @@ def test_create(self):
mock_package_obj.return_value = SoftLayer_Product_Package.getAllObjectsDH

result = self.run_command(['dedicatedhost', 'create',
'--hostname=host',
'--domain=example.com',
'--hostname=test-dedicated',
'--domain=test.com',
'--datacenter=dal05',
'--flavor=56_CORES_X_242_RAM_X_1_4_TB',
'--billing=hourly'])
self.assert_no_fail(result)
args = ({
'hardware': [{
'domain': 'example.com',
'domain': 'test.com',
'primaryBackendNetworkComponent': {
'router': {
'id': 51218
'id': 12345
}
},
'hostname': 'host'
}],
'prices': [{
'id': 200269
'hostname': 'test-dedicated'
}],
'useHourlyPricing': True,
'location': 'DALLAS05',
'packageId': 813,
'complexType': 'SoftLayer_Container_Product_Order_Virtual_DedicatedHost',
'useHourlyPricing': True,
'prices': [{
'id': 200269
}],
'quantity': 1},)

self.assert_called_with('SoftLayer_Product_Order', 'placeOrder',
Expand All @@ -195,21 +190,21 @@ def test_create_with_gpu(self):
mock_package_obj.return_value = SoftLayer_Product_Package.getAllObjectsDHGpu

result = self.run_command(['dedicatedhost', 'create',
'--hostname=host',
'--domain=example.com',
'--hostname=test-dedicated',
'--domain=test.com',
'--datacenter=dal05',
'--flavor=56_CORES_X_484_RAM_X_1_5_TB_X_2_GPU_P100',
'--billing=hourly'])
self.assert_no_fail(result)
args = ({
'hardware': [{
'domain': 'example.com',
'domain': 'test.com',
'primaryBackendNetworkComponent': {
'router': {
'id': 51218
'id': 12345
}
},
'hostname': 'host'
'hostname': 'test-dedicated'
}],
'prices': [{
'id': 200269
Expand All @@ -233,8 +228,8 @@ def test_create_verify(self):

result = self.run_command(['dedicatedhost', 'create',
'--verify',
'--hostname=host',
'--domain=example.com',
'--hostname=test-dedicated',
'--domain=test.com',
'--datacenter=dal05',
'--flavor=56_CORES_X_242_RAM_X_1_4_TB',
'--billing=hourly'])
Expand All @@ -244,12 +239,12 @@ def test_create_verify(self):
'useHourlyPricing': True,
'hardware': [{

'hostname': 'host',
'domain': 'example.com',
'hostname': 'test-dedicated',
'domain': 'test.com',

'primaryBackendNetworkComponent': {
'router': {
'id': 51218
'id': 12345
}
}
}],
Expand All @@ -263,8 +258,8 @@ def test_create_verify(self):

result = self.run_command(['dh', 'create',
'--verify',
'--hostname=host',
'--domain=example.com',
'--hostname=test-dedicated',
'--domain=test.com',
'--datacenter=dal05',
'--flavor=56_CORES_X_242_RAM_X_1_4_TB',
'--billing=monthly'])
Expand All @@ -273,11 +268,11 @@ def test_create_verify(self):
args = ({
'useHourlyPricing': True,
'hardware': [{
'hostname': 'host',
'domain': 'example.com',
'hostname': 'test-dedicated',
'domain': 'test.com',
'primaryBackendNetworkComponent': {
'router': {
'id': 51218
'id': 12345
}
}
}],
Expand All @@ -296,32 +291,15 @@ def test_create_aborted(self):
mock_package_obj.return_value = SoftLayer_Product_Package.getAllObjectsDH

result = self.run_command(['dh', 'create',
'--hostname=host',
'--domain=example.com',
'--hostname=test-dedicated',
'--domain=test.com',
'--datacenter=dal05',
'--flavor=56_CORES_X_242_RAM_X_1_4_TB',
'--billing=monthly'])

self.assertEqual(result.exit_code, 2)
self.assertIsInstance(result.exception, exceptions.CLIAbort)

def test_create_export(self):
mock_package_obj = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
mock_package_obj.return_value = SoftLayer_Product_Package.getAllObjectsDH
mock_package = self.set_mock('SoftLayer_Product_Order', 'verifyOrder')
mock_package.return_value = SoftLayer_Product_Package.verifyOrderDH

self.run_command(['dedicatedhost', 'create',
'--verify',
'--hostname=host',
'--domain=example.com',
'--datacenter=dal05',
'--flavor=56_CORES_X_242_RAM_X_1_4_TB',
'--billing=hourly',
'--export=test.txt'])

self.assertEqual(os.path.exists("test.txt"), True)

def test_create_verify_no_price_or_more_than_one(self):
mock_package_obj = self.set_mock('SoftLayer_Product_Package', 'getAllObjects')
mock_package_obj.return_value = SoftLayer_Product_Package.getAllObjectsDH
Expand All @@ -332,22 +310,22 @@ def test_create_verify_no_price_or_more_than_one(self):

result = self.run_command(['dedicatedhost', 'create',
'--verify',
'--hostname=host',
'--domain=example.com',
'--hostname=test-dedicated',
'--domain=test.com',
'--datacenter=dal05',
'--flavor=56_CORES_X_242_RAM_X_1_4_TB',
'--billing=hourly'])

self.assertIsInstance(result.exception, exceptions.ArgumentError)
args = ({
'hardware': [{
'domain': 'example.com',
'domain': 'test.com',
'primaryBackendNetworkComponent': {
'router': {
'id': 51218
'id': 12345
}
},
'hostname': 'host'
'hostname': 'test-dedicated'
}],
'prices': [{
'id': 200269
Expand Down
Loading