python-openstackclient 8.3.0__py3-none-any.whl → 10.0.0__py3-none-any.whl

openstackclient/tests/functional/identity/v3/test_limit.py

@@ -100,6 +100,53 @@ class LimitTestCase(common.IdentityTests):
         self.assert_show_fields(items, self.LIMIT_FIELDS)
         registered_limit_id = self._create_dummy_registered_limit()
 
+    def test_limit_create_with_project_domain(self):
+        registered_limit_id = self._create_dummy_registered_limit()
+        raw_output = self.openstack(
+            f'registered limit show {registered_limit_id}',
+            cloud=SYSTEM_CLOUD,
+        )
+        items = self.parse_show(raw_output)
+        service_id = self._extract_value_from_items('service_id', items)
+        resource_name = self._extract_value_from_items('resource_name', items)
+
+        raw_output = self.openstack(f'service show {service_id}')
+        items = self.parse_show(raw_output)
+        service_name = self._extract_value_from_items('name', items)
+
+        project_name = self._create_dummy_project()
+        raw_output = self.openstack(
+            f'project show {project_name}',
+            cloud=SYSTEM_CLOUD,
+        )
+        items = self.parse_show(raw_output)
+        domain_id = self._extract_value_from_items('domain_id', items)
+
+        params = {
+            'project_name': project_name,
+            'project_domain': domain_id,
+            'service_name': service_name,
+            'resource_name': resource_name,
+            'resource_limit': 15,
+        }
+        raw_output = self.openstack(
+            'limit create'
+            ' --project {project_name}'
+            ' --project-domain {project_domain}'
+            ' --service {service_name}'
+            ' --resource-limit {resource_limit}'
+            ' {resource_name}'.format(**params),
+            cloud=SYSTEM_CLOUD,
+        )
+        items = self.parse_show(raw_output)
+        limit_id = self._extract_value_from_items('id', items)
+        self.addCleanup(
+            self.openstack, f'limit delete {limit_id}', cloud=SYSTEM_CLOUD
+        )
+
+        self.assert_show_fields(items, self.LIMIT_FIELDS)
+        registered_limit_id = self._create_dummy_registered_limit()
+
     def test_limit_create_with_service_id(self):
         self._create_dummy_limit()
 

openstackclient/tests/functional/identity/v3/test_project.py

@@ -21,7 +21,7 @@ class ProjectTests(common.IdentityTests):
         description = data_utils.rand_name('description')
         raw_output = self.openstack(
             'project create '
-            f'--domain {self.domain_name} '
+            f'--domain {self.DOMAIN_NAME} '
             f'--description {description} '
             '--enable '
             '--property k1=v1 '
@@ -30,7 +30,7 @@ class ProjectTests(common.IdentityTests):
         )
         self.addCleanup(
             self.openstack,
-            f'project delete --domain {self.domain_name} {project_name}',
+            f'project delete --domain {self.DOMAIN_NAME} {project_name}',
         )
         items = self.parse_show(raw_output)
         show_fields = list(self.PROJECT_FIELDS)
@@ -43,7 +43,7 @@ class ProjectTests(common.IdentityTests):
     def test_project_delete(self):
         project_name = self._create_dummy_project(add_clean_up=False)
         raw_output = self.openstack(
-            f'project delete --domain {self.domain_name} {project_name}'
+            f'project delete --domain {self.DOMAIN_NAME} {project_name}'
         )
         self.assertEqual(0, len(raw_output))
 
@@ -55,7 +55,7 @@ class ProjectTests(common.IdentityTests):
     def test_project_list_with_domain(self):
         project_name = self._create_dummy_project()
         raw_output = self.openstack(
-            f'project list --domain {self.domain_name}'
+            f'project list --domain {self.DOMAIN_NAME}'
         )
         items = self.parse_listing(raw_output)
         self.assert_table_structure(items, common.BASIC_LIST_HEADERS)
