Merge "Split out NestedQuotas into a separate driver"

diff --cc cinder/exception.py
Simple merge

diff --cc cinder/quota.py
Simple merge

diff --cc cinder/tests/unit/test_quota.py
index 9a1bee456499f8673b4fc19b7035490238dbc237,d90f102356a69f4c0bd6016a95f4296a45b72b93..cebce9a296f2f6d2319760a7061f0710b50bb685
--- 1/cinder/tests/unit/test_quota.py
--- 2/cinder/tests/unit/test_quota.py
+++ b/cinder/tests/unit/test_quota.py
@@@ -888,16 -876,10 +879,16 @@@ class VolumeTypeQuotaEngineTestCase(tes
          db.volume_type_destroy(ctx, vtype['id'])
          db.volume_type_destroy(ctx, vtype2['id'])
  
 +    def test_update_quota_resource(self):
 +        ctx = context.RequestContext('admin', 'admin', is_admin=True)
 +
 +        engine = quota.VolumeTypeQuotaEngine()
 +        engine.update_quota_resource(ctx, 'type1', 'type2')
 +
  
- class DbQuotaDriverTestCase(test.TestCase):
+ class DbQuotaDriverBaseTestCase(test.TestCase):
      def setUp(self):
-         super(DbQuotaDriverTestCase, self).setUp()
+         super(DbQuotaDriverBaseTestCase, self).setUp()
  
          self.flags(quota_volumes=10,
                     quota_snapshots=10,