openstack
/
neutron
Code Issues Proposed changes

Fix query in get_reservations_for_resources 

For PostgreSQL if you're using GROUP BY everything in the SELECT
list must be an aggregate SUM(...) or used in the GROUP BY.
For reference:
http://www.postgresql.org/message-id/200402271700.28133.dev@archonet.com
Closes-bug: #1486467

Change-Id: Ieb4ead5c785ff17f580bfbc58f370a491733d96d
This commit is contained in:
Ann Kamyshnikova 2015-08-19 14:19:11 +03:00
parent da1ea9a455
commit 9ebc9f8083
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/db/quota/api.py
View File

@ -280,7 +280,8 @@ def get_reservations_for_resources(context, tenant_id, resources,
quota_models.Reservation.tenant_id == tenant_id,
quota_models.ResourceDelta.resource.in_(resources),
exp_expr)).group_by(
quota_models.ResourceDelta.resource)
quota_models.ResourceDelta.resource,
quota_models.Reservation.expiration)
return dict((resource, total_reserved)
for (resource, exp, total_reserved) in resv_query)