openstack/deb-senlin
Code Issues Proposed changes

Fix profile list tricky errors

Browse Source 
Passing keyword arguments is different from passing positional
arguments. This patch fixes the behavior of profile listing so that the
default 'marker' argument from python-openstacksdk is always respected.
This commit is contained in:
tengqm
2015-01-26 20:37:25 +08:00
parent 8aa7e32667
commit c6b1b4b1b8
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
senlin/db/api.py
View File

@@ -205,8 +205,9 @@ def profile_get(context, profile_id):
def profile_get_all(context, limit=None, marker=None, sort_keys=None,
sort_dir=None, filters=None, show_deleted=False):
return IMPL.profile_get_all(context, limit, marker, sort_keys,
sort_dir, filters, show_deleted)
return IMPL.profile_get_all(context, limit=limit, marker=marker,
sort_keys=sort_keys, sort_dir=sort_dir,
filters=filters, show_deleted=show_deleted)
def profile_update(context, profile_id, values):

8
senlin/db/sqlalchemy/api.py
View File

@@ -544,15 +544,11 @@ def profile_get(context, profile_id):
return profile
def _query_profile_get_all(context, show_deleted=False):
query = soft_delete_aware_query(context, models.Profile,
show_deleted=show_deleted)
return query
def profile_get_all(context, limit=None, marker=None, sort_keys=None,
sort_dir=None, filters=None, show_deleted=False):
query = _query_profile_get_all(context, show_deleted=show_deleted)
query = soft_delete_aware_query(context, models.Profile,
show_deleted=show_deleted)
if filters is None:
filters = {}

9
senlin/engine/service.py
View File

@@ -133,9 +133,12 @@ class EngineService(service.Service):
@request_context
def profile_list(self, context, limit=None, marker=None, sort_keys=None,
sort_dir=None, filters=None, show_deleted=False):
profiles = profile_base.Profile.load_all(context, limit, marker,
sort_keys, sort_dir, filters,
show_deleted)
profiles = profile_base.Profile.load_all(context, limit=limit,
marker=marker,
sort_keys=sort_keys,
sort_dir=sort_dir,
filters=filters,
show_deleted=show_deleted)
return [p.to_dict() for p in profiles]

7
senlin/profiles/base.py
View File

@@ -97,8 +97,11 @@ class Profile(object):
'''
Retrieve all profiles from database.
'''
records = db_api.profile_get_all(context, limit, marker, sort_keys,
sort_dir, filters, show_deleted)
records = db_api.profile_get_all(context, limit=limit, marker=marker,
sort_keys=sort_keys,
sort_dir=sort_dir,
filters=filters,
show_deleted=show_deleted)
for record in records:
yield cls.from_db_record(context, record)