commit 50bb80dd3c57885054a61d4535f8f7f03c59eacf
author Andrea Frittoli <andrea.frittoli@hp.com> Mon Sep 15 12:34:27 2014 +0100
committer Andrea Frittoli <andrea.frittoli@hp.com> Thu Sep 18 21:47:21 2014 +0100
tree 9467c219f4a1bf5ccc97507fa874e5061755e143
parent 73ee247eebc92ed6ab5d16cacd373dd76722dd8e

Migrate computev2 API tests to resource_* fixtures

Partially-implements bp:resource-cleanup

Change-Id: I59eb2d9789368c812282ce12ae7e571be720badb

tempest/api/compute/base.py

diff --git a/tempest/api/compute/base.py b/tempest/api/compute/base.py
index 47d1254..7e9fe92 100644
--- a/tempest/api/compute/base.py
+++ b/tempest/api/compute/base.py
@@ -34,9 +34,9 @@
     force_tenant_isolation = False
 
     @classmethod
-    def setUpClass(cls):
+    def resource_setup(cls):
         cls.set_network_resources()
-        super(BaseComputeTest, cls).setUpClass()
+        super(BaseComputeTest, cls).resource_setup()
         if getattr(cls, '_interface', None) == 'xml' and cls._api_version == 2:
             if not CONF.compute_feature_enabled.xml_api_v2:
                 raise cls.skipException('XML API is not enabled')
@@ -211,13 +211,12 @@
                               server_group_id)
 
     @classmethod
-    def tearDownClass(cls):
+    def resource_cleanup(cls):
         cls.clear_images()
         cls.clear_servers()
         cls.clear_security_groups()
-        cls.clear_isolated_creds()
         cls.clear_server_groups()
-        super(BaseComputeTest, cls).tearDownClass()
+        super(BaseComputeTest, cls).resource_cleanup()
 
     @classmethod
     def create_test_server(cls, **kwargs):
@@ -382,8 +381,8 @@
     _interface = "json"
 
     @classmethod
-    def setUpClass(cls):
-        super(BaseComputeAdminTest, cls).setUpClass()
+    def resource_setup(cls):
+        super(BaseComputeAdminTest, cls).resource_setup()
         if (CONF.compute.allow_tenant_isolation or
             cls.force_tenant_isolation is True):
             creds = cls.isolated_creds.get_admin_creds()