python-openstackclient 9.0.0__py3-none-any.whl → 10.1.0__py3-none-any.whl

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

@@ -10,7 +10,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import json
 import os
+import tempfile
+from typing import ClassVar
 
 import fixtures
 from tempest.lib.common.utils import data_utils
@@ -74,6 +77,10 @@ class IdentityTests(base.TestCase):
     ]
     ENDPOINT_LIST_PROJECT_HEADERS = ['ID', 'Name']
 
+    MAPPING_FIELDS = ['id', 'rules', 'schema_version']
+
+    MAPPING_LIST_HEADERS = ['ID', 'schema_version']
+
     IDENTITY_PROVIDER_FIELDS = [
         'description',
         'enabled',
@@ -147,30 +154,35 @@ class IdentityTests(base.TestCase):
         'Region ID',
     ]
 
+    DOMAIN_NAME: ClassVar[str]
+    DOMAIN_DESCRIPTION: ClassVar[str]
+    PROJECT_NAME: ClassVar[str]
+    PROJECT_DESCRIPTION: ClassVar[str]
+
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
         # create dummy domain
-        cls.domain_name = data_utils.rand_name('TestDomain')
-        cls.domain_description = data_utils.rand_name('description')
+        cls.DOMAIN_NAME = data_utils.rand_name('TestDomain')
+        cls.DOMAIN_DESCRIPTION = data_utils.rand_name('description')
         cls.openstack(
             '--os-identity-api-version 3 '
             'domain create '
-            f'--description {cls.domain_description} '
+            f'--description {cls.DOMAIN_DESCRIPTION} '
             '--enable '
-            f'{cls.domain_name}'
+            f'{cls.DOMAIN_NAME}'
         )
 
         # create dummy project
-        cls.project_name = data_utils.rand_name('TestProject')
-        cls.project_description = data_utils.rand_name('description')
+        cls.PROJECT_NAME = data_utils.rand_name('TestProject')
+        cls.PROJECT_DESCRIPTION = data_utils.rand_name('description')
         cls.openstack(
             '--os-identity-api-version 3 '
             'project create '
-            f'--domain {cls.domain_name} '
-            f'--description {cls.project_description} '
+            f'--domain {cls.DOMAIN_NAME} '
+            f'--description {cls.PROJECT_DESCRIPTION} '
             '--enable '
-            f'{cls.project_name}'
+            f'{cls.PROJECT_NAME}'
         )
 
     @classmethod
@@ -179,15 +191,15 @@ class IdentityTests(base.TestCase):
             # delete dummy project
             cls.openstack(
                 '--os-identity-api-version 3 '
-                f'project delete {cls.project_name}'
+                f'project delete {cls.PROJECT_NAME}'
             )
             # disable and delete dummy domain
             cls.openstack(
                 '--os-identity-api-version 3 '
-                f'domain set --disable {cls.domain_name}'
+                f'domain set --disable {cls.DOMAIN_NAME}'
             )
             cls.openstack(
-                f'--os-identity-api-version 3 domain delete {cls.domain_name}'
+                f'--os-identity-api-version 3 domain delete {cls.DOMAIN_NAME}'
             )
         finally:
             super().tearDownClass()
@@ -213,9 +225,9 @@ class IdentityTests(base.TestCase):
         description = data_utils.rand_name('description')
         raw_output = self.openstack(
             'user create '
-            f'--domain {self.domain_name} '
-            f'--project {self.project_name} '
-            f'--project-domain {self.domain_name} '
+            f'--domain {self.DOMAIN_NAME} '
+            f'--project {self.PROJECT_NAME} '
+            f'--project-domain {self.DOMAIN_NAME} '
             f'--password {password} '
             f'--email {email} '
             f'--description {description} '
@@ -262,14 +274,14 @@ class IdentityTests(base.TestCase):
         description = data_utils.rand_name('description')
         raw_output = self.openstack(
             'group create '
-            f'--domain {self.domain_name} '
+            f'--domain {self.DOMAIN_NAME} '
             f'--description {description} '
             f'{group_name}'
         )
         if add_clean_up:
             self.addCleanup(
                 self.openstack,
-                f'group delete --domain {self.domain_name} {group_name}',
+                f'group delete --domain {self.DOMAIN_NAME} {group_name}',
             )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.GROUP_FIELDS)
@@ -295,14 +307,14 @@ class IdentityTests(base.TestCase):
         project_description = data_utils.rand_name('description')
         self.openstack(
             'project create '
-            f'--domain {self.domain_name} '
+            f'--domain {self.DOMAIN_NAME} '
             f'--description {project_description} '
             f'--enable {project_name}'
         )
         if add_clean_up:
             self.addCleanup(
                 self.openstack,
-                f'project delete --domain {self.domain_name} {project_name}',
+                f'project delete --domain {self.DOMAIN_NAME} {project_name}',
             )
         return project_name
 
