commit 87bd374ac04f0d0f6f8127391c0bbfd62ff1af29
author Jenkins <jenkins@review.openstack.org> Tue Jun 17 00:03:47 2014 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jun 17 00:03:47 2014 +0000
tree 3c4026726faed875b47fa5403c611d20642973ad
parent c73ee5be9d0f99519a06718b10715d920eacaa2e
parent 764610afe0e269879df04f1e38795c6f8d8eb8e3

Merge "Disable isolated_creds.net_resources on network scenarios"

tempest/scenario/test_network_basic_ops.py

diff --git a/tempest/scenario/test_network_basic_ops.py b/tempest/scenario/test_network_basic_ops.py
index 21782ee..c84d4b9 100644
--- a/tempest/scenario/test_network_basic_ops.py
+++ b/tempest/scenario/test_network_basic_ops.py
@@ -87,6 +87,8 @@
 
     @classmethod
     def setUpClass(cls):
+        # Create no network resources for these tests.
+        cls.set_network_resources()
         super(TestNetworkBasicOps, cls).setUpClass()
         for ext in ['router', 'security-group']:
             if not test.is_extension_enabled(ext, 'network'):

tempest/scenario/test_security_groups_basic_ops.py

diff --git a/tempest/scenario/test_security_groups_basic_ops.py b/tempest/scenario/test_security_groups_basic_ops.py
index 4616b82..b4e509a 100644
--- a/tempest/scenario/test_security_groups_basic_ops.py
+++ b/tempest/scenario/test_security_groups_basic_ops.py
@@ -134,6 +134,8 @@
 
     @classmethod
     def setUpClass(cls):
+        # Create no network resources for these tests.
+        cls.set_network_resources()
         super(TestSecurityGroupsBasicOps, cls).setUpClass()
         cls.alt_creds = cls.alt_credentials()
         cls.alt_manager = clients.OfficialClientManager(cls.alt_creds)