openstack/python-aodhclient
Code Issues Proposed changes

Merge "Fixed history parameter having no effect on search"

Browse Source
This commit is contained in:
Jenkins
2015-11-24 16:01:58 +00:00
committed by Gerrit Code Review
parent 4025a4612d e78c1ea566
commit 06ffd3c164
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gnocchiclient/v1/resource.py
View File

@@ -31,7 +31,7 @@ def _get_pagination_options(details=False, history=False,
for sort in sorts or []:
options.append("sort=%s" % urllib_parse.quote(sort))
if options:
return "?%s" % "&".join(options)
return "%s" % "&".join(options)
else:
return ""
@@ -58,7 +58,8 @@ class ResourceManager(base.Manager):
:type sorts: list of str
"""
qs = _get_pagination_options(details, history, limit, marker, sorts)
return self._get(self.url + resource_type + qs).json()
url = "%s%s?%s" % (self.url, resource_type, qs)
return self._get(url).json()
def get(self, resource_type, resource_id, history=False):
"""Get a resource
@@ -159,7 +160,7 @@ class ResourceManager(base.Manager):
"""
query = query or {}
qs = _get_pagination_options(details, False, limit, marker, sorts)
qs = _get_pagination_options(details, history, limit, marker, sorts)
url = "v1/search/resource/%s?%s" % (resource_type, qs)
return self._post(
url, headers={'Content-Type': "application/json"},