summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-05-25 19:32:11 +0000
committerGerrit Code Review <review@openstack.org>2012-05-25 19:32:11 +0000
commita75486d6240cd9291face18108326eafd6273acd (patch)
tree050962e3631b6b90a99bd8216d43e1422ad89843 /nova/api
parentd9de51ac52307ac017b1e7cee5320c9d4915b16e (diff)
parentf88f3ed42c83730b28d4da2b3a51ce7fb7d19221 (diff)
downloadnova-a75486d6240cd9291face18108326eafd6273acd.tar.gz
nova-a75486d6240cd9291face18108326eafd6273acd.tar.xz
nova-a75486d6240cd9291face18108326eafd6273acd.zip
Merge "Bugfix in simple_tenant_usage API detail view"
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/contrib/simple_tenant_usage.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/contrib/simple_tenant_usage.py b/nova/api/openstack/compute/contrib/simple_tenant_usage.py
index 7914a1dd3..5f8765de5 100644
--- a/nova/api/openstack/compute/contrib/simple_tenant_usage.py
+++ b/nova/api/openstack/compute/contrib/simple_tenant_usage.py
@@ -202,10 +202,11 @@ class SimpleTenantUsageController(object):
def _get_datetime_range(self, req):
qs = req.environ.get('QUERY_STRING', '')
env = urlparse.parse_qs(qs)
+ # NOTE(lzyeval): env.get() always returns a list
period_start = self._parse_datetime(env.get('start', [None])[0])
period_stop = self._parse_datetime(env.get('end', [None])[0])
- detailed = bool(env.get('detailed', False))
+ detailed = env.get('detailed', ['0'])[0] == '1'
return (period_start, period_stop, detailed)
@wsgi.serializers(xml=SimpleTenantUsagesTemplate)