From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 21 Aug 2015 23:50:33 +0000 (+0000)
Subject: Merge "Do not query reservations table when counting resources"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1ed7f85c44785d3217aae568bc6fd5b8ec6da92f;p=openstack-build%2Fneutron-build.git

Merge "Do not query reservations table when counting resources"
---

1ed7f85c44785d3217aae568bc6fd5b8ec6da92f
diff --cc neutron/quota/resource.py
index a5f9c039b,1b5e73939..900013d80
--- a/neutron/quota/resource.py
+++ b/neutron/quota/resource.py
@@@ -233,13 -232,9 +233,10 @@@ class TrackedResource(BaseResource)
                    {'tenant_id': tenant_id, 'resource': self.name})
          in_use = context.session.query(self._model_class).filter_by(
              tenant_id=tenant_id).count()
-         reservations = quota_api.get_reservations_for_resources(
-             context, tenant_id, [self.name])
-         reserved = reservations.get(self.name, 0)
          # Update quota usage
-         return self._resync(context, tenant_id, in_use, reserved)
+         return self._resync(context, tenant_id, in_use, reserved=0)
  
 +    @lockutils.synchronized('dirty_tenants')
      def count(self, context, _plugin, tenant_id, resync_usage=False):
          """Return the current usage count for the resource.