Migrate scenario tests to resource_* fixtures
Partially-implements bp resource-cleanup
Change-Id: Ib6ad8614c6d1a84e32dd31d27f899df02eed260a
diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index 559f3d5..429d0e3 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -58,8 +58,8 @@
"""
@classmethod
- def setUpClass(cls):
- super(ScenarioTest, cls).setUpClass()
+ def resource_setup(cls):
+ super(ScenarioTest, cls).resource_setup()
# Using tempest client for isolated credentials as well
cls.isolated_creds = isolated_creds.IsolatedCreds(
cls.__name__, network_resources=cls.network_resources)
@@ -483,8 +483,8 @@
raise cls.skipException('Neutron not available')
@classmethod
- def setUpClass(cls):
- super(NetworkScenarioTest, cls).setUpClass()
+ def resource_setup(cls):
+ super(NetworkScenarioTest, cls).resource_setup()
cls.tenant_id = cls.manager.identity_client.tenant_id
cls.check_preconditions()
@@ -1011,8 +1011,8 @@
class BaremetalScenarioTest(ScenarioTest):
@classmethod
- def setUpClass(cls):
- super(BaremetalScenarioTest, cls).setUpClass()
+ def resource_setup(cls):
+ super(BaremetalScenarioTest, cls).resource_setup()
if (not CONF.service_available.ironic or
not CONF.baremetal.driver_enabled):
@@ -1143,8 +1143,8 @@
"""
@classmethod
- def setUpClass(cls):
- super(EncryptionScenarioTest, cls).setUpClass()
+ def resource_setup(cls):
+ super(EncryptionScenarioTest, cls).resource_setup()
cls.admin_volume_types_client = cls.admin_manager.volume_types_client
def _wait_for_volume_status(self, status):
@@ -1190,8 +1190,8 @@
"""
@classmethod
- def setUpClass(cls):
- super(OrchestrationScenarioTest, cls).setUpClass()
+ def resource_setup(cls):
+ super(OrchestrationScenarioTest, cls).resource_setup()
if not CONF.service_available.heat:
raise cls.skipException("Heat support is required")
@@ -1235,9 +1235,9 @@
"""
@classmethod
- def setUpClass(cls):
+ def resource_setup(cls):
cls.set_network_resources()
- super(SwiftScenarioTest, cls).setUpClass()
+ super(SwiftScenarioTest, cls).resource_setup()
if not CONF.service_available.swift:
skip_msg = ("%s skipped as swift is not available" %
cls.__name__)
diff --git a/tempest/scenario/test_aggregates_basic_ops.py b/tempest/scenario/test_aggregates_basic_ops.py
index 3ad5c69..75769ce 100644
--- a/tempest/scenario/test_aggregates_basic_ops.py
+++ b/tempest/scenario/test_aggregates_basic_ops.py
@@ -33,8 +33,8 @@
Deletes aggregate
"""
@classmethod
- def setUpClass(cls):
- super(TestAggregatesBasicOps, cls).setUpClass()
+ def resource_setup(cls):
+ super(TestAggregatesBasicOps, cls).resource_setup()
cls.aggregates_client = cls.manager.aggregates_client
cls.hosts_client = cls.manager.hosts_client
diff --git a/tempest/scenario/test_dashboard_basic_ops.py b/tempest/scenario/test_dashboard_basic_ops.py
index 4fcc70a..f218fb2 100644
--- a/tempest/scenario/test_dashboard_basic_ops.py
+++ b/tempest/scenario/test_dashboard_basic_ops.py
@@ -34,9 +34,9 @@
"""
@classmethod
- def setUpClass(cls):
+ def resource_setup(cls):
cls.set_network_resources()
- super(TestDashboardBasicOps, cls).setUpClass()
+ super(TestDashboardBasicOps, cls).resource_setup()
if not CONF.service_available.horizon:
raise cls.skipException("Horizon support is required")
diff --git a/tempest/scenario/test_large_ops.py b/tempest/scenario/test_large_ops.py
index 71b8a7f..b111939 100644
--- a/tempest/scenario/test_large_ops.py
+++ b/tempest/scenario/test_large_ops.py
@@ -38,12 +38,12 @@
"""
@classmethod
- def setUpClass(cls):
+ def resource_setup(cls):
if CONF.scenario.large_ops_number < 1:
raise cls.skipException("large_ops_number not set to multiple "
"instances")
cls.set_network_resources()
- super(TestLargeOpsScenario, cls).setUpClass()
+ super(TestLargeOpsScenario, cls).resource_setup()
def _wait_for_server_status(self, status):
for server in self.servers:
diff --git a/tempest/scenario/test_load_balancer_basic.py b/tempest/scenario/test_load_balancer_basic.py
index 6ab870e..ce47a05 100644
--- a/tempest/scenario/test_load_balancer_basic.py
+++ b/tempest/scenario/test_load_balancer_basic.py
@@ -58,8 +58,8 @@
raise cls.skipException(msg)
@classmethod
- def setUpClass(cls):
- super(TestLoadBalancerBasic, cls).setUpClass()
+ def resource_setup(cls):
+ super(TestLoadBalancerBasic, cls).resource_setup()
cls.check_preconditions()
cls.servers_keypairs = {}
cls.members = []
diff --git a/tempest/scenario/test_network_advanced_server_ops.py b/tempest/scenario/test_network_advanced_server_ops.py
index 0277593..58a028f 100644
--- a/tempest/scenario/test_network_advanced_server_ops.py
+++ b/tempest/scenario/test_network_advanced_server_ops.py
@@ -50,10 +50,10 @@
raise cls.skipException(msg)
@classmethod
- def setUpClass(cls):
+ def resource_setup(cls):
# Create no network resources for these tests.
cls.set_network_resources()
- super(TestNetworkAdvancedServerOps, cls).setUpClass()
+ super(TestNetworkAdvancedServerOps, cls).resource_setup()
def _setup_network_and_servers(self):
self.keypair = self.create_keypair()
diff --git a/tempest/scenario/test_network_basic_ops.py b/tempest/scenario/test_network_basic_ops.py
index 904f248..de60745 100644
--- a/tempest/scenario/test_network_basic_ops.py
+++ b/tempest/scenario/test_network_basic_ops.py
@@ -88,10 +88,10 @@
raise cls.skipException(msg)
@classmethod
- def setUpClass(cls):
+ def resource_setup(cls):
# Create no network resources for these tests.
cls.set_network_resources()
- super(TestNetworkBasicOps, cls).setUpClass()
+ super(TestNetworkBasicOps, cls).resource_setup()
for ext in ['router', 'security-group']:
if not test.is_extension_enabled(ext, 'network'):
msg = "%s extension not enabled." % ext
diff --git a/tempest/scenario/test_security_groups_basic_ops.py b/tempest/scenario/test_security_groups_basic_ops.py
index 658d336..188dea8 100644
--- a/tempest/scenario/test_security_groups_basic_ops.py
+++ b/tempest/scenario/test_security_groups_basic_ops.py
@@ -138,10 +138,10 @@
raise cls.skipException(msg)
@classmethod
- def setUpClass(cls):
+ def resource_setup(cls):
# Create no network resources for these tests.
cls.set_network_resources()
- super(TestSecurityGroupsBasicOps, cls).setUpClass()
+ super(TestSecurityGroupsBasicOps, cls).resource_setup()
# TODO(mnewby) Consider looking up entities as needed instead
# of storing them as collections on the class.
cls.floating_ips = {}
diff --git a/tempest/scenario/test_server_advanced_ops.py b/tempest/scenario/test_server_advanced_ops.py
index 463f5aa..c53e22b 100644
--- a/tempest/scenario/test_server_advanced_ops.py
+++ b/tempest/scenario/test_server_advanced_ops.py
@@ -35,9 +35,9 @@
"""
@classmethod
- def setUpClass(cls):
+ def resource_setup(cls):
cls.set_network_resources()
- super(TestServerAdvancedOps, cls).setUpClass()
+ super(TestServerAdvancedOps, cls).resource_setup()
if CONF.compute.flavor_ref_alt == CONF.compute.flavor_ref:
msg = "Skipping test - flavor_ref and flavor_ref_alt are identical"
diff --git a/tempest/scenario/test_stamp_pattern.py b/tempest/scenario/test_stamp_pattern.py
index f2c3dcd..8ea2814 100644
--- a/tempest/scenario/test_stamp_pattern.py
+++ b/tempest/scenario/test_stamp_pattern.py
@@ -51,8 +51,8 @@
"""
@classmethod
- def setUpClass(cls):
- super(TestStampPattern, cls).setUpClass()
+ def resource_setup(cls):
+ super(TestStampPattern, cls).resource_setup()
if not CONF.volume_feature_enabled.snapshot:
raise cls.skipException("Cinder volume snapshots are disabled")
diff --git a/tempest/scenario/test_volume_boot_pattern.py b/tempest/scenario/test_volume_boot_pattern.py
index fdda423..a20db5c 100644
--- a/tempest/scenario/test_volume_boot_pattern.py
+++ b/tempest/scenario/test_volume_boot_pattern.py
@@ -36,8 +36,8 @@
* Check written content in the instance booted from snapshot
"""
@classmethod
- def setUpClass(cls):
- super(TestVolumeBootPattern, cls).setUpClass()
+ def resource_setup(cls):
+ super(TestVolumeBootPattern, cls).resource_setup()
if not CONF.volume_feature_enabled.snapshot:
raise cls.skipException("Cinder volume snapshots are disabled")