commit 30b0400c3100f06554f48e43fc100a0c6ff3a523
author Arefiev Anton <aarefiev@mirantis.com> Wed Jul 27 15:11:55 2022 +0300
committer Hanna Arhipova <harhipova@mirantis.com> Mon Sep 09 09:53:18 2024 +0000
tree 00c392f72d8003364f5643d8bcc224561ea8e32c
parent 40fe2d0eaa14e0620a8cf8ba9dd4fb66f1e9d4ec

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
(cherry picked from commit c3c15c7905e2674938699f3bff095618b1ac1e1f)
(cherry picked from commit 69f0ffc3ad774fd29c53ab01f7b5198df9ac294d)

tempest/scenario/manager.py

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

tempest/scenario/test_server_basic_ops.py

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
 

tempest/scenario/test_volume_backup_restore.py

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