commit a565e451b74cd753d43ad1a3fdc4b8d52e50eded
author Rohan Kanade <rkanade@redhat.com> Tue Jan 27 14:00:13 2015 +0530
committer Andrea Frittoli (andreaf) <andrea.frittoli@hp.com> Fri Mar 27 06:17:20 2015 -0400
tree d436c98369d51bf22cbbea1e74f16f4d4d794eb2
parent 609f6030a21c94618ff3fffe8ec47fba7435b868

Split resource_setup for network tests

Split up the resource_setup method for all the network tests, as per the
latest spec.

Partially-implements bp:resource-cleanup

Change-Id: If96a154cfe65dd3d18ff6b1e1943ccfb1db7300e

tempest/api/network/test_vpnaas_extensions.py

diff --git a/tempest/api/network/test_vpnaas_extensions.py b/tempest/api/network/test_vpnaas_extensions.py
index ba30326..4ab69e0 100644
--- a/tempest/api/network/test_vpnaas_extensions.py
+++ b/tempest/api/network/test_vpnaas_extensions.py
@@ -24,7 +24,6 @@
 
 
 class VPNaaSTestJSON(base.BaseAdminNetworkTest):
-
     """
     Tests the following operations in the Neutron API using the REST client for
     Neutron:
@@ -34,10 +33,14 @@
     """
 
     @classmethod
-    def resource_setup(cls):
+    def skip_checks(cls):
+        super(VPNaaSTestJSON, cls).skip_checks()
         if not test.is_extension_enabled('vpnaas', 'network'):
             msg = "vpnaas extension not enabled."
             raise cls.skipException(msg)
+
+    @classmethod
+    def resource_setup(cls):
         super(VPNaaSTestJSON, cls).resource_setup()
         cls.ext_net_id = CONF.network.public_network_id
         cls.network = cls.create_network()