From 33af4ffba2a1232aeb7c756327fbcdc7f674c30a Mon Sep 17 00:00:00 2001 From: Khuong-Nguyen Date: Fri, 13 Apr 2018 11:16:49 -0500 Subject: [PATCH 1/2] Added filter for accountRestrictedActivePresets --- SoftLayer/managers/ordering.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/SoftLayer/managers/ordering.py b/SoftLayer/managers/ordering.py index 12744dcee..4ac1b1509 100644 --- a/SoftLayer/managers/ordering.py +++ b/SoftLayer/managers/ordering.py @@ -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) From 4246cbfa8406ea6a568ed29eab2fe47695d1aef6 Mon Sep 17 00:00:00 2001 From: Khuong-Nguyen Date: Fri, 13 Apr 2018 11:22:28 -0500 Subject: [PATCH 2/2] Fixed unit test --- tests/managers/ordering_tests.py | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/tests/managers/ordering_tests.py b/tests/managers/ordering_tests.py index 276249cdf..f3ccfaaab 100644 --- a/tests/managers/ordering_tests.py +++ b/tests/managers/ordering_tests.py @@ -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'] @@ -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 = []