@@ -75,7 +75,7 @@ class ProjectTests(common.IdentityTests):
         self.assertEqual(0, len(raw_output))
         # check project details
         raw_output = self.openstack(
-            f'project show --domain {self.domain_name} {new_project_name}'
+            f'project show --domain {self.DOMAIN_NAME} {new_project_name}'
         )
         items = self.parse_show(raw_output)
         fields = list(self.PROJECT_FIELDS)
@@ -92,7 +92,7 @@ class ProjectTests(common.IdentityTests):
 
     def test_project_show(self):
         raw_output = self.openstack(
-            f'project show --domain {self.domain_name} {self.project_name}'
+            f'project show --domain {self.DOMAIN_NAME} {self.PROJECT_NAME}'
         )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.PROJECT_FIELDS)
@@ -101,10 +101,10 @@ class ProjectTests(common.IdentityTests):
         output = self.openstack(
             'project show '
             '--parents --children '
-            f'--domain {self.domain_name} '
-            f'{self.project_name}',
+            f'--domain {self.DOMAIN_NAME} '
+            f'{self.PROJECT_NAME}',
             parse_output=True,
         )
-        for attr_name in self.PROJECT_FIELDS + ['parents', 'subtree']:
+        for attr_name in [*self.PROJECT_FIELDS, 'parents', 'subtree']:
             self.assertIn(attr_name, output)
-        self.assertEqual(self.project_name, output.get('name'))
+        self.assertEqual(self.PROJECT_NAME, output.get('name'))

openstackclient/tests/functional/identity/v3/test_role.py

@@ -76,19 +76,19 @@ class RoleTests(common.IdentityTests):
         username = self._create_dummy_user()
         raw_output = self.openstack(
             'role add '
-            f'--project {self.project_name} '
-            f'--project-domain {self.domain_name} '
+            f'--project {self.PROJECT_NAME} '
+            f'--project-domain {self.DOMAIN_NAME} '
             f'--user {username} '
-            f'--user-domain {self.domain_name} '
+            f'--user-domain {self.DOMAIN_NAME} '
             f'{role_name}'
         )
         self.addCleanup(
             self.openstack,
             'role remove '
-            f'--project {self.project_name} '
-            f'--project-domain {self.domain_name} '
+            f'--project {self.PROJECT_NAME} '
+            f'--project-domain {self.DOMAIN_NAME} '
             f'--user {username} '
-            f'--user-domain {self.domain_name} '
+            f'--user-domain {self.DOMAIN_NAME} '
             f'{role_name}',
         )
         self.assertEqual(0, len(raw_output))
@@ -98,20 +98,20 @@ class RoleTests(common.IdentityTests):
         username = self._create_dummy_user()
         raw_output = self.openstack(
             'role add '
-            f'--project {self.project_name} '
-            f'--project-domain {self.domain_name} '
+            f'--project {self.PROJECT_NAME} '
+            f'--project-domain {self.DOMAIN_NAME} '
             f'--user {username} '
-            f'--user-domain {self.domain_name} '
+            f'--user-domain {self.DOMAIN_NAME} '
             '--inherited '
             f'{role_name}'
         )
         self.addCleanup(
             self.openstack,
             'role remove '
-            f'--project {self.project_name} '
-            f'--project-domain {self.domain_name} '
+            f'--project {self.PROJECT_NAME} '
+            f'--project-domain {self.DOMAIN_NAME} '
             f'--user {username} '
-            f'--user-domain {self.domain_name} '
+            f'--user-domain {self.DOMAIN_NAME} '
             '--inherited '
             f'{role_name}',
         )
@@ -122,18 +122,18 @@ class RoleTests(common.IdentityTests):
         username = self._create_dummy_user()
         add_raw_output = self.openstack(
             'role add '
-            f'--project {self.project_name} '
-            f'--project-domain {self.domain_name} '
+            f'--project {self.PROJECT_NAME} '
+            f'--project-domain {self.DOMAIN_NAME} '
             f'--user {username} '
-            f'--user-domain {self.domain_name} '
+            f'--user-domain {self.DOMAIN_NAME} '
             f'{role_name}'
         )
         remove_raw_output = self.openstack(
             'role remove '
-            f'--project {self.project_name} '
-            f'--project-domain {self.domain_name} '
+            f'--project {self.PROJECT_NAME} '
+            f'--project-domain {self.DOMAIN_NAME} '
             f'--user {username} '
-            f'--user-domain {self.domain_name} '
+            f'--user-domain {self.DOMAIN_NAME} '
             f'{role_name}'
         )
         self.assertEqual(0, len(add_raw_output))

