Split resource_setup for compute volumes tests
Split up the resource_setup method for the compute volumes tests,
per the latest spec.
Partially-implements bp:resource-cleanup
Change-Id: If65a8378dbe06bf5ca4f1865bae3c67cbea75fc1
diff --git a/tempest/api/compute/volumes/test_attach_volume.py b/tempest/api/compute/volumes/test_attach_volume.py
index 64ea555..5b15a08 100644
--- a/tempest/api/compute/volumes/test_attach_volume.py
+++ b/tempest/api/compute/volumes/test_attach_volume.py
@@ -30,14 +30,22 @@
self.attachment = None
@classmethod
- def resource_setup(cls):
- cls.prepare_instance_network()
- super(AttachVolumeTestJSON, cls).resource_setup()
- cls.device = CONF.compute.volume_device_name
+ def skip_checks(cls):
+ super(AttachVolumeTestJSON, cls).skip_checks()
if not CONF.service_available.cinder:
skip_msg = ("%s skipped as Cinder is not available" % cls.__name__)
raise cls.skipException(skip_msg)
+ @classmethod
+ def setup_credentials(cls):
+ cls.prepare_instance_network()
+ super(AttachVolumeTestJSON, cls).setup_credentials()
+
+ @classmethod
+ def resource_setup(cls):
+ super(AttachVolumeTestJSON, cls).resource_setup()
+ cls.device = CONF.compute.volume_device_name
+
def _detach(self, server_id, volume_id):
if self.attachment:
self.servers_client.detach_volume(server_id, volume_id)
diff --git a/tempest/api/compute/volumes/test_volumes_get.py b/tempest/api/compute/volumes/test_volumes_get.py
index 69998d2..aa4fb52 100644
--- a/tempest/api/compute/volumes/test_volumes_get.py
+++ b/tempest/api/compute/volumes/test_volumes_get.py
@@ -27,13 +27,17 @@
class VolumesGetTestJSON(base.BaseV2ComputeTest):
@classmethod
- def resource_setup(cls):
- super(VolumesGetTestJSON, cls).resource_setup()
- cls.client = cls.volumes_extensions_client
+ def skip_checks(cls):
+ super(VolumesGetTestJSON, cls).skip_checks()
if not CONF.service_available.cinder:
skip_msg = ("%s skipped as Cinder is not available" % cls.__name__)
raise cls.skipException(skip_msg)
+ @classmethod
+ def setup_clients(cls):
+ super(VolumesGetTestJSON, cls).setup_clients()
+ cls.client = cls.volumes_extensions_client
+
@test.attr(type='smoke')
def test_volume_create_get_delete(self):
# CREATE, GET, DELETE Volume
diff --git a/tempest/api/compute/volumes/test_volumes_list.py b/tempest/api/compute/volumes/test_volumes_list.py
index ba7ee6b..cb74876 100644
--- a/tempest/api/compute/volumes/test_volumes_list.py
+++ b/tempest/api/compute/volumes/test_volumes_list.py
@@ -32,12 +32,20 @@
"""
@classmethod
- def resource_setup(cls):
- super(VolumesTestJSON, cls).resource_setup()
- cls.client = cls.volumes_extensions_client
+ def skip_checks(cls):
+ super(VolumesTestJSON, cls).skip_checks()
if not CONF.service_available.cinder:
skip_msg = ("%s skipped as Cinder is not available" % cls.__name__)
raise cls.skipException(skip_msg)
+
+ @classmethod
+ def setup_clients(cls):
+ super(VolumesTestJSON, cls).setup_clients()
+ cls.client = cls.volumes_extensions_client
+
+ @classmethod
+ def resource_setup(cls):
+ super(VolumesTestJSON, cls).resource_setup()
# Create 3 Volumes
cls.volume_list = []
cls.volume_id_list = []
diff --git a/tempest/api/compute/volumes/test_volumes_negative.py b/tempest/api/compute/volumes/test_volumes_negative.py
index ed54aaf..53217c9 100644
--- a/tempest/api/compute/volumes/test_volumes_negative.py
+++ b/tempest/api/compute/volumes/test_volumes_negative.py
@@ -28,13 +28,17 @@
class VolumesNegativeTest(base.BaseV2ComputeTest):
@classmethod
- def resource_setup(cls):
- super(VolumesNegativeTest, cls).resource_setup()
- cls.client = cls.volumes_extensions_client
+ def skip_checks(cls):
+ super(VolumesNegativeTest, cls).skip_checks()
if not CONF.service_available.cinder:
skip_msg = ("%s skipped as Cinder is not available" % cls.__name__)
raise cls.skipException(skip_msg)
+ @classmethod
+ def setup_clients(cls):
+ super(VolumesNegativeTest, cls).setup_clients()
+ cls.client = cls.volumes_extensions_client
+
@test.attr(type=['negative', 'gate'])
def test_volume_get_nonexistent_volume_id(self):
# Negative: Should not be able to get details of nonexistent volume