Merge "Remove nova-volume DB"

14 files changed, 19 insertions, 334 deletions

diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py
index 1978aa50a..e4c423fcc 100644
--- a/nova/tests/api/ec2/test_cloud.py
+++ b/nova/tests/api/ec2/test_cloud.py
@@ -2015,20 +2015,12 @@ class CloudTestCase(test.TestCase):
                 }
         self.stubs.Set(self.cloud.compute_api, 'get', fake_get)
 
-        def fake_volume_get(ctxt, volume_id, session=None):
-            if volume_id == 87654321:
-                return {'id': volume_id,
-                        'attach_time': '13:56:24',
-                        'status': 'in-use'}
-            raise exception.VolumeNotFound(volume_id=volume_id)
-        self.stubs.Set(db, 'volume_get', fake_volume_get)
-
         def fake_get_instance_uuid_by_ec2_id(ctxt, int_id):
             if int_id == 305419896:
                 return 'e5fe5518-0288-4fa3-b0c4-c79764101b85'
             raise exception.InstanceNotFound(instance_id=int_id)
         self.stubs.Set(db, 'get_instance_uuid_by_ec2_id',
-                       fake_get_instance_uuid_by_ec2_id)
+                        fake_get_instance_uuid_by_ec2_id)
 
         get_attribute = functools.partial(
             self.cloud.describe_instance_attribute,
diff --git a/nova/tests/api/openstack/compute/contrib/test_quota_classes.py b/nova/tests/api/openstack/compute/contrib/test_quota_classes.py
index b732f889c..a8d651977 100644
--- a/nova/tests/api/openstack/compute/contrib/test_quota_classes.py
+++ b/nova/tests/api/openstack/compute/contrib/test_quota_classes.py
@@ -24,11 +24,11 @@ from nova.tests.api.openstack import fakes
 
 def quota_set(class_name):
     return {'quota_class_set': {'id': class_name, 'metadata_items': 128,
-            'volumes': 10, 'gigabytes': 1000, 'ram': 51200,
-            'floating_ips': 10, 'instances': 10, 'injected_files': 5,
-            'cores': 20, 'injected_file_content_bytes': 10240,
-            'security_groups': 10, 'security_group_rules': 20,
-            'key_pairs': 100, 'injected_file_path_bytes': 255}}
+            'ram': 51200, 'floating_ips': 10, 'instances': 10,
+            'injected_files': 5, 'cores': 20,
+            'injected_file_content_bytes': 10240, 'security_groups': 10,
+            'security_group_rules': 20, 'key_pairs': 100,
+            'injected_file_path_bytes': 255}}
 
 
 class QuotaClassSetsTest(test.TestCase):
@@ -42,10 +42,8 @@ class QuotaClassSetsTest(test.TestCase):
             'instances': 10,
             'cores': 20,
             'ram': 51200,
-            'volumes': 10,
             'floating_ips': 10,
             'metadata_items': 128,
-            'gigabytes': 1000,
             'injected_files': 5,
             'injected_file_path_bytes': 255,
             'injected_file_content_bytes': 10240,
@@ -62,8 +60,6 @@ class QuotaClassSetsTest(test.TestCase):
         self.assertEqual(qs['instances'], 10)
         self.assertEqual(qs['cores'], 20)
         self.assertEqual(qs['ram'], 51200)
-        self.assertEqual(qs['volumes'], 10)
-        self.assertEqual(qs['gigabytes'], 1000)
         self.assertEqual(qs['floating_ips'], 10)
         self.assertEqual(qs['metadata_items'], 128)
         self.assertEqual(qs['injected_files'], 5)