openstackclient/tests/functional/identity/v3/test_role_assignment.py

@@ -79,14 +79,14 @@ class RoleAssignmentTests(common.IdentityTests):
         )
         raw_output = self.openstack(
             'role add '
-            f'--project {self.project_name} '
+            f'--project {self.PROJECT_NAME} '
             f'--group {group_name} --group-domain {domain_name_A} '
             f'{role_name}'
         )
         self.addCleanup(
             self.openstack,
             'role remove '
-            f'--project {self.project_name} '
+            f'--project {self.PROJECT_NAME} '
             f'--group {group_name} --group-domain {domain_name_A} '
             f'{role_name}',
         )
@@ -108,20 +108,20 @@ class RoleAssignmentTests(common.IdentityTests):
         username = self._create_dummy_user()
         raw_output = self.openstack(
             'role add '
-            f'--domain {self.domain_name} '
+            f'--domain {self.DOMAIN_NAME} '
             f'--user {username} '
             f'{role_name}'
         )
         self.addCleanup(
             self.openstack,
             'role remove '
-            f'--domain {self.domain_name} '
+            f'--domain {self.DOMAIN_NAME} '
             f'--user {username} '
             f'{role_name}',
         )
         self.assertEqual(0, len(raw_output))
         raw_output = self.openstack(
-            f'role assignment list --domain {self.domain_name} '
+            f'role assignment list --domain {self.DOMAIN_NAME} '
         )
         items = self.parse_listing(raw_output)
         self.assert_table_structure(items, self.ROLE_ASSIGNMENT_LIST_HEADERS)
@@ -141,14 +141,14 @@ class RoleAssignmentTests(common.IdentityTests):
         )
         raw_output = self.openstack(
             'role add '
-            f'--project {self.project_name} '
+            f'--project {self.PROJECT_NAME} '
             f'--user {username} --user-domain {domain_name_A} '
             f'{role_name}'
         )
         self.addCleanup(
             self.openstack,
             'role remove '
-            f'--project {self.project_name} '
+            f'--project {self.PROJECT_NAME} '
             f'--user {username} --user-domain {domain_name_A} '
             f'{role_name}',
         )
@@ -214,20 +214,20 @@ class RoleAssignmentTests(common.IdentityTests):
         username = self._create_dummy_user()
         raw_output = self.openstack(
             'role add '
-            f'--project {self.project_name} '
+            f'--project {self.PROJECT_NAME} '
             f'--user {username} '
             f'{role_name}'
         )
         self.addCleanup(
             self.openstack,
             'role remove '
-            f'--project {self.project_name} '
+            f'--project {self.PROJECT_NAME} '
             f'--user {username} '
             f'{role_name}',
         )
         self.assertEqual(0, len(raw_output))
         raw_output = self.openstack(
-            f'role assignment list --project {self.project_name} '
+            f'role assignment list --project {self.PROJECT_NAME} '
         )
         items = self.parse_listing(raw_output)
         self.assert_table_structure(items, self.ROLE_ASSIGNMENT_LIST_HEADERS)
