Merge "tests: Rename cloud name variables"

openstack · Feb 28, 2025 · 795bc64 · 795bc64
2 parents 5b6f515 + f10faaa
commit 795bc64
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 21 deletions.
diff --git a/openstack/tests/functional/base.py b/openstack/tests/functional/base.py
@@ -49,35 +49,38 @@ class BaseFunctionalTest(base.TestCase):
 
     def setUp(self):
         super().setUp()
+
         self.conn = connection.Connection(config=TEST_CLOUD_REGION)
         _disable_keep_alive(self.conn)
 
-        self._demo_name = os.environ.get('OPENSTACKSDK_DEMO_CLOUD', 'devstack')
-        if not self._demo_name:
+        self.config = openstack.config.OpenStackConfig()
+
+        self._user_cloud_name = os.environ.get(
+            'OPENSTACKSDK_DEMO_CLOUD', 'devstack'
+        )
+        if not self._user_cloud_name:
             raise self.failureException(
-                "OPENSTACKSDK_OPERATOR_CLOUD must be set to a non-empty value"
+                "OPENSTACKSDK_DEMO_CLOUD must be set to a non-empty value"
             )
 
-        self._demo_name_alt = os.environ.get(
-            'OPENSTACKSDK_DEMO_CLOUD_ALT',
-            'devstack-alt',
+        self._user_alt_cloud_name = os.environ.get(
+            'OPENSTACKSDK_DEMO_CLOUD_ALT', 'devstack-alt'
         )
-        if not self._demo_name_alt:
+        if not self._user_alt_cloud_name:
             raise self.failureException(
-                "OPENSTACKSDK_OPERATOR_CLOUD must be set to a non-empty value"
+                "OPENSTACKSDK_DEMO_CLOUD_ALT must be set to a non-empty value"
             )
 
-        self._op_name = os.environ.get(
-            'OPENSTACKSDK_OPERATOR_CLOUD',
-            'devstack-admin',
+        self._set_user_cloud()
+
+        self._operator_cloud_name = os.environ.get(
+            'OPENSTACKSDK_OPERATOR_CLOUD', 'devstack-admin'
         )
-        if not self._op_name:
+        if not self._operator_cloud_name:
             raise self.failureException(
                 "OPENSTACKSDK_OPERATOR_CLOUD must be set to a non-empty value"
             )
 
-        self.config = openstack.config.OpenStackConfig()
-        self._set_user_cloud()
         self._set_operator_cloud()
 
         self.identity_version = self.user_cloud.config.get_api_version(
@@ -97,18 +100,22 @@ def setUp(self):
         )
 
     def _set_user_cloud(self, **kwargs):
-        user_config = self.config.get_one(cloud=self._demo_name, **kwargs)
+        user_config = self.config.get_one(
+            cloud=self._user_cloud_name, **kwargs
+        )
         self.user_cloud = connection.Connection(config=user_config)
         _disable_keep_alive(self.user_cloud)
 
         user_config_alt = self.config.get_one(
-            cloud=self._demo_name_alt, **kwargs
+            cloud=self._user_alt_cloud_name, **kwargs
         )
         self.user_cloud_alt = connection.Connection(config=user_config_alt)
         _disable_keep_alive(self.user_cloud_alt)
 
     def _set_operator_cloud(self, **kwargs):
-        operator_config = self.config.get_one(cloud=self._op_name, **kwargs)
+        operator_config = self.config.get_one(
+            cloud=self._operator_cloud_name, **kwargs
+        )
         self.operator_cloud = connection.Connection(config=operator_config)
         _disable_keep_alive(self.operator_cloud)
 
@@ -122,7 +129,6 @@ def _pick_flavor(self):
             return None
 
         flavors = self.user_cloud.list_flavors(get_extra=False)
-        # self.add_info_on_exception('flavors', flavors)
 
         flavor_name = os.environ.get('OPENSTACKSDK_FLAVOR')
 
@@ -163,7 +169,6 @@ def _pick_image(self):
             return None
 
         images = self.user_cloud.list_images()
-        # self.add_info_on_exception('images', images)
 
         image_name = os.environ.get('OPENSTACKSDK_IMAGE')
 

diff --git a/openstack/tests/functional/block_storage/v3/test_default_type.py b/openstack/tests/functional/block_storage/v3/test_default_type.py
@@ -17,7 +17,7 @@
 class TestDefaultType(base.BaseBlockStorageTest):
     def setUp(self):
         super().setUp()
-        if not self._op_name:
+        if not self._operator_cloud_name:
             self.skip("Operator cloud must be set for this test")
         self._set_operator_cloud(block_storage_api_version='3.67')
         self.PROJECT_ID = self.create_temporary_project().id

diff --git a/openstack/tests/functional/block_storage/v3/test_type.py b/openstack/tests/functional/block_storage/v3/test_type.py
@@ -21,7 +21,7 @@ def setUp(self):
 
         self.TYPE_NAME = self.getUniqueString()
         self.TYPE_ID = None
-        if not self._op_name:
+        if not self._operator_cloud_name:
             self.skip("Operator cloud must be set for this test")
         self._set_operator_cloud(block_storage_api_version='3')
         sot = self.operator_cloud.block_storage.create_type(