@@ -365,6 +377,34 @@ class IdentityTests(base.TestCase):
         self.assert_show_fields(items, self.ENDPOINT_FIELDS)
         return endpoint['id']
 
+    def _create_dummy_mapping(self, add_clean_up=True):
+        mapping = data_utils.rand_name('Mapping')
+        # Create rules file
+        with tempfile.NamedTemporaryFile(mode='w+') as f:
+            RULES = [
+                {
+                    "local": [{"group": {"id": "85a868"}}],
+                    "remote": [
+                        {"type": "orgPersonType", "any_one_of": ["Employee"]},
+                        {"type": "sn", "any_one_of": ["Young"]},
+                    ],
+                }
+            ]
+            f.write(json.dumps(RULES))
+            f.flush()
+            raw_output = self.openstack(
+                f'mapping create {mapping} --rules {f.name} --schema-version 1.0'
+            )
+
+        if add_clean_up:
+            self.addCleanup(
+                self.openstack,
+                f'mapping delete {mapping}',
+            )
+        items = self.parse_show(raw_output)
+        self.assert_show_fields(items, self.MAPPING_FIELDS)
+        return mapping
+
     def _create_dummy_idp(self, add_clean_up=True):
         identity_provider = data_utils.rand_name('IdentityProvider')
         description = data_utils.rand_name('description')

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

@@ -107,7 +107,7 @@ class ApplicationCredentialTests(common.IdentityTests):
         secret = data_utils.rand_name('secret')
         description = data_utils.rand_name('description')
         tomorrow = (
-            datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None)
+            datetime.datetime.now(datetime.UTC).replace(tzinfo=None)
             + datetime.timedelta(days=1)
         ).strftime('%Y-%m-%dT%H:%M:%S%z')
         role1, role2 = self._create_role_assignments()

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

@@ -28,7 +28,7 @@ class GroupTests(common.IdentityTests):
 
     def test_group_list_with_domain(self):
         group_name = self._create_dummy_group()
-        raw_output = self.openstack(f'group list --domain {self.domain_name}')
+        raw_output = self.openstack(f'group list --domain {self.DOMAIN_NAME}')
         items = self.parse_listing(raw_output)
         self.assert_table_structure(items, common.BASIC_LIST_HEADERS)
         self.assertIn(group_name, raw_output)
@@ -36,14 +36,14 @@ class GroupTests(common.IdentityTests):
     def test_group_delete(self):
         group_name = self._create_dummy_group(add_clean_up=False)
         raw_output = self.openstack(
-            f'group delete --domain {self.domain_name} {group_name}'
+            f'group delete --domain {self.DOMAIN_NAME} {group_name}'
         )
         self.assertEqual(0, len(raw_output))
 
     def test_group_show(self):
         group_name = self._create_dummy_group()
         raw_output = self.openstack(
-            f'group show --domain {self.domain_name} {group_name}'
+            f'group show --domain {self.DOMAIN_NAME} {group_name}'
         )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.GROUP_FIELDS)
@@ -53,20 +53,20 @@ class GroupTests(common.IdentityTests):
         new_group_name = data_utils.rand_name('NewTestGroup')
         raw_output = self.openstack(
             'group set '
-            f'--domain {self.domain_name} '
+            f'--domain {self.DOMAIN_NAME} '
             f'--name {new_group_name} '
             f'{group_name}'
         )
         self.assertEqual(0, len(raw_output))
         raw_output = self.openstack(
-            f'group show --domain {self.domain_name} {new_group_name}'
+            f'group show --domain {self.DOMAIN_NAME} {new_group_name}'
         )
         group = self.parse_show_as_object(raw_output)
         self.assertEqual(new_group_name, group['name'])
         # reset group name to make sure it will be cleaned up
         raw_output = self.openstack(
             'group set '
-            f'--domain {self.domain_name} '
+            f'--domain {self.DOMAIN_NAME} '
             f'--name {group_name} '
             f'{new_group_name}'
         )
@@ -77,15 +77,15 @@ class GroupTests(common.IdentityTests):
         username = self._create_dummy_user()
         raw_output = self.openstack(
             'group add user '
-            f'--group-domain {self.domain_name} '
-            f'--user-domain {self.domain_name} '
+            f'--group-domain {self.DOMAIN_NAME} '
+            f'--user-domain {self.DOMAIN_NAME} '
             f'{group_name} {username}'
         )
         self.addCleanup(
             self.openstack,
             'group remove user '
-            f'--group-domain {self.domain_name} '
-            f'--user-domain {self.domain_name} '
+            f'--group-domain {self.DOMAIN_NAME} '
+            f'--user-domain {self.DOMAIN_NAME} '
             f'{group_name} {username}',
         )
         self.assertOutput('', raw_output)
