commit afd33da19eba097482c26da48335faf5bad8a277
author Jenkins <jenkins@review.openstack.org> Thu May 01 08:47:31 2014 +0000
committer Gerrit Code Review <review@openstack.org> Thu May 01 08:47:31 2014 +0000
tree 677fda78cdb32b54e109deb596f8d237e09019e5
parent a098dc94d9a3341176f45e9f72f3746037aa4023
parent 5fd4ecf80c43f7ee6f185041978a1e0816088a35

Merge "Merge set_network_resources() call at base"

tempest/api/compute/base.py

diff --git a/tempest/api/compute/base.py b/tempest/api/compute/base.py
index a65d7b7..e1dbc76 100644
--- a/tempest/api/compute/base.py
+++ b/tempest/api/compute/base.py
@@ -34,6 +34,7 @@
 
     @classmethod
     def setUpClass(cls):
+        cls.set_network_resources()
         super(BaseComputeTest, cls).setUpClass()
 
         os = cls.get_client_manager()
@@ -218,7 +219,6 @@
     @classmethod
     def setUpClass(cls):
         # By default compute tests do not create network resources
-        cls.set_network_resources()
         super(BaseV2ComputeTest, cls).setUpClass()
         cls.servers_client = cls.os.servers_client
         cls.flavors_client = cls.os.flavors_client
@@ -324,7 +324,6 @@
                         cls.__name__)
             raise cls.skipException(skip_msg)
 
-        cls.set_network_resources()
         super(BaseV3ComputeTest, cls).setUpClass()
 
         cls.servers_client = cls.os.servers_v3_client