Skip to content

Presets filter #963

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
Apr 13, 2018
Merged

Presets filter #963

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
33af4ff
Added filter for accountRestrictedActivePresets
Apr 13, 2018
4246cbf
Fixed unit test
Apr 13, 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
13 changes: 12 additions & 1 deletion SoftLayer/managers/ordering.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,18 @@ def list_presets(self, package_keyname, **kwargs):
def get_preset_by_key(self, package_keyname, preset_keyname, mask=None):
"""Gets a single preset with the given key."""
preset_operation = '_= %s' % preset_keyname
_filter = {'activePresets': {'keyName': {'operation': preset_operation}}}
_filter = {
'activePresets': {
'keyName': {
'operation': preset_operation
}
},
'accountRestrictedActivePresets': {
'keyName': {
'operation': preset_operation
}
}
}

presets = self.list_presets(package_keyname, mask=mask, filter=_filter)

Expand Down
27 changes: 24 additions & 3 deletions tests/managers/ordering_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,18 @@ def test_list_presets(self):

def test_get_preset_by_key(self):
keyname = 'PRESET_KEYNAME'
preset_filter = {'activePresets': {'keyName': {'operation': '_= %s' % keyname}}}
preset_filter = {
'activePresets': {
'keyName': {
'operation': '_= %s' % keyname
}
},
'accountRestrictedActivePresets': {
'keyName': {
'operation': '_= %s' % keyname
}
}
}

with mock.patch.object(self.ordering, 'list_presets') as list_mock:
list_mock.return_value = ['preset1']
Expand All @@ -213,8 +224,18 @@ def test_get_preset_by_key(self):

def test_get_preset_by_key_preset_not_found(self):
keyname = 'PRESET_KEYNAME'
preset_filter = {'activePresets': {'keyName': {'operation': '_= %s' % keyname}}}

preset_filter = {
'activePresets': {
'keyName': {
'operation': '_= %s' % keyname
}
},
'accountRestrictedActivePresets': {
'keyName': {
'operation': '_= %s' % keyname
}
}
}
with mock.patch.object(self.ordering, 'list_presets') as list_mock:
list_mock.return_value = []

Expand Down