@@ -89,8 +85,7 @@ class QuotaClassSetsTest(test.TestCase):
 
     def test_quotas_update_as_admin(self):
         body = {'quota_class_set': {'instances': 50, 'cores': 50,
-                                    'ram': 51200, 'volumes': 10,
-                                    'gigabytes': 1000, 'floating_ips': 10,
+                                    'ram': 51200, 'floating_ips': 10,
                                     'metadata_items': 128, 'injected_files': 5,
                                     'injected_file_content_bytes': 10240,
                                     'injected_file_path_bytes': 255,
@@ -108,8 +103,7 @@ class QuotaClassSetsTest(test.TestCase):
 
     def test_quotas_update_as_user(self):
         body = {'quota_class_set': {'instances': 50, 'cores': 50,
-                                    'ram': 51200, 'volumes': 10,
-                                    'gigabytes': 1000, 'floating_ips': 10,
+                                    'ram': 51200, 'floating_ips': 10,
                                     'metadata_items': 128, 'injected_files': 5,
                                     'injected_file_content_bytes': 10240,
                                     'security_groups': 10,
@@ -135,8 +129,6 @@ class QuotaTemplateXMLSerializerTest(test.TestCase):
                 metadata_items=10,
                 injected_file_path_bytes=255,
                 injected_file_content_bytes=20,
-                volumes=30,
-                gigabytes=40,
                 ram=50,
                 floating_ips=60,
                 instances=70,
@@ -162,8 +154,6 @@ class QuotaTemplateXMLSerializerTest(test.TestCase):
         exemplar = dict(quota_class_set=dict(
                 metadata_items='10',
                 injected_file_content_bytes='20',
-                volumes='30',
-                gigabytes='40',
                 ram='50',
                 floating_ips='60',
                 instances='70',
@@ -177,8 +167,6 @@ class QuotaTemplateXMLSerializerTest(test.TestCase):
                   '<metadata_items>10</metadata_items>'
                   '<injected_file_content_bytes>20'
                   '</injected_file_content_bytes>'
-                  '<volumes>30</volumes>'
-                  '<gigabytes>40</gigabytes>'
                   '<ram>50</ram>'
                   '<floating_ips>60</floating_ips>'
                   '<instances>70</instances>'
diff --git a/nova/tests/api/openstack/compute/contrib/test_quotas.py b/nova/tests/api/openstack/compute/contrib/test_quotas.py
index f628535a7..47761b6a1 100644
--- a/nova/tests/api/openstack/compute/contrib/test_quotas.py
+++ b/nova/tests/api/openstack/compute/contrib/test_quotas.py
@@ -25,8 +25,8 @@ from nova.tests.api.openstack import fakes
 
 
 def quota_set(id):
-    return {'quota_set': {'id': id, 'metadata_items': 128, 'volumes': 10,
-            'gigabytes': 1000, 'ram': 51200, 'floating_ips': 10,
+    return {'quota_set': {'id': id, 'metadata_items': 128,
+            'ram': 51200, 'floating_ips': 10,
             'instances': 10, 'injected_files': 5, 'cores': 20,
             'injected_file_content_bytes': 10240,
             'security_groups': 10, 'security_group_rules': 20,
@@ -44,10 +44,8 @@ class QuotaSetsTest(test.TestCase):
             'instances': 10,
             'cores': 20,
             'ram': 51200,
-            'volumes': 10,
             'floating_ips': 10,
             'metadata_items': 128,
-            'gigabytes': 1000,
             'injected_files': 5,
             'injected_file_path_bytes': 255,
             'injected_file_content_bytes': 10240,
@@ -63,8 +61,6 @@ class QuotaSetsTest(test.TestCase):
         self.assertEqual(qs['instances'], 10)
         self.assertEqual(qs['cores'], 20)
         self.assertEqual(qs['ram'], 51200)
-        self.assertEqual(qs['volumes'], 10)
-        self.assertEqual(qs['gigabytes'], 1000)
         self.assertEqual(qs['floating_ips'], 10)
         self.assertEqual(qs['metadata_items'], 128)
         self.assertEqual(qs['injected_files'], 5)
@@ -85,8 +81,6 @@ class QuotaSetsTest(test.TestCase):
                     'instances': 10,
                     'cores': 20,
                     'ram': 51200,
-                    'volumes': 10,
-                    'gigabytes': 1000,
                     'floating_ips': 10,
                     'metadata_items': 128,
                     'injected_files': 5,
@@ -113,8 +107,7 @@ class QuotaSetsTest(test.TestCase):
 
     def test_quotas_update_as_admin(self):
         body = {'quota_set': {'instances': 50, 'cores': 50,
-                              'ram': 51200, 'volumes': 10,
-                              'gigabytes': 1000, 'floating_ips': 10,
+                              'ram': 51200, 'floating_ips': 10,
                               'metadata_items': 128, 'injected_files': 5,
                               'injected_file_content_bytes': 10240,
                               'injected_file_path_bytes': 255,
@@ -130,8 +123,7 @@ class QuotaSetsTest(test.TestCase):
 
     def test_quotas_update_as_user(self):
         body = {'quota_set': {'instances': 50, 'cores': 50,
-                              'ram': 51200, 'volumes': 10,
-                              'gigabytes': 1000, 'floating_ips': 10,
+                              'ram': 51200, 'floating_ips': 10,
                               'metadata_items': 128, 'injected_files': 5,
                               'injected_file_content_bytes': 10240,
                               'security_groups': 10,
@@ -144,8 +136,7 @@ class QuotaSetsTest(test.TestCase):
 
     def test_quotas_update_invalid_limit(self):
         body = {'quota_set': {'instances': -2, 'cores': -2,
-                              'ram': -2, 'volumes': -2,
-                              'gigabytes': -2, 'floating_ips': -2,
+                              'ram': -2, 'floating_ips': -2,
                               'metadata_items': -2, 'injected_files': -2,
                               'injected_file_content_bytes': -2}}
 
@@ -167,8 +158,6 @@ class QuotaXMLSerializerTest(test.TestCase):
                 metadata_items=10,
                 injected_file_path_bytes=255,
                 injected_file_content_bytes=20,
-                volumes=30,
-                gigabytes=40,
                 ram=50,
                 floating_ips=60,
                 instances=70,
@@ -193,8 +182,6 @@ class QuotaXMLSerializerTest(test.TestCase):
         exemplar = dict(quota_set=dict(
                 metadata_items='10',
                 injected_file_content_bytes='20',
-                volumes='30',
-                gigabytes='40',
                 ram='50',
                 floating_ips='60',
                 instances='70',
@@ -208,8 +195,6 @@ class QuotaXMLSerializerTest(test.TestCase):
                   '<metadata_items>10</metadata_items>'
                   '<injected_file_content_bytes>20'
                   '</injected_file_content_bytes>'
-                  '<volumes>30</volumes>'
-                  '<gigabytes>40</gigabytes>'
                   '<ram>50</ram>'
                   '<floating_ips>60</floating_ips>'
                   '<instances>70</instances>'
diff --git a/nova/tests/api/openstack/compute/contrib/test_volumes.py b/nova/tests/api/openstack/compute/contrib/test_volumes.py
index 6c092cbd4..e91952728 100644
--- a/nova/tests/api/openstack/compute/contrib/test_volumes.py
+++ b/nova/tests/api/openstack/compute/contrib/test_volumes.py
@@ -136,16 +136,11 @@ class BootFromVolumeTest(test.TestCase):
                 '/dev/vda')
 
 
-def return_volume(context, volume_id):
-    return {'id': volume_id}
-
-
 class VolumeApiTest(test.TestCase):
     def setUp(self):
         super(VolumeApiTest, self).setUp()
         fakes.stub_out_networking(self.stubs)
         fakes.stub_out_rate_limiting(self.stubs)
-        self.stubs.Set(db, 'volume_get', return_volume)
 
         self.stubs.Set(cinder.API, "delete", fakes.stub_volume_delete)
         self.stubs.Set(cinder.API, "get", fakes.stub_volume_get)
diff --git a/nova/tests/api/openstack/compute/test_limits.py b/nova/tests/api/openstack/compute/test_limits.py
index 84c000035..32f2e1294 100644
--- a/nova/tests/api/openstack/compute/test_limits.py
+++ b/nova/tests/api/openstack/compute/test_limits.py
@@ -120,8 +120,6 @@ class LimitsControllerTest(BaseLimitTestSuite):
             'ram': 512,
             'instances': 5,
             'cores': 21,
-            'gigabytes': 512,
-            'volumes': 5,
             'key_pairs': 10,
             'floating_ips': 10,
             'security_groups': 10,
@@ -170,8 +168,6 @@ class LimitsControllerTest(BaseLimitTestSuite):
                     "maxTotalRAMSize": 512,
                     "maxTotalInstances": 5,
                     "maxTotalCores": 21,
-                    "maxTotalVolumeGigabytes": 512,
-                    "maxTotalVolumes": 5,
                     "maxTotalKeypairs": 10,
                     "maxTotalFloatingIps": 10,
                     "maxSecurityGroups": 10,
diff --git a/nova/tests/integrated/api_samples/limit-get-resp.json.tpl b/nova/tests/integrated/api_samples/limit-get-resp.json.tpl
index 376352ec4..7763dd683 100644
--- a/nova/tests/integrated/api_samples/limit-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/limit-get-resp.json.tpl
@@ -10,8 +10,6 @@
             "maxTotalInstances": 10,
             "maxTotalKeypairs": 100,
             "maxTotalRAMSize": 51200,
-            "maxTotalVolumeGigabytes": 1000,
-            "maxTotalVolumes": 10,
             "maxSecurityGroups": 10,
             "maxSecurityGroupRules": 20
         },
diff --git a/nova/tests/integrated/api_samples/limit-get-resp.xml.tpl b/nova/tests/integrated/api_samples/limit-get-resp.xml.tpl
index 25de4734a..860499f8d 100644
--- a/nova/tests/integrated/api_samples/limit-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/limit-get-resp.xml.tpl
@@ -21,11 +21,9 @@
     <limit name="maxPersonalitySize" value="10240"/>
     <limit name="maxSecurityGroupRules" value="20"/>
     <limit name="maxTotalKeypairs" value="100"/>
-    <limit name="maxTotalVolumes" value="10"/>
     <limit name="maxSecurityGroups" value="10"/>
     <limit name="maxTotalCores" value="20"/>
     <limit name="maxTotalFloatingIps" value="10"/>
-    <limit name="maxTotalVolumeGigabytes" value="1000"/>
     <limit name="maxTotalRAMSize" value="51200"/>
   </absolute>
 </limits>
diff --git a/nova/tests/integrated/api_samples/os-used-limits/usedlimits-get-resp.json.tpl b/nova/tests/integrated/api_samples/os-used-limits/usedlimits-get-resp.json.tpl
index 9c927eeef..3eef6c68b 100644
--- a/nova/tests/integrated/api_samples/os-used-limits/usedlimits-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-used-limits/usedlimits-get-resp.json.tpl
@@ -12,15 +12,11 @@
             "maxTotalInstances": 10,
             "maxTotalKeypairs": 100,
             "maxTotalRAMSize": 51200,
-            "maxTotalVolumeGigabytes": 1000,
-            "maxTotalVolumes": 10,
             "totalCoresUsed": 0,
             "totalInstancesUsed": 0,
             "totalKeyPairsUsed": 0,
             "totalRAMUsed": 0,
-            "totalSecurityGroupsUsed": 0,
-            "totalVolumeGigabytesUsed": 0,
-            "totalVolumesUsed": 0
+            "totalSecurityGroupsUsed": 0
         },
         "rate": [
             {
diff --git a/nova/tests/integrated/api_samples/os-used-limits/usedlimits-get-resp.xml.tpl b/nova/tests/integrated/api_samples/os-used-limits/usedlimits-get-resp.xml.tpl
index a11a577d0..b8e0396e8 100644
--- a/nova/tests/integrated/api_samples/os-used-limits/usedlimits-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-used-limits/usedlimits-get-resp.xml.tpl
@@ -19,20 +19,16 @@
     <limit name="maxPersonality" value="5"/>
     <limit name="maxImageMeta" value="128"/>
     <limit name="maxPersonalitySize" value="10240"/>
-    <limit name="totalVolumesUsed" value="0"/>
     <limit name="maxSecurityGroupRules" value="20"/>
     <limit name="maxTotalKeypairs" value="100"/>
     <limit name="totalCoresUsed" value="0"/>
-    <limit name="maxTotalVolumes" value="10"/>
     <limit name="totalRAMUsed" value="0"/>
     <limit name="totalInstancesUsed" value="0"/>
     <limit name="maxSecurityGroups" value="10"/>
-    <limit name="totalVolumeGigabytesUsed" value="0"/>
     <limit name="maxTotalCores" value="20"/>
     <limit name="totalSecurityGroupsUsed" value="0"/>
     <limit name="maxTotalFloatingIps" value="10"/>
     <limit name="totalKeyPairsUsed" value="0"/>
-    <limit name="maxTotalVolumeGigabytes" value="1000"/>
     <limit name="maxTotalRAMSize" value="51200"/>
   </absolute>
 </limits>
diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py
index 3ee449570..fb277bcb8 100644
--- a/nova/tests/test_db_api.py
+++ b/nova/tests/test_db_api.py
@@ -1082,187 +1082,3 @@ class InstanceDestroyConstraints(test.TestCase):
                           ctx, instance['uuid'], constraint)
         instance = db.instance_get_by_uuid(ctx, instance['uuid'])
         self.assertFalse(instance['deleted'])
-
-
-def _get_sm_backend_params():
-    config_params = ("name_label=testsmbackend "
-                     "server=localhost "
-                     "serverpath=/tmp/nfspath")
-    params = dict(flavor_id=1,
-                sr_uuid=None,
-                sr_type='nfs',
-                config_params=config_params)
-    return params
-
-
-def _get_sm_flavor_params():
-    params = dict(label="gold",
-                  description="automatic backups")
-    return params
-
-
-class SMVolumeDBApiTestCase(test.TestCase):
-    def setUp(self):
-        super(SMVolumeDBApiTestCase, self).setUp()
-        self.user_id = 'fake'
-        self.project_id = 'fake'
-        self.context = context.RequestContext(self.user_id, self.project_id)
-
-    def test_sm_backend_conf_create(self):
-        params = _get_sm_backend_params()
-        ctxt = context.get_admin_context()
-        beconf = db.sm_backend_conf_create(ctxt,
-                                           params)
-        self.assertIsInstance(beconf['id'], int)
-
-    def test_sm_backend_conf_create_raise_duplicate(self):
-        params = _get_sm_backend_params()
-        ctxt = context.get_admin_context()
-        beconf = db.sm_backend_conf_create(ctxt,
-                                           params)
-        self.assertIsInstance(beconf['id'], int)
-        self.assertRaises(exception.Duplicate,
-                          db.sm_backend_conf_create,
-                          ctxt,
-                          params)
-
-    def test_sm_backend_conf_update(self):
-        ctxt = context.get_admin_context()
-        params = _get_sm_backend_params()
-        beconf = db.sm_backend_conf_create(ctxt,
-                                           params)
-        beconf = db.sm_backend_conf_update(ctxt,
-                                           beconf['id'],
-                                           dict(sr_uuid="FA15E-1D"))
-        self.assertEqual(beconf['sr_uuid'], "FA15E-1D")
-
-    def test_sm_backend_conf_update_raise_notfound(self):
-        ctxt = context.get_admin_context()
-        self.assertRaises(exception.NotFound,
-                          db.sm_backend_conf_update,
-                          ctxt,
-                          7,
-                          dict(sr_uuid="FA15E-1D"))
-
-    def test_sm_backend_conf_get(self):
-        ctxt = context.get_admin_context()
-        params = _get_sm_backend_params()
-        beconf = db.sm_backend_conf_create(ctxt,
-                                           params)
-        val = db.sm_backend_conf_get(ctxt, beconf['id'])
-        self.assertDictMatch(dict(val), dict(beconf))
-
-    def test_sm_backend_conf_get_raise_notfound(self):
-        ctxt = context.get_admin_context()
-        self.assertRaises(exception.NotFound,
-                          db.sm_backend_conf_get,
-                          ctxt,
-                          7)
-
-    def test_sm_backend_conf_get_by_sr(self):
-        ctxt = context.get_admin_context()
-        params = _get_sm_backend_params()
-        beconf = db.sm_backend_conf_create(ctxt,
-                                           params)
-        val = db.sm_backend_conf_get_by_sr(ctxt, beconf['sr_uuid'])
-        self.assertDictMatch(dict(val), dict(beconf))
-
-    def test_sm_backend_conf_get_by_sr_raise_notfound(self):
-        ctxt = context.get_admin_context()
-        self.assertRaises(exception.NotFound,
-                          db.sm_backend_conf_get_by_sr,
-                          ctxt,
-                          "FA15E-1D")
-
-    def test_sm_backend_conf_delete(self):
-        ctxt = context.get_admin_context()
-        params = _get_sm_backend_params()
-        beconf = db.sm_backend_conf_create(ctxt,
-                                           params)
-        db.sm_backend_conf_delete(ctxt, beconf['id'])
-        self.assertRaises(exception.NotFound,
-                          db.sm_backend_conf_get,
-                          ctxt,
-                          beconf['id'])
-
-    def test_sm_backend_conf_delete_nonexisting(self):
-        ctxt = context.get_admin_context()
-        db.sm_backend_conf_delete(ctxt, "FA15E-1D")
-
-    def test_sm_flavor_create(self):
-        ctxt = context.get_admin_context()
-        params = _get_sm_flavor_params()
-        flav = db.sm_flavor_create(ctxt,
-                                   params)
-        self.assertIsInstance(flav['id'], int)
-
-    def sm_flavor_create_raise_duplicate(self):
-        ctxt = context.get_admin_context()
-        params = _get_sm_flavor_params()
-        flav = db.sm_flavor_create(ctxt,
-                                   params)
-        self.assertRaises(exception.Duplicate,
-                          db.sm_flavor_create,
-                          params)
-
-    def test_sm_flavor_update(self):
-        ctxt = context.get_admin_context()
-        params = _get_sm_flavor_params()
-        flav = db.sm_flavor_create(ctxt,
-                                   params)
-        newparms = dict(description="basic volumes")
-        flav = db.sm_flavor_update(ctxt, flav['id'], newparms)
-        self.assertEqual(flav['description'], "basic volumes")
-
-    def test_sm_flavor_update_raise_notfound(self):
-        ctxt = context.get_admin_context()
-        self.assertRaises(exception.NotFound,
-                          db.sm_flavor_update,
-                          ctxt,
-                          7,
-                          dict(description="fakedesc"))
-
-    def test_sm_flavor_delete(self):
-        ctxt = context.get_admin_context()
-        params = _get_sm_flavor_params()
-        flav = db.sm_flavor_create(ctxt,
-                                   params)
-        db.sm_flavor_delete(ctxt, flav['id'])
-        self.assertRaises(exception.NotFound,
-                          db.sm_flavor_get,
-                          ctxt,
-                          "gold")
-
-    def test_sm_flavor_delete_nonexisting(self):
-        ctxt = context.get_admin_context()
-        db.sm_flavor_delete(ctxt, 7)
-
-    def test_sm_flavor_get(self):
-        ctxt = context.get_admin_context()
-        params = _get_sm_flavor_params()
-        flav = db.sm_flavor_create(ctxt,
-                                   params)
-        val = db.sm_flavor_get(ctxt, flav['id'])
-        self.assertDictMatch(dict(val), dict(flav))
-
-    def test_sm_flavor_get_raise_notfound(self):
-        ctxt = context.get_admin_context()
-        self.assertRaises(exception.NotFound,
-                          db.sm_flavor_get,
-                          ctxt,
-                          7)
-
-    def test_sm_flavor_get_by_label(self):
-        ctxt = context.get_admin_context()
-        params = _get_sm_flavor_params()
-        flav = db.sm_flavor_create(ctxt,
-                                   params)
-        val = db.sm_flavor_get_by_label(ctxt, flav['label'])
-        self.assertDictMatch(dict(val), dict(flav))
-
-    def test_sm_flavor_get_by_label_raise_notfound(self):
-        ctxt = context.get_admin_context()
-        self.assertRaises(exception.NotFound,
-                          db.sm_flavor_get,
-                          ctxt,
-                          "fake")
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index ea35ff29e..6e49121f1 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -2071,12 +2071,6 @@ class LibvirtConnTestCase(test.TestCase):
         instance_ref = db.instance_create(self.context, self.test_instance)
         instance_ref = db.instance_update(self.context, instance_ref['uuid'],
                                           instance_dict)
-        vol_dict = {'status': 'migrating', 'size': 1}
-        volume_ref = db.volume_create(self.context, vol_dict)
-        db.volume_attached(self.context,
-                           volume_ref['id'],
-                           instance_ref['uuid'],
-                           '/dev/fake')
 
         # Preparing mocks
         vdmock = self.mox.CreateMock(libvirt.virDomain)
@@ -2107,10 +2101,7 @@ class LibvirtConnTestCase(test.TestCase):
         instance_ref = db.instance_get(self.context, instance_ref['id'])
         self.assertTrue(instance_ref['vm_state'] == vm_states.ACTIVE)
         self.assertTrue(instance_ref['power_state'] == power_state.RUNNING)
-        volume_ref = db.volume_get(self.context, volume_ref['id'])
-        self.assertTrue(volume_ref['status'] == 'in-use')
 
-        db.volume_destroy(self.context, volume_ref['id'])
         db.instance_destroy(self.context, instance_ref['uuid'])
 
     def test_pre_live_migration_works_correctly_mocked(self):
diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py
index ec5d452a5..ff316826a 100644
--- a/nova/tests/test_nova_manage.py
+++ b/nova/tests/test_nova_manage.py
@@ -360,13 +360,13 @@ class ProjectCommandsTestCase(test.TestCase):
         output = StringIO.StringIO()
         sys.stdout = output
         self.commands.quota(project_id='admin',
-                            key='volumes',
+                            key='instances',
                             value='unlimited',
                            )
 
         sys.stdout = sys.__stdout__
         result = output.getvalue()
-        self.assertEquals(('volumes: unlimited' in result), True)
+        self.assertEquals(('instances: unlimited' in result), True)
 
     def test_quota_update_invalid_key(self):
         self.assertRaises(SystemExit,
diff --git a/nova/tests/test_quota.py b/nova/tests/test_quota.py
index 5cc5dedde..26346276f 100644
--- a/nova/tests/test_quota.py
+++ b/nova/tests/test_quota.py
@@ -32,7 +32,6 @@ from nova import quota
 from nova.scheduler import driver as scheduler_driver
 from nova import test
 import nova.tests.image.fake
-from nova import volume
 
 
 FLAGS = flags.FLAGS
@@ -45,8 +44,6 @@ class QuotaIntegrationTestCase(test.TestCase):
         self.flags(compute_driver='nova.virt.fake.FakeDriver',
                    quota_instances=2,
                    quota_cores=4,
-                   quota_volumes=2,
-                   quota_gigabytes=20,
                    quota_floating_ips=1,
                    network_manager='nova.network.manager.FlatDHCPManager')
 
@@ -91,14 +88,6 @@ class QuotaIntegrationTestCase(test.TestCase):
         inst['vcpus'] = cores
         return db.instance_create(self.context, inst)
 
-    def _create_volume(self, size=10):
-        """Create a test volume"""
-        vol = {}
-        vol['user_id'] = self.user_id
-        vol['project_id'] = self.project_id
-        vol['size'] = size
-        return db.volume_create(self.context, vol)['id']
-
     def test_too_many_instances(self):
         instance_uuids = []
         for i in range(FLAGS.quota_instances):
@@ -742,8 +731,6 @@ class DbQuotaDriverTestCase(test.TestCase):
                 instances=10,
                 cores=20,
                 ram=50 * 1024,
-                volumes=10,
-                gigabytes=1000,
                 floating_ips=10,
                 metadata_items=128,
                 injected_files=5,
@@ -762,7 +749,6 @@ class DbQuotaDriverTestCase(test.TestCase):
             return dict(
                 instances=5,
                 ram=25 * 1024,
-                gigabytes=500,
                 metadata_items=64,
                 injected_file_content_bytes=5 * 1024,
                 )
@@ -778,8 +764,6 @@ class DbQuotaDriverTestCase(test.TestCase):
                 instances=5,
                 cores=20,
                 ram=25 * 1024,
-                volumes=10,
-                gigabytes=500,
                 floating_ips=10,
                 metadata_items=64,
                 injected_files=5,
@@ -799,7 +783,6 @@ class DbQuotaDriverTestCase(test.TestCase):
         self.assertEqual(result, dict(
                 instances=5,
                 ram=25 * 1024,
-                gigabytes=500,
                 metadata_items=64,
                 injected_file_content_bytes=5 * 1024,
                 ))
@@ -810,7 +793,6 @@ class DbQuotaDriverTestCase(test.TestCase):
             self.assertEqual(project_id, 'test_project')
             return dict(
                 cores=10,
-                gigabytes=50,
                 injected_files=2,
                 injected_file_path_bytes=127,
                 )
@@ -822,8 +804,6 @@ class DbQuotaDriverTestCase(test.TestCase):
                 instances=dict(in_use=2, reserved=2),
                 cores=dict(in_use=4, reserved=4),
                 ram=dict(in_use=10 * 1024, reserved=0),
-                volumes=dict(in_use=2, reserved=0),
-                gigabytes=dict(in_use=10, reserved=0),
                 floating_ips=dict(in_use=2, reserved=0),
                 metadata_items=dict(in_use=0, reserved=0),
                 injected_files=dict(in_use=0, reserved=0),
@@ -863,17 +843,7 @@ class DbQuotaDriverTestCase(test.TestCase):
                     in_use=10 * 1024,
                     reserved=0,
                     ),
-                volumes=dict(
-                    limit=10,
-                    in_use=2,
-                    reserved=0,
-                    ),
-                gigabytes=dict(
-                    limit=50,
-                    in_use=10,
-                    reserved=0,
-                    ),
-                floating_ips=dict(
+               floating_ips=dict(
                     limit=10,
                     in_use=2,
                     reserved=0,
@@ -941,17 +911,7 @@ class DbQuotaDriverTestCase(test.TestCase):
                     in_use=10 * 1024,
                     reserved=0,
                     ),
-                volumes=dict(
-                    limit=10,
-                    in_use=2,
-                    reserved=0,
-                    ),
-                gigabytes=dict(
-                    limit=50,
-                    in_use=10,
-                    reserved=0,
-                    ),
-                floating_ips=dict(
+               floating_ips=dict(
                     limit=10,
                     in_use=2,
                     reserved=0,
@@ -1020,16 +980,6 @@ class DbQuotaDriverTestCase(test.TestCase):
                     in_use=10 * 1024,
                     reserved=0,
                     ),
-                volumes=dict(
-                    limit=10,
-                    in_use=2,
-                    reserved=0,
-                    ),
-                gigabytes=dict(
-                    limit=50,
-                    in_use=10,
-                    reserved=0,
-                    ),
                 floating_ips=dict(
                     limit=10,
                     in_use=2,
@@ -1089,12 +1039,7 @@ class DbQuotaDriverTestCase(test.TestCase):
                     in_use=4,
                     reserved=4,
                     ),
-                gigabytes=dict(
-                    limit=50,
-                    in_use=10,
-                    reserved=0,
-                    ),
-                injected_files=dict(
+               injected_files=dict(
                     limit=2,
                     in_use=0,
                     reserved=0,
@@ -1126,12 +1071,6 @@ class DbQuotaDriverTestCase(test.TestCase):
                 ram=dict(
                     limit=25 * 1024,
                     ),
-                volumes=dict(
-                    limit=10,
-                    ),
-                gigabytes=dict(
-                    limit=50,
-                    ),
                 floating_ips=dict(
                     limit=10,
                     ),
@@ -1207,7 +1146,6 @@ class DbQuotaDriverTestCase(test.TestCase):
                                                      'test_class'),
                                          quota.QUOTAS._resources,
                                          ['instances', 'cores', 'ram',
-                                          'volumes', 'gigabytes',
                                           'floating_ips', 'security_groups'],
                                          True)
 
@@ -1216,8 +1154,6 @@ class DbQuotaDriverTestCase(test.TestCase):
                 instances=10,
                 cores=20,
                 ram=50 * 1024,
-                volumes=10,
-                gigabytes=1000,
                 floating_ips=10,
                 security_groups=10,
                 ))
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 54f7948b6..a145d1675 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -235,7 +235,6 @@ class XenAPIVolumeTestCase(stubs.XenAPITestBase):
         """This shows how to test Ops classes' methods."""
         stubs.stubout_session(self.stubs, stubs.FakeSessionForVolumeTests)
         conn = xenapi_conn.XenAPIDriver(fake.FakeVirtAPI(), False)
-        volume = self._create_volume()
         instance = db.instance_create(self.context, self.instance_values)
         vm = xenapi_fake.create_vm(instance.name, 'Running')
         result = conn.attach_volume(self._make_connection_info(),
@@ -253,7 +252,6 @@ class XenAPIVolumeTestCase(stubs.XenAPITestBase):
         stubs.stubout_session(self.stubs,
                               stubs.FakeSessionForVolumeFailedTests)
         conn = xenapi_conn.XenAPIDriver(fake.FakeVirtAPI(), False)
-        volume = self._create_volume()
         instance = db.instance_create(self.context, self.instance_values)
         xenapi_fake.create_vm(instance.name, 'Running')
         self.assertRaises(exception.VolumeDriverNotFound,