commit da4a2453e7472d5e85dc49fb14b196870078f804
author Andrea Frittoli <andrea.frittoli@hp.com> Mon Sep 15 13:12:08 2014 +0100
committer Andrea Frittoli <andrea.frittoli@hp.com> Thu Sep 18 22:02:21 2014 +0100
tree 886654e58e0305797f1d09463945427983812488
parent 7688e740207d0ee0c74c4d743a19ec239074cc5f

Migrate network API tests to resource_* fixtures

Partially-implements bp resource-cleanup

Change-Id: I455c372f7356343f4398f69255c6150c3521b953

tempest/api/network/test_networks.py

diff --git a/tempest/api/network/test_networks.py b/tempest/api/network/test_networks.py
index f3da614..e1eb48d 100644
--- a/tempest/api/network/test_networks.py
+++ b/tempest/api/network/test_networks.py
@@ -59,9 +59,8 @@
     """
 
     @classmethod
-    @test.safe_setup
-    def setUpClass(cls):
-        super(NetworksTestJSON, cls).setUpClass()
+    def resource_setup(cls):
+        super(NetworksTestJSON, cls).resource_setup()
         cls.network = cls.create_network()
         cls.name = cls.network['name']
         cls.subnet = cls.create_subnet(cls.network)
@@ -366,11 +365,11 @@
     _ip_version = 6
 
     @classmethod
-    def setUpClass(cls):
+    def resource_setup(cls):
         if not CONF.network_feature_enabled.ipv6:
             skip_msg = "IPv6 Tests are disabled."
             raise cls.skipException(skip_msg)
-        super(NetworksIpV6TestJSON, cls).setUpClass()
+        super(NetworksIpV6TestJSON, cls).resource_setup()
 
     @test.attr(type='smoke')
     def test_create_delete_subnet_with_gw(self):