@@ -302,7 +302,7 @@ class RoleAssignmentTests(common.IdentityTests):
         username = self._create_dummy_user()
         raw_output = self.openstack(
             'role add '
-            f'--project {self.project_name} '
+            f'--project {self.PROJECT_NAME} '
             f'--user {username} '
             '--inherited '
             f'{role_name}'
@@ -310,7 +310,7 @@ class RoleAssignmentTests(common.IdentityTests):
         self.addCleanup(
             self.openstack,
             'role remove '
-            f'--project {self.project_name} '
+            f'--project {self.PROJECT_NAME} '
             f'--user {username} '
             '--inherited '
             f'{role_name}',

openstackclient/tests/functional/identity/v3/test_user.py

@@ -22,7 +22,7 @@ class UserTests(common.IdentityTests):
     def test_user_delete(self):
         username = self._create_dummy_user(add_clean_up=False)
         raw_output = self.openstack(
-            f'user delete --domain {self.domain_name} {username}'
+            f'user delete --domain {self.DOMAIN_NAME} {username}'
         )
         self.assertEqual(0, len(raw_output))
 
@@ -34,7 +34,7 @@ class UserTests(common.IdentityTests):
     def test_user_set(self):
         username = self._create_dummy_user()
         raw_output = self.openstack(
-            f'user show --domain {self.domain_name} {username}'
+            f'user show --domain {self.DOMAIN_NAME} {username}'
         )
         user = self.parse_show_as_object(raw_output)
         new_username = data_utils.rand_name('NewTestUser')
@@ -46,7 +46,7 @@ class UserTests(common.IdentityTests):
         )
         self.assertEqual(0, len(raw_output))
         raw_output = self.openstack(
-            f'user show --domain {self.domain_name} {new_username}'
+            f'user show --domain {self.DOMAIN_NAME} {new_username}'
         )
         updated_user = self.parse_show_as_object(raw_output)
         self.assertEqual(user['id'], updated_user['id'])
@@ -57,7 +57,7 @@ class UserTests(common.IdentityTests):
         project_name = self._create_dummy_project()
         # get original user details
         raw_output = self.openstack(
-            f'user show --domain {self.domain_name} {username}'
+            f'user show --domain {self.DOMAIN_NAME} {username}'
         )
         user = self.parse_show_as_object(raw_output)
         # update user
@@ -67,19 +67,19 @@ class UserTests(common.IdentityTests):
             '--project-domain {project_domain} '
             '{id}'.format(
                 project=project_name,
-                project_domain=self.domain_name,
+                project_domain=self.DOMAIN_NAME,
                 id=user['id'],
             )
         )
         self.assertEqual(0, len(raw_output))
         # get updated user details
         raw_output = self.openstack(
-            f'user show --domain {self.domain_name} {username}'
+            f'user show --domain {self.DOMAIN_NAME} {username}'
         )
         updated_user = self.parse_show_as_object(raw_output)
         # get project details
         raw_output = self.openstack(
-            f'project show --domain {self.domain_name} {project_name}'
+            f'project show --domain {self.DOMAIN_NAME} {project_name}'
         )
         project = self.parse_show_as_object(raw_output)
         # check updated user details
@@ -89,7 +89,7 @@ class UserTests(common.IdentityTests):
     def test_user_show(self):
         username = self._create_dummy_user()
         raw_output = self.openstack(
-            f'user show --domain {self.domain_name} {username}'
+            f'user show --domain {self.DOMAIN_NAME} {username}'
         )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.USER_FIELDS)

openstackclient/tests/functional/image/base.py

@@ -16,9 +16,4 @@ from openstackclient.tests.functional import base
 class BaseImageTests(base.TestCase):
     """Functional tests for Image commands"""
 
-    @classmethod
-    def setUpClass(cls):
-        super().setUpClass()
-        # TODO(dtroyer): maybe do image API discovery here to determine
-        #                what is available, it isn't in the service catalog
-        cls.haz_v1_api = False
+    ...

openstackclient/tests/functional/image/v2/test_metadef_objects.py

