python-openstackclient 7.1.3__py3-none-any.whl → 7.2.1__py3-none-any.whl

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

@@ -67,13 +67,9 @@ class IdentityTests(base.TestCase):
             cls.openstack(
                 '--os-identity-api-version 2 '
                 'project create '
-                '--description %(description)s '
+                f'--description {cls.project_description} '
                 '--enable '
-                '%(name)s'
-                % {
-                    'description': cls.project_description,
-                    'name': cls.project_name,
-                }
+                f'{cls.project_name}'
             )
         except tempest_exceptions.CommandFailed:
             # Good chance this is due to Identity v2 admin not being enabled
@@ -87,7 +83,7 @@ class IdentityTests(base.TestCase):
         try:
             cls.openstack(
                 '--os-identity-api-version 2 '
-                'project delete %s' % cls.project_name
+                f'project delete {cls.project_name}'
             )
         finally:
             super().tearDownClass()
@@ -111,14 +107,13 @@ class IdentityTests(base.TestCase):
         project_description = data_utils.rand_name('description')
         raw_output = self.openstack(
             'project create '
-            '--description %(description)s '
-            '--enable %(name)s'
-            % {'description': project_description, 'name': project_name}
+            f'--description {project_description} '
+            f'--enable {project_name}'
         )
         project = self.parse_show_as_object(raw_output)
         if add_clean_up:
             self.addCleanup(
-                self.openstack, 'project delete %s' % project['id']
+                self.openstack, 'project delete {}'.format(project['id'])
             )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.PROJECT_FIELDS)
@@ -130,22 +125,18 @@ class IdentityTests(base.TestCase):
         email = data_utils.rand_name() + '@example.com'
         raw_output = self.openstack(
             'user create '
-            '--project %(project)s '
-            '--password %(password)s '
-            '--email %(email)s '
+            f'--project {self.project_name} '
+            f'--password {password} '
+            f'--email {email} '
             '--enable '
-            '%(name)s'
-            % {
-                'project': self.project_name,
-                'email': email,
-                'password': password,
-                'name': username,
-            }
+            f'{username}'
         )
         if add_clean_up:
             self.addCleanup(
                 self.openstack,
-                'user delete %s' % self.parse_show_as_object(raw_output)['id'],
+                'user delete {}'.format(
+                    self.parse_show_as_object(raw_output)['id']
+                ),
             )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.USER_FIELDS)
@@ -153,10 +144,12 @@ class IdentityTests(base.TestCase):
 
     def _create_dummy_role(self, add_clean_up=True):
         role_name = data_utils.rand_name('TestRole')
-        raw_output = self.openstack('role create %s' % role_name)
+        raw_output = self.openstack(f'role create {role_name}')
         role = self.parse_show_as_object(raw_output)
         if add_clean_up:
-            self.addCleanup(self.openstack, 'role delete %s' % role['id'])
+            self.addCleanup(
+                self.openstack, 'role delete {}'.format(role['id'])
+            )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.ROLE_FIELDS)
         self.assertEqual(role_name, role['name'])
@@ -168,7 +161,7 @@ class IdentityTests(base.TestCase):
         access_key = ec2_credentials['access']
         if add_clean_up:
             self.addCleanup(
-                self.openstack, 'ec2 credentials delete %s' % access_key
+                self.openstack, f'ec2 credentials delete {access_key}'
             )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.EC2_CREDENTIALS_FIELDS)
@@ -178,7 +171,9 @@ class IdentityTests(base.TestCase):
         raw_output = self.openstack('token issue')
         token = self.parse_show_as_object(raw_output)
         if add_clean_up:
-            self.addCleanup(self.openstack, 'token revoke %s' % token['id'])
+            self.addCleanup(
+                self.openstack, 'token revoke {}'.format(token['id'])
+            )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.TOKEN_FIELDS)
         return token['id']
@@ -189,19 +184,14 @@ class IdentityTests(base.TestCase):
         type_name = data_utils.rand_name('TestType')
         raw_output = self.openstack(
             'service create '
-            '--name %(name)s '
-            '--description %(description)s '
-            '%(type)s'
-            % {
-                'name': service_name,
-                'description': description,
-                'type': type_name,
-            }
+            f'--name {service_name} '
+            f'--description {description} '
+            f'{type_name}'
         )
         if add_clean_up:
             service = self.parse_show_as_object(raw_output)
             self.addCleanup(
-                self.openstack, 'service delete %s' % service['id']
+                self.openstack, 'service delete {}'.format(service['id'])
             )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.SERVICE_FIELDS)
@@ -215,23 +205,16 @@ class IdentityTests(base.TestCase):
         internal_url = data_utils.rand_url()
         raw_output = self.openstack(
             'endpoint create '
-            '--publicurl %(publicurl)s '
-            '--adminurl %(adminurl)s '
-            '--internalurl %(internalurl)s '
-            '--region %(region)s '
-            '%(service)s'
-            % {
-                'publicurl': public_url,
-                'adminurl': admin_url,
-                'internalurl': internal_url,
-                'region': region_id,
-                'service': service_name,
-            }
+            f'--publicurl {public_url} '
+            f'--adminurl {admin_url} '
+            f'--internalurl {internal_url} '
+            f'--region {region_id} '
+            f'{service_name}'
         )
         endpoint = self.parse_show_as_object(raw_output)
         if add_clean_up:
             self.addCleanup(
-                self.openstack, 'endpoint delete %s' % endpoint['id']
+                self.openstack, 'endpoint delete {}'.format(endpoint['id'])
             )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.ENDPOINT_FIELDS)

