openstack/placement
Code Issues Proposed changes

Merge "'limit' and 'marker' support for db_api and keypair_obj"

Browse Source
This commit is contained in:
Jenkins
2016-07-12 16:31:42 +00:00
committed by Gerrit Code Review
parent 58120ab82e ad2a9b00a8
commit 2714909fe8
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nova/db/api.py
View File

@@ -964,9 +964,10 @@ def key_pair_get(context, user_id, name):
return IMPL.key_pair_get(context, user_id, name)
def key_pair_get_all_by_user(context, user_id):
def key_pair_get_all_by_user(context, user_id, limit=None, marker=None):
"""Get all key_pairs by user."""
return IMPL.key_pair_get_all_by_user(context, user_id)
return IMPL.key_pair_get_all_by_user(
context, user_id, limit=limit, marker=marker)
def key_pair_count_by_user(context, user_id):

19
nova/db/sqlalchemy/api.py
View File

@@ -2929,10 +2929,21 @@ def key_pair_get(context, user_id, name):
@require_context
@main_context_manager.reader
def key_pair_get_all_by_user(context, user_id):
return model_query(context, models.KeyPair, read_deleted="no").\
filter_by(user_id=user_id).\
all()
def key_pair_get_all_by_user(context, user_id, limit=None, marker=None):
marker_row = None
if marker is not None:
marker_row = model_query(context, models.KeyPair, read_deleted="no").\
filter_by(name=marker).filter_by(user_id=user_id).first()
if not marker_row:
raise exception.MarkerNotFound(marker=marker)
query = model_query(context, models.KeyPair, read_deleted="no").\
filter_by(user_id=user_id)
query = sqlalchemyutils.paginate_query(
query, models.KeyPair, limit, ['name'], marker=marker_row)
return query.all()
@require_context