@@ -95,22 +95,22 @@ class GroupTests(common.IdentityTests):
         username = self._create_dummy_user()
         raw_output = self.openstack(
             'group add user '
-            f'--group-domain {self.domain_name} '
-            f'--user-domain {self.domain_name} '
+            f'--group-domain {self.DOMAIN_NAME} '
+            f'--user-domain {self.DOMAIN_NAME} '
             f'{group_name} {username}'
         )
         self.addCleanup(
             self.openstack,
             'group remove user '
-            f'--group-domain {self.domain_name} '
-            f'--user-domain {self.domain_name} '
+            f'--group-domain {self.DOMAIN_NAME} '
+            f'--user-domain {self.DOMAIN_NAME} '
             f'{group_name} {username}',
         )
         self.assertOutput('', raw_output)
         raw_output = self.openstack(
             'group contains user '
-            f'--group-domain {self.domain_name} '
-            f'--user-domain {self.domain_name} '
+            f'--group-domain {self.DOMAIN_NAME} '
+            f'--user-domain {self.DOMAIN_NAME} '
             f'{group_name} {username}'
         )
         self.assertEqual(
@@ -123,14 +123,14 @@ class GroupTests(common.IdentityTests):
         username = self._create_dummy_user()
         add_raw_output = self.openstack(
             'group add user '
-            f'--group-domain {self.domain_name} '
-            f'--user-domain {self.domain_name} '
+            f'--group-domain {self.DOMAIN_NAME} '
+            f'--user-domain {self.DOMAIN_NAME} '
             f'{group_name} {username}'
         )
         remove_raw_output = self.openstack(
             'group remove user '
-            f'--group-domain {self.domain_name} '
-            f'--user-domain {self.domain_name} '
+            f'--group-domain {self.DOMAIN_NAME} '
+            f'--user-domain {self.DOMAIN_NAME} '
             f'{group_name} {username}'
         )
         self.assertOutput('', add_raw_output)

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

@@ -56,7 +56,9 @@ class IdentityProviderTests(common.IdentityTests):
         raw_output = self.openstack(
             f'identity provider set '
             f'{identity_provider} '
-            f'--remote-id {new_remoteid}'
+            f'--authorization-ttl 7 '
+            f'--remote-id {new_remoteid} '
+            f'--remote-id {new_remoteid + "2nd"}'
         )
         self.assertEqual(0, len(raw_output))
         raw_output = self.openstack(

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

@@ -0,0 +1,81 @@
+#    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.
+
+import json
+import tempfile
+
+from openstackclient.tests.functional.identity.v3 import common
+
+
+class MappingTests(common.IdentityTests):
+    def test_mapping_create(self):
+        self._create_dummy_mapping()
+
+    def test_mapping_delete(self):
+        mapping = self._create_dummy_mapping(add_clean_up=False)
+        raw_output = self.openstack(f'mapping delete {mapping}')
+        self.assertEqual(0, len(raw_output))
+
+    def test_mapping_multi_delete(self):
+        mapping_1 = self._create_dummy_mapping(add_clean_up=False)
+        mapping_2 = self._create_dummy_mapping(add_clean_up=False)
+        raw_output = self.openstack(f'mapping delete {mapping_1} {mapping_2}')
+        self.assertEqual(0, len(raw_output))
+
+    def test_mapping_show(self):
+        mapping = self._create_dummy_mapping(add_clean_up=True)
+        raw_output = self.openstack(f'mapping show {mapping}')
+        items = self.parse_show(raw_output)
+        self.assert_show_fields(items, self.MAPPING_FIELDS)
+
+    def test_mapping_list(self):
+        self._create_dummy_mapping(add_clean_up=True)
+        raw_output = self.openstack('mapping list')
+        items = self.parse_listing(raw_output)
+        self.assert_table_structure(items, self.MAPPING_LIST_HEADERS)
+
+    def test_mapping_set(self):
+        mapping = self._create_dummy_mapping(add_clean_up=True)
+        new_schema_version = '2.0'
+        with tempfile.NamedTemporaryFile(mode='w+') as f:
+            NEW_RULES = [
+                {
+                    "local": [{"group": {"id": "85a868"}}],
+                    "remote": [
+                        {"type": "orgPersonType", "any_one_of": ["Employee"]},
+                        {"type": "sn", "any_one_of": ["Young"]},
+                    ],
+                },
+                {
+                    "local": [
+                        {"group": {"id": "0cd5e9"}},
+                        {"user": {"name": "0cd5e9"}},
+                    ],
+                    "remote": [
+                        {"type": "UserName"},
+                        {
+                            "type": "orgPersonType",
+                            "not_any_of": ["Contractor", "SubContractor"],
+                        },
+                        {"type": "LastName", "any_one_of": ["Bo"]},
+                    ],
+                },
+            ]
+            f.write(json.dumps(NEW_RULES))
+            f.flush()
+            raw_output = self.openstack(
+                f'mapping set {mapping} --rules {f.name} --schema-version {new_schema_version}'
+            )
+        self.assertEqual(0, len(raw_output))
+        raw_output = self.openstack(f'mapping show {mapping}')
+        updated_value = self.parse_show_as_object(raw_output)
+        self.assertEqual('2.0', updated_value['schema_version'])

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}',