Skip to content

Allow bare metal ordering of account restricted presets #955

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 1 commit into from
Mar 27, 2018
Merged

Allow bare metal ordering of account restricted presets #955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 20 additions & 8 deletions SoftLayer/fixtures/SoftLayer_Product_Package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,15 +666,27 @@
]
}

activePreset1 = {
'description': 'Single Xeon 1270, 8GB Ram, 2x1TB SATA disks, Non-RAID',
'id': 64,
'isActive': '1',
'keyName': 'S1270_8GB_2X1TBSATA_NORAID',
'name': 'S1270 8GB 2X1TBSATA NORAID',
'packageId': 200
}

activePreset2 = {
'description': 'Dual Xeon Gold, 384GB Ram, 4x960GB SSD, RAID 10',
'id': 65,
'isActive': '1',
'keyName': 'DGOLD_6140_384GB_4X960GB_SSD_SED_RAID_10',
'name': 'DGOLD 6140 384GB 4X960GB SSD SED RAID 10',
'packageId': 200
}

getAllObjects = [{
'activePresets': [{
'description': 'Single Xeon 1270, 8GB Ram, 2x1TB SATA disks, Non-RAID',
'id': 64,
'isActive': '1',
'keyName': 'S1270_8GB_2X1TBSATA_NORAID',
'name': 'S1270 8GB 2X1TBSATA NORAID',
'packageId': 200
}],
'activePresets': [activePreset1],
'accountRestrictedActivePresets': [activePreset2],
'description': 'Bare Metal Server',
'firstOrderStepId': 1,
'id': 200,
Expand Down
5 changes: 3 additions & 2 deletions SoftLayer/managers/hardware.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ def get_create_options(self):

# Sizes
sizes = []
for preset in package['activePresets']:
for preset in package['activePresets'] + package['accountRestrictedActivePresets']:
sizes.append({
'name': preset['description'],
'key': preset['keyName']
Expand Down Expand Up @@ -418,6 +418,7 @@ def _get_package(self):
prices
],
activePresets,
accountRestrictedActivePresets,
regions[location[location[priceGroups]]]
'''

Expand Down Expand Up @@ -774,7 +775,7 @@ def _get_location(package, location):

def _get_preset_id(package, size):
"""Get the preset id given the keyName of the preset."""
for preset in package['activePresets']:
for preset in package['activePresets'] + package['accountRestrictedActivePresets']:
if preset['keyName'] == size or preset['id'] == size:
return preset['id']

Expand Down
4 changes: 3 additions & 1 deletion tests/CLI/modules/server_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,9 @@ def test_create_options(self):
expected = [
[{'datacenter': 'Washington 1', 'value': 'wdc01'}],
[{'size': 'Single Xeon 1270, 8GB Ram, 2x1TB SATA disks, Non-RAID',
'value': 'S1270_8GB_2X1TBSATA_NORAID'}],
'value': 'S1270_8GB_2X1TBSATA_NORAID'},
{'size': 'Dual Xeon Gold, 384GB Ram, 4x960GB SSD, RAID 10',
'value': 'DGOLD_6140_384GB_4X960GB_SSD_SED_RAID_10'}],
[{'operating_system': 'Ubuntu / 14.04-64',
'value': 'UBUNTU_14_64'}],
[{'port_speed': '10 Mbps Public & Private Network Uplinks',
Expand Down
14 changes: 10 additions & 4 deletions tests/managers/hardware_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,16 @@ def test_get_create_options(self):
'key': '10',
'name': '10 Mbps Public & Private Network Uplinks'
}],
'sizes': [{
'key': 'S1270_8GB_2X1TBSATA_NORAID',
'name': 'Single Xeon 1270, 8GB Ram, 2x1TB SATA disks, Non-RAID'
}]
'sizes': [
{
'key': 'S1270_8GB_2X1TBSATA_NORAID',
'name': 'Single Xeon 1270, 8GB Ram, 2x1TB SATA disks, Non-RAID'
},
{
'key': 'DGOLD_6140_384GB_4X960GB_SSD_SED_RAID_10',
'name': 'Dual Xeon Gold, 384GB Ram, 4x960GB SSD, RAID 10'
}
]
}

self.assertEqual(options, expected)
Expand Down