Merge "Add new base manager with default network" into mcp/caracal
diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index 5f30909..c2dae46 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -1343,6 +1343,16 @@
return self.create_volume(name=name, imageRef=image_id, **kwargs)
+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.
@@ -1697,7 +1707,8 @@
return network, subnet, router
-class EncryptionScenarioTest(ScenarioTest):
+class EncryptionScenarioTest(ScenarioTestWithNetwork):
+
"""Base class for encryption scenario tests"""
@classmethod
diff --git a/tempest/scenario/test_server_basic_ops.py b/tempest/scenario/test_server_basic_ops.py
index 3830fbc..ad86d0f 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 07ca38a..ca563da 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