Merge "Create default network for compute volume and negative metadata tests"

tempest/api/compute/admin/test_volume_swap.py

@@ -23,6 +23,7 @@ CONF = config.CONF
 
 
 class TestVolumeSwapBase(base.BaseV2ComputeAdminTest):
+    create_default_network = True
 
     @classmethod
     def skip_checks(cls):

tempest/api/compute/admin/test_volumes_negative.py

@@ -22,6 +22,7 @@ CONF = config.CONF
 
 
 class VolumesAdminNegativeTest(base.BaseV2ComputeAdminTest):
+    create_default_network = True
 
     @classmethod
     def skip_checks(cls):

tempest/api/compute/images/test_images.py

@@ -25,6 +25,7 @@ CONF = config.CONF
 
 
 class ImagesTestJSON(base.BaseV2ComputeTest):
+    create_default_network = True
 
     @classmethod
     def skip_checks(cls):

tempest/api/compute/images/test_images_oneserver_negative.py

@@ -30,6 +30,7 @@ LOG = logging.getLogger(__name__)
 
 
 class ImagesOneServerNegativeTestJSON(base.BaseV2ComputeTest):
+    create_default_network = True
 
     def tearDown(self):
         """Terminate test instances created after a test is executed."""

tempest/api/compute/servers/test_server_metadata_negative.py

@@ -20,6 +20,7 @@ from tempest.lib import exceptions as lib_exc
 
 
 class ServerMetadataNegativeTestJSON(base.BaseV2ComputeTest):
+    create_default_network = True
 
     @classmethod
     def setup_clients(cls):

tempest/api/volume/admin/test_volumes_actions.py

@@ -23,6 +23,7 @@ CONF = config.CONF
 
 
 class VolumesActionsTest(base.BaseVolumeAdminTest):
+    create_default_network = True
 
     def _create_reset_and_force_delete_temp_volume(self, status=None):
         # Create volume, reset volume status, and force delete temp volume

tempest/api/volume/base.py

@@ -30,6 +30,9 @@ class BaseVolumeTest(api_version_utils.BaseMicroversionTest,
                      tempest.test.BaseTestCase):
     """Base test case class for all Cinder API tests."""
 
+    # Set this to True in subclasses to create a default network. See
+    # https://bugs.launchpad.net/tempest/+bug/1844568
+    create_default_network = False
     _api_version = 2
     # if api_v2 is not enabled while api_v3 is enabled, the volume v2 classes
     # should be transferred to volume v3 classes.
@@ -63,7 +66,9 @@ class BaseVolumeTest(api_version_utils.BaseMicroversionTest,
 
     @classmethod
     def setup_credentials(cls):
-        cls.set_network_resources()
+        cls.set_network_resources(
+            network=cls.create_default_network,
+            subnet=cls.create_default_network)
         super(BaseVolumeTest, cls).setup_credentials()
 
     @classmethod

tempest/api/volume/test_volumes_actions.py

@@ -25,6 +25,7 @@ CONF = config.CONF
 
 
 class VolumesActionsTest(base.BaseVolumeTest):
+    create_default_network = True
 
     @classmethod
     def resource_setup(cls):

tempest/api/volume/test_volumes_extend.py

@@ -60,6 +60,7 @@ class VolumesExtendTest(base.BaseVolumeTest):
 
 class VolumesExtendAttachedTest(base.BaseVolumeTest):
     """Tests extending the size of an attached volume."""
+    create_default_network = True
 
     # We need admin credentials for getting instance action event details. By
     # default a non-admin can list and show instance actions if they own the

tempest/api/volume/test_volumes_snapshots.py

@@ -25,6 +25,7 @@ CONF = config.CONF
 
 
 class VolumesSnapshotTestJSON(base.BaseVolumeTest):
+    create_default_network = True
 
     @classmethod
     def skip_checks(cls):