Merge "Fixed method db.api.reservation_expire"

cinder/db/sqlalchemy/models.py

@@ -245,6 +245,12 @@ class Reservation(BASE, CinderBase):
     delta = Column(Integer)
     expire = Column(DateTime, nullable=False)
 
+    usage = relationship(
+        "QuotaUsage",
+        foreign_keys=usage_id,
+        primaryjoin='and_(Reservation.usage_id == QuotaUsage.id,'
+                         'QuotaUsage.deleted == 0)')
+
 
 class Snapshot(BASE, CinderBase):
     """Represents a block storage device that can be attached to a VM."""

cinder/tests/test_db_api.py

@@ -443,7 +443,6 @@ class DBAPIReservationTestCase(BaseTest):
         self.assertEqual(expected, db.quota_usage_get_all_by_project(
                                             self.ctxt, 'project1'))
 
-    @test.testtools.skip("bug 1185325")
     def test_reservation_expire(self):
         self.values['expire'] = datetime.utcnow() + timedelta(days=1)
         reservations = _quota_reserve(self.ctxt, 'project1')