From: Ann Kamyshnikova <akamyshnikova@mirantis.com>
Date: Wed, 19 Aug 2015 11:19:11 +0000 (+0300)
Subject: Fix query in get_reservations_for_resources
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=9ebc9f808316ca249348d2c5cd2b9762373f96dd;p=openstack-build%2Fneutron-build.git

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
---

diff --git a/neutron/db/quota/api.py b/neutron/db/quota/api.py
index 9657db079..92394761b 100644
--- a/neutron/db/quota/api.py
+++ b/neutron/db/quota/api.py
@@ -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)