Skip to content

fix the isue 1262 #1268

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
allmightyspiff merged 1 commit into from
Apr 30, 2020
Merged

fix the isue 1262 #1268

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
33 changes: 14 additions & 19 deletions SoftLayer/managers/ordering.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,14 +251,13 @@ def list_categories(self, package_keyname, **kwargs):
:param str package_keyname: The package for which to get the categories.
:returns: List of categories associated with the package
"""
get_kwargs = {}
get_kwargs['mask'] = kwargs.get('mask', CATEGORY_MASK)
kwargs['mask'] = kwargs.get('mask', CATEGORY_MASK)

if 'filter' in kwargs:
get_kwargs['filter'] = kwargs['filter']
kwargs['filter'] = kwargs['filter']

package = self.get_package_by_key(package_keyname, mask='id')
categories = self.package_svc.getConfiguration(id=package['id'], **get_kwargs)
categories = self.package_svc.getConfiguration(id=package['id'], **kwargs)
return categories

def list_items(self, package_keyname, **kwargs):
Expand All @@ -268,14 +267,11 @@ def list_items(self, package_keyname, **kwargs):
:returns: List of items in the package

"""
get_kwargs = {}
get_kwargs['mask'] = kwargs.get('mask', ITEM_MASK)

if 'filter' in kwargs:
get_kwargs['filter'] = kwargs['filter']
if 'mask' not in kwargs:
kwargs['mask'] = ITEM_MASK

package = self.get_package_by_key(package_keyname, mask='id')
items = self.package_svc.getItems(id=package['id'], **get_kwargs)
items = self.package_svc.getItems(id=package['id'], **kwargs)
return items

def list_packages(self, **kwargs):
Expand All @@ -284,13 +280,12 @@ def list_packages(self, **kwargs):
:returns: List of active packages.

"""
get_kwargs = {}
get_kwargs['mask'] = kwargs.get('mask', PACKAGE_MASK)
kwargs['mask'] = kwargs.get('mask', PACKAGE_MASK)

if 'filter' in kwargs:
get_kwargs['filter'] = kwargs['filter']
kwargs['filter'] = kwargs['filter']

packages = self.package_svc.getAllObjects(**get_kwargs)
packages = self.package_svc.getAllObjects(**kwargs)

return [package for package in packages if package['isActive']]

Expand All @@ -301,15 +296,15 @@ def list_presets(self, package_keyname, **kwargs):
:returns: A list of package presets that can be used for ordering

"""
get_kwargs = {}
get_kwargs['mask'] = kwargs.get('mask', PRESET_MASK)

kwargs['mask'] = kwargs.get('mask', PRESET_MASK)

if 'filter' in kwargs:
get_kwargs['filter'] = kwargs['filter']
kwargs['filter'] = kwargs['filter']

package = self.get_package_by_key(package_keyname, mask='id')
acc_presets = self.package_svc.getAccountRestrictedActivePresets(id=package['id'], **get_kwargs)
active_presets = self.package_svc.getActivePresets(id=package['id'], **get_kwargs)
acc_presets = self.package_svc.getAccountRestrictedActivePresets(id=package['id'], **kwargs)
active_presets = self.package_svc.getActivePresets(id=package['id'], **kwargs)
return active_presets + acc_presets

def get_preset_by_key(self, package_keyname, preset_keyname, mask=None):
Expand Down