diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-08-05 14:15:53 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-08-05 14:15:53 -0400 |
| commit | 681d3e2bfac2aa8e19cb393591b99efcbcdd8230 (patch) | |
| tree | 419eac2c0c0036cd04f7e477c2ef1e812321426c /nova | |
| parent | d76046a76fd086d5a09f9b7cdf94f61e740a63e6 (diff) | |
| download | nova-681d3e2bfac2aa8e19cb393591b99efcbcdd8230.tar.gz nova-681d3e2bfac2aa8e19cb393591b99efcbcdd8230.tar.xz nova-681d3e2bfac2aa8e19cb393591b99efcbcdd8230.zip | |
re-enabling sort_key/sort_dir and fixing filters line
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/image/glance.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nova/image/glance.py b/nova/image/glance.py index ccb1b7ec0..23749e560 100644 --- a/nova/image/glance.py +++ b/nova/image/glance.py @@ -116,10 +116,11 @@ class GlanceImageService(service.BaseImageService): def _extract_query_params(self, params): _params = {} - accepted_params = ('filters', 'marker', 'limit') - #'sort_key', 'sort_dir') + accepted_params = ('filters', 'marker', 'limit', + 'sort_key', 'sort_dir') for param in accepted_params: - _params[param] = params.get(param) + if param in params: + _params[param] = params.get(param) return _params @@ -128,7 +129,7 @@ class GlanceImageService(service.BaseImageService): self._set_client_context(context) # ensure filters is a dict - kwargs['filters'] = kwargs['filters'] or {} + kwargs['filters'] = kwargs.get('filters', {}) # NOTE(vish): don't filter out private images kwargs['filters'].setdefault('is_public', 'none') |