Merge "Fix quota reservation expiration"

3 files changed, 27 insertions, 0 deletions

diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index 65d5eb5e0..8b8322276 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -496,6 +496,12 @@ class Reservation(BASE, NovaBase):
     delta = Column(Integer)
     expire = Column(DateTime, nullable=False)
 
+    usage = relationship(
+        "QuotaUsage",
+        foreign_keys=usage_id,
+        primaryjoin='and_(Reservation.usage_id == QuotaUsage.id,'
+                         'QuotaUsage.deleted == False)')
+
 
 class Snapshot(BASE, NovaBase):
     """Represents a block storage device that can be attached to a VM."""
diff --git a/nova/tests/api/openstack/compute/test_limits.py b/nova/tests/api/openstack/compute/test_limits.py
index 059deabf7..2a3038267 100644
--- a/nova/tests/api/openstack/compute/test_limits.py
+++ b/nova/tests/api/openstack/compute/test_limits.py
@@ -794,6 +794,7 @@ class WsgiLimiterProxyTest(BaseLimitTestSuite):
     def tearDown(self):
         # restore original HTTPConnection object
         httplib.HTTPConnection = self.oldHTTPConnection
+        super(WsgiLimiterProxyTest, self).tearDown()
 
 
 class LimitsViewBuilderTest(test.TestCase):
diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py
index 794c578d6..8dddef173 100644
--- a/nova/tests/test_quota.py
+++ b/nova/tests/test_quota.py
@@ -228,6 +228,26 @@ class QuotaIntegrationTestCase(test.TestCase):
         self.assertRaises(exception.QuotaError,
                           self._create_with_injected_files, files)
 
+    def test_reservation_expire(self):
+        timeutils.set_time_override()
+
+        def assertInstancesReserved(reserved):
+            result = quota.QUOTAS.get_project_quotas(self.context,
+                                                     self.context.project_id)
+            self.assertEqual(result['instances']['reserved'], reserved)
+
+        quota.QUOTAS.reserve(self.context,
+                             expire=60,
+                             instances=2)
+
+        assertInstancesReserved(2)
+
+        timeutils.advance_time_seconds(80)
+
+        result = quota.QUOTAS.expire(self.context)
+
+        assertInstancesReserved(0)
+
 
 class FakeContext(object):
     def __init__(self, project_id, quota_class):