openstackclient/tests/functional/identity/v2/test_catalog.py

@@ -35,7 +35,7 @@ class CatalogTests(common.IdentityTests):
         | type      | identity                                  |
         +-----------+-------------------------------------------+
         """
-        raw_output = self.openstack('catalog show %s' % 'identity')
+        raw_output = self.openstack('catalog show {}'.format('identity'))
         items = self.parse_show(raw_output)
         # items may have multiple endpoint urls with empty key
         self.assert_show_fields(items, ['endpoints', 'name', 'type', ''])

openstackclient/tests/functional/identity/v2/test_ec2_credentials.py

@@ -20,7 +20,7 @@ class EC2CredentialsTests(common.IdentityTests):
     def test_ec2_credentials_delete(self):
         access_key = self._create_dummy_ec2_credentials(add_clean_up=False)
         raw_output = self.openstack(
-            'ec2 credentials delete %s' % access_key,
+            f'ec2 credentials delete {access_key}',
         )
         self.assertEqual(0, len(raw_output))
 
@@ -41,7 +41,7 @@ class EC2CredentialsTests(common.IdentityTests):
     def test_ec2_credentials_show(self):
         access_key = self._create_dummy_ec2_credentials()
         show_output = self.openstack(
-            'ec2 credentials show %s' % access_key,
+            f'ec2 credentials show {access_key}',
         )
         items = self.parse_show(show_output)
         self.assert_show_fields(items, self.EC2_CREDENTIALS_FIELDS)

openstackclient/tests/functional/identity/v2/test_endpoint.py

@@ -19,7 +19,7 @@ class EndpointTests(common.IdentityTests):
 
     def test_endpoint_delete(self):
         endpoint_id = self._create_dummy_endpoint(add_clean_up=False)
-        raw_output = self.openstack('endpoint delete %s' % endpoint_id)
+        raw_output = self.openstack(f'endpoint delete {endpoint_id}')
         self.assertEqual(0, len(raw_output))
 
     def test_endpoint_multi_delete(self):
@@ -39,6 +39,6 @@ class EndpointTests(common.IdentityTests):
 
     def test_endpoint_show(self):
         endpoint_id = self._create_dummy_endpoint()
-        raw_output = self.openstack('endpoint show %s' % endpoint_id)
+        raw_output = self.openstack(f'endpoint show {endpoint_id}')
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.ENDPOINT_FIELDS)

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

@@ -21,13 +21,13 @@ class ProjectTests(common.IdentityTests):
         description = data_utils.rand_name('description')
         raw_output = self.openstack(
             'project create '
-            '--description %(description)s '
+            f'--description {description} '
             '--enable '
             '--property k1=v1 '
             '--property k2=v2 '
-            '%(name)s' % {'description': description, 'name': project_name}
+            f'{project_name}'
         )
-        self.addCleanup(self.openstack, 'project delete %s' % project_name)
+        self.addCleanup(self.openstack, f'project delete {project_name}')
         items = self.parse_show(raw_output)
         show_fields = list(self.PROJECT_FIELDS)
         show_fields.extend(['k1', 'k2'])
@@ -38,7 +38,7 @@ class ProjectTests(common.IdentityTests):
 
     def test_project_delete(self):
         project_name = self._create_dummy_project(add_clean_up=False)
-        raw_output = self.openstack('project delete %s' % project_name)
+        raw_output = self.openstack(f'project delete {project_name}')
         self.assertEqual(0, len(raw_output))
 
     def test_project_list(self):
@@ -51,14 +51,14 @@ class ProjectTests(common.IdentityTests):
         new_project_name = data_utils.rand_name('NewTestProject')
         raw_output = self.openstack(
             'project set '
-            '--name %(new_name)s '
+            f'--name {new_project_name} '
             '--disable '
             '--property k0=v0 '
-            '%(name)s' % {'new_name': new_project_name, 'name': project_name}
+            f'{project_name}'
         )
         self.assertEqual(0, len(raw_output))
         # check project details
-        raw_output = self.openstack('project show %s' % new_project_name)
+        raw_output = self.openstack(f'project show {new_project_name}')
         items = self.parse_show(raw_output)
         fields = list(self.PROJECT_FIELDS)
         fields.extend(['properties'])
@@ -70,7 +70,7 @@ class ProjectTests(common.IdentityTests):
 
     def test_project_show(self):
         project_name = self._create_dummy_project()
-        raw_output = self.openstack('project show %s' % project_name)
+        raw_output = self.openstack(f'project show {project_name}')
         items = self.parse_show(raw_output)
         fields = list(self.PROJECT_FIELDS)
         fields.extend(['properties'])

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

@@ -19,7 +19,7 @@ class RoleTests(common.IdentityTests):
 
     def test_role_delete(self):
         role_name = self._create_dummy_role(add_clean_up=False)
-        raw_output = self.openstack('role delete %s' % role_name)
+        raw_output = self.openstack(f'role delete {role_name}')
         self.assertEqual(0, len(raw_output))
 
     def test_role_list(self):
@@ -30,7 +30,7 @@ class RoleTests(common.IdentityTests):
 
     def test_role_show(self):
         role_name = self._create_dummy_role()
-        raw_output = self.openstack('role show %s' % role_name)
+        raw_output = self.openstack(f'role show {role_name}')
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.ROLE_FIELDS)
 
@@ -39,26 +39,16 @@ class RoleTests(common.IdentityTests):
         username = self._create_dummy_user()
         raw_output = self.openstack(
             'role add '
-            '--project %(project)s '
-            '--user %(user)s '
-            '%(role)s'
-            % {
-                'project': self.project_name,
-                'user': username,
-                'role': role_name,
-            }
+            f'--project {self.project_name} '
+            f'--user {username} '
+            f'{role_name}'
         )
         self.addCleanup(
             self.openstack,
             'role remove '
-            '--project %(project)s '
-            '--user %(user)s '
-            '%(role)s'
-            % {
-                'project': self.project_name,
-                'user': username,
-                'role': role_name,
-            },
+            f'--project {self.project_name} '
+            f'--user {username} '
+            f'{role_name}',
         )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.ROLE_FIELDS)
@@ -68,25 +58,15 @@ class RoleTests(common.IdentityTests):
         username = self._create_dummy_user()
         add_raw_output = self.openstack(
             'role add '
-            '--project %(project)s '
-            '--user %(user)s '
-            '%(role)s'
-            % {
-                'project': self.project_name,
-                'user': username,
-                'role': role_name,
-            }
+            f'--project {self.project_name} '
+            f'--user {username} '
+            f'{role_name}'
         )
         del_raw_output = self.openstack(
             'role remove '
-            '--project %(project)s '
-            '--user %(user)s '
-            '%(role)s'
-            % {
-                'project': self.project_name,
-                'user': username,
-                'role': role_name,
-            }
+            f'--project {self.project_name} '
+            f'--user {username} '
+            f'{role_name}'
         )
         items = self.parse_show(add_raw_output)
         self.assert_show_fields(items, self.ROLE_FIELDS)

openstackclient/tests/functional/identity/v2/test_service.py

@@ -19,7 +19,7 @@ class ServiceTests(common.IdentityTests):
 
     def test_service_delete(self):
         service_name = self._create_dummy_service(add_clean_up=False)
-        raw_output = self.openstack('service delete %s' % service_name)
+        raw_output = self.openstack(f'service delete {service_name}')
         self.assertEqual(0, len(raw_output))
 
     def test_service_multi_delete(self):
@@ -38,6 +38,6 @@ class ServiceTests(common.IdentityTests):
 
     def test_service_show(self):
         service_name = self._create_dummy_service()
-        raw_output = self.openstack('service show %s' % service_name)
+        raw_output = self.openstack(f'service show {service_name}')
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.SERVICE_FIELDS)

openstackclient/tests/functional/identity/v2/test_token.py

@@ -19,5 +19,5 @@ class TokenTests(common.IdentityTests):
 
     def test_token_revoke(self):
         token_id = self._create_dummy_token(add_clean_up=False)
-        raw_output = self.openstack('token revoke %s' % token_id)
+        raw_output = self.openstack(f'token revoke {token_id}')
         self.assertEqual(0, len(raw_output))

openstackclient/tests/functional/identity/v2/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('user delete %s' % username)
+        raw_output = self.openstack(f'user delete {username}')
         self.assertEqual(0, len(raw_output))
 
     def test_user_list(self):
@@ -32,26 +32,24 @@ class UserTests(common.IdentityTests):
 
     def test_user_set(self):
         username = self._create_dummy_user()
-        raw_output = self.openstack('user show %s' % username)
+        raw_output = self.openstack(f'user show {username}')
         user = self.parse_show_as_object(raw_output)
         new_username = data_utils.rand_name('NewTestUser')
         new_email = data_utils.rand_name() + '@example.com'
         raw_output = self.openstack(
-            'user set '
-            '--email %(email)s '
-            '--name %(new_name)s '
-            '%(id)s'
-            % {'email': new_email, 'new_name': new_username, 'id': user['id']}
+            'user set ' '--email {email} ' '--name {new_name} ' '{id}'.format(
+                email=new_email, new_name=new_username, id=user['id']
+            )
         )
         self.assertEqual(0, len(raw_output))
-        raw_output = self.openstack('user show %s' % new_username)
+        raw_output = self.openstack(f'user show {new_username}')
         new_user = self.parse_show_as_object(raw_output)
         self.assertEqual(user['id'], new_user['id'])
         self.assertEqual(new_email, new_user['email'])
 
     def test_user_show(self):
         username = self._create_dummy_user()
-        raw_output = self.openstack('user show %s' % username)
+        raw_output = self.openstack(f'user show {username}')
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.USER_FIELDS)