Add new base manager with default network
Dynamic credentials setup full network by default, tests
which don't need some network resources disables them
explicitly, make same behavior for static credentials.
Related-PRODX: PRODX-25617
Change-Id: I23542c02a71b0b7dc87e8b9b1b32d0b4ea9035f9
diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index ff860d5..a650a75 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -946,6 +946,16 @@
return self.create_volume(name=vol_name, imageRef=img_uuid)
+class ScenarioTestWithNetwork(ScenarioTest):
+ """Base class for tests with default network"""
+
+ @classmethod
+ def setup_credentials(cls):
+ cls.set_network_resources(network=True, subnet=True,
+ dhcp=True, router=True)
+ super(ScenarioTestWithNetwork, cls).setup_credentials()
+
+
class NetworkScenarioTest(ScenarioTest):
"""Base class for network scenario tests.
@@ -1484,7 +1494,8 @@
return network, subnet, router
-class EncryptionScenarioTest(ScenarioTest):
+class EncryptionScenarioTest(ScenarioTestWithNetwork):
+
"""Base class for encryption scenario tests"""
credentials = ['primary', 'admin']
diff --git a/tempest/scenario/test_server_basic_ops.py b/tempest/scenario/test_server_basic_ops.py
index 02bc692..0d0959d 100644
--- a/tempest/scenario/test_server_basic_ops.py
+++ b/tempest/scenario/test_server_basic_ops.py
@@ -27,7 +27,7 @@
CONF = config.CONF
-class TestServerBasicOps(manager.ScenarioTest):
+class TestServerBasicOps(manager.ScenarioTestWithNetwork):
"""The test suite for server basic operations
diff --git a/tempest/scenario/test_volume_backup_restore.py b/tempest/scenario/test_volume_backup_restore.py
index 8a8c54e..58fdf6f 100644
--- a/tempest/scenario/test_volume_backup_restore.py
+++ b/tempest/scenario/test_volume_backup_restore.py
@@ -22,7 +22,7 @@
CONF = config.CONF
-class TestVolumeBackupRestore(manager.ScenarioTest):
+class TestVolumeBackupRestore(manager.ScenarioTestWithNetwork):
"""Test cinder backup and restore
This testcase verifies content preservation after backup and restore