@@ -0,0 +1,69 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from openstackclient.tests.functional import base
+
+
+class MetadefObjectTests(base.TestCase):
+    def setUp(self):
+        super().setUp()
+        self.obj_name = self.getUniqueString('metadef-obj')
+        self.ns_name = self.getUniqueString('metadef-ns')
+        self.openstack(f"image metadef namespace create {self.ns_name}")
+        self.addCleanup(
+            lambda: self.openstack(
+                f"image metadef namespace delete {self.ns_name}"
+            )
+        )
+
+    def test_metadef_objects(self):
+        # CREATE
+        created = self.openstack(
+            (
+                "image metadef object create "
+                f"--namespace {self.ns_name} "
+                f"{self.obj_name}"
+            ),
+            parse_output=True,
+        )
+        self.addCleanup(
+            lambda: self.openstack(
+                f"image metadef object delete {self.ns_name} {self.obj_name}"
+            )
+        )
+        self.assertEqual(self.obj_name, created["name"])
+        self.assertEqual(self.ns_name, created["namespace_name"])
+
+        # UPDATE
+        new_name = f"{self.obj_name}-updated"
+        self.openstack(
+            "image metadef object update "
+            f"{self.ns_name} {self.obj_name} "
+            f"--name {new_name}"
+        )
+        self.obj_name = new_name
+
+        # READ (get)
+        shown = self.openstack(
+            f"image metadef object show {self.ns_name} {self.obj_name}",
+            parse_output=True,
+        )
+        self.assertEqual(self.obj_name, shown["name"])
+        self.assertEqual(self.ns_name, shown["namespace_name"])
+
+        # READ (list)
+        rows = self.openstack(
+            f"image metadef object list {self.ns_name}",
+            parse_output=True,
+        )
+        names = {row["name"] for row in rows}
+        self.assertIn(self.obj_name, names)

openstackclient/tests/functional/network/v2/common.py

@@ -10,6 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from typing import ClassVar
 import uuid
 
 from openstackclient.tests.functional import base
@@ -18,6 +19,8 @@ from openstackclient.tests.functional import base
 class NetworkTests(base.TestCase):
     """Functional tests for Network commands"""
 
+    haz_network: ClassVar[bool]
+
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
@@ -33,7 +36,7 @@ class NetworkTests(base.TestCase):
 class NetworkTagTests(NetworkTests):
     """Functional tests with tag operation"""
 
-    base_command: str
+    base_command: ClassVar[str]
 
     def test_tag_operation(self):
         # Get project IDs
@@ -84,7 +87,7 @@ class NetworkTagTests(NetworkTests):
             parse_output=True,
         )
         for name, tags in expected:
-            net = [n for n in cmd_output if n['Name'] == name][0]
+            net = next(n for n in cmd_output if n['Name'] == name)
             self.assertEqual(set(tags), set(net['Tags']))
 
     def _create_resource_for_tag_test(self, name, args):

openstackclient/tests/functional/network/v2/test_floating_ip.py

@@ -11,6 +11,7 @@
 #    under the License.
 
 import random
+from typing import ClassVar
 import uuid
 
 from openstackclient.tests.functional.network.v2 import common
@@ -19,6 +20,11 @@ from openstackclient.tests.functional.network.v2 import common
 class FloatingIpTests(common.NetworkTests):
     """Functional tests for floating ip"""
 
+    EXTERNAL_NETWORK_NAME: ClassVar[str]
+    EXTERNAL_NETWORK_ID: ClassVar[str]
+    PRIVATE_NETWORK_NAME: ClassVar[str]
+    PRIVATE_NETWORK_ID: ClassVar[str]
+
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
@@ -32,14 +38,14 @@ class FloatingIpTests(common.NetworkTests):
                 'network create ' + '--external ' + cls.EXTERNAL_NETWORK_NAME,
                 parse_output=True,
             )
-            cls.external_network_id = json_output["id"]
+            cls.EXTERNAL_NETWORK_ID = json_output["id"]
 
             # Create a private network for the port
             json_output = cls.openstack(
                 'network create ' + cls.PRIVATE_NETWORK_NAME,
                 parse_output=True,
             )
-            cls.private_network_id = json_output["id"]
+            cls.PRIVATE_NETWORK_ID = json_output["id"]
 
     @classmethod
     def tearDownClass(cls):
@@ -59,8 +65,8 @@ class FloatingIpTests(common.NetworkTests):
         super().setUp()
 
         # Verify setup
-        self.assertIsNotNone(self.external_network_id)
-        self.assertIsNotNone(self.private_network_id)
+        self.assertIsNotNone(self.EXTERNAL_NETWORK_ID)
+        self.assertIsNotNone(self.PRIVATE_NETWORK_ID)
 
     def _create_subnet(self, network_name, subnet_name):
         subnet_id = None

openstackclient/tests/functional/network/v2/test_ip_availability.py

@@ -10,6 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from typing import ClassVar
 import uuid
 
 from openstackclient.tests.functional.network.v2 import common
@@ -18,6 +19,9 @@ from openstackclient.tests.functional.network.v2 import common
 class IPAvailabilityTests(common.NetworkTests):
     """Functional tests for IP availability"""
 
+    NAME: ClassVar[str]
+    NETWORK_NAME: ClassVar[str]
+
     @classmethod
     def setUpClass(cls):
         super().setUpClass()

openstackclient/tests/functional/network/v2/test_network_meter_rule.py

@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from typing import ClassVar
 import unittest
 import uuid
 
@@ -22,8 +23,8 @@ from openstackclient.tests.functional.network.v2 import common
 class TestMeterRule(common.NetworkTests):
     """Functional tests for meter rule"""
 
-    METER_ID: str
-    METER_RULE_ID: str
+    METER_ID: ClassVar[str]
+    METER_NAME: ClassVar[str]
 
     @classmethod
     def setUpClass(cls):

openstackclient/tests/functional/network/v2/test_network_segment.py

@@ -10,6 +10,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from typing import ClassVar
 import uuid
 
 from openstackclient.tests.functional.network.v2 import common
@@ -18,6 +19,10 @@ from openstackclient.tests.functional.network.v2 import common
 class NetworkSegmentTests(common.NetworkTests):
     """Functional tests for network segment"""
 
+    NETWORK_NAME: ClassVar[str]
+    NETWORK_ID: ClassVar[str]
+    PHYSICAL_NETWORK_NAME: ClassVar[str]
+
     @classmethod
     def setUpClass(cls):
         super().setUpClass()

openstackclient/tests/functional/network/v2/test_subnet.py

@@ -11,6 +11,7 @@
 #    under the License.
 
 import random
+from typing import ClassVar
 import uuid
 
 from openstackclient.tests.functional.network.v2 import common
@@ -21,19 +22,22 @@ class SubnetTests(common.NetworkTagTests):
 
     base_command = 'subnet'
 
+    NETWORK_NAME: ClassVar[str]
+    NETWORK_ID: ClassVar[str]
+
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        if cls.haz_network:
-            cls.NETWORK_NAME = uuid.uuid4().hex
 
-            # Create a network for the all subnet tests
-            cmd_output = cls.openstack(
-                'network create ' + cls.NETWORK_NAME,
-                parse_output=True,
-            )
-            # Get network_id for assertEqual
-            cls.NETWORK_ID = cmd_output["id"]
+        cls.NETWORK_NAME = uuid.uuid4().hex
+
+        # Create a network for the all subnet tests
+        cmd_output = cls.openstack(
+            'network create ' + cls.NETWORK_NAME,
+            parse_output=True,
+        )
+        # Get network_id for assertEqual
+        cls.NETWORK_ID = cmd_output["id"]
 
     @classmethod
     def tearDownClass(cls):

openstackclient/tests/functional/object/v1/common.py

@@ -10,12 +10,16 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from typing import ClassVar
+
 from openstackclient.tests.functional import base
 
 
 class ObjectStoreTests(base.TestCase):
     """Functional tests for Object Store commands"""
 
+    haz_object_store: ClassVar[bool]
+
     @classmethod
     def setUpClass(cls):
         super().setUpClass()

openstackclient/tests/functional/volume/v2/common.py

@@ -10,6 +10,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from typing import ClassVar
+
 import fixtures
 
 from openstackclient.tests.functional.volume import base
@@ -18,6 +20,8 @@ from openstackclient.tests.functional.volume import base
 class BaseVolumeTests(base.BaseVolumeTests):
     """Base class for Volume functional tests."""
 
+    haz_volume_v2: ClassVar[bool]
+
     @classmethod
     def setUpClass(cls):
         super().setUpClass()