python-openstackclient 7.1.2__py3-none-any.whl → 7.2.0__py3-none-any.whl

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

@@ -25,31 +25,26 @@ class RegisteredLimitTestCase(common.IdentityTests):
 
     def test_registered_limit_create_with_service_id(self):
         service_name = self._create_dummy_service()
-        raw_output = self.openstack(
-            'service show' ' %(service_name)s' % {'service_name': service_name}
-        )
+        raw_output = self.openstack('service show' f' {service_name}')
         service_items = self.parse_show(raw_output)
         service_id = self._extract_value_from_items('id', service_items)
 
         raw_output = self.openstack(
             'registered limit create'
-            ' --service %(service_id)s'
-            ' --default-limit %(default_limit)s'
-            ' %(resource_name)s'
-            % {
-                'service_id': service_id,
-                'default_limit': 10,
-                'resource_name': 'cores',
-            },
+            ' --service {service_id}'
+            ' --default-limit {default_limit}'
+            ' {resource_name}'.format(
+                service_id=service_id,
+                default_limit=10,
+                resource_name='cores',
+            ),
             cloud=SYSTEM_CLOUD,
         )
         items = self.parse_show(raw_output)
         registered_limit_id = self._extract_value_from_items('id', items)
         self.addCleanup(
             self.openstack,
-            'registered limit delete'
-            ' %(registered_limit_id)s'
-            % {'registered_limit_id': registered_limit_id},
+            'registered limit delete' f' {registered_limit_id}',
             cloud=SYSTEM_CLOUD,
         )
 
@@ -68,19 +63,18 @@ class RegisteredLimitTestCase(common.IdentityTests):
 
         raw_output = self.openstack(
             'registered limit create'
-            ' --description \'%(description)s\''
-            ' --region %(region_id)s'
-            ' --service %(service_name)s'
-            ' --default-limit %(default_limit)s'
-            ' %(resource_name)s' % params,
+            ' --description \'{description}\''
+            ' --region {region_id}'
+            ' --service {service_name}'
+            ' --default-limit {default_limit}'
+            ' {resource_name}'.format(**params),
             cloud=SYSTEM_CLOUD,
         )
         items = self.parse_show(raw_output)
         registered_limit_id = self._extract_value_from_items('id', items)
         self.addCleanup(
             self.openstack,
-            'registered limit delete %(registered_limit_id)s'
-            % {'registered_limit_id': registered_limit_id},
+            f'registered limit delete {registered_limit_id}',
             cloud=SYSTEM_CLOUD,
         )
 
@@ -89,8 +83,7 @@ class RegisteredLimitTestCase(common.IdentityTests):
     def test_registered_limit_show(self):
         registered_limit_id = self._create_dummy_registered_limit()
         raw_output = self.openstack(
-            'registered limit show %(registered_limit_id)s'
-            % {'registered_limit_id': registered_limit_id}
+            f'registered limit show {registered_limit_id}'
         )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.REGISTERED_LIMIT_FIELDS)
@@ -105,8 +98,8 @@ class RegisteredLimitTestCase(common.IdentityTests):
         }
         raw_output = self.openstack(
             'registered limit set'
-            ' %(registered_limit_id)s'
-            ' --region %(region_id)s' % params,
+            ' {registered_limit_id}'
+            ' --region {region_id}'.format(**params),
             cloud=SYSTEM_CLOUD,
         )
         items = self.parse_show(raw_output)
@@ -120,8 +113,8 @@ class RegisteredLimitTestCase(common.IdentityTests):
         }
         raw_output = self.openstack(
             'registered limit set'
-            ' %(registered_limit_id)s'
-            ' --description \'%(description)s\'' % params,
+            ' {registered_limit_id}'
+            ' --description \'{description}\''.format(**params),
             cloud=SYSTEM_CLOUD,
         )
         items = self.parse_show(raw_output)
@@ -136,8 +129,8 @@ class RegisteredLimitTestCase(common.IdentityTests):
         }
         raw_output = self.openstack(
             'registered limit set'
-            ' %(registered_limit_id)s'
-            ' --service %(service)s' % params,
+            ' {registered_limit_id}'
+            ' --service {service}'.format(**params),
             cloud=SYSTEM_CLOUD,
         )
         items = self.parse_show(raw_output)
@@ -151,8 +144,8 @@ class RegisteredLimitTestCase(common.IdentityTests):
         }
         raw_output = self.openstack(
             'registered limit set'
-            ' %(registered_limit_id)s'
-            ' --default-limit %(default_limit)s' % params,
+            ' {registered_limit_id}'
+            ' --default-limit {default_limit}'.format(**params),
             cloud=SYSTEM_CLOUD,
         )
         items = self.parse_show(raw_output)
@@ -167,8 +160,8 @@ class RegisteredLimitTestCase(common.IdentityTests):
         }
         raw_output = self.openstack(
             'registered limit set'
-            ' %(registered_limit_id)s'
-            ' --resource-name %(resource_name)s' % params,
+            ' {registered_limit_id}'
+            ' --resource-name {resource_name}'.format(**params),
             cloud=SYSTEM_CLOUD,
         )
         items = self.parse_show(raw_output)
@@ -185,9 +178,7 @@ class RegisteredLimitTestCase(common.IdentityTests):
             add_clean_up=False
         )
         raw_output = self.openstack(
-            'registered limit delete'
-            ' %(registered_limit_id)s'
-            % {'registered_limit_id': registered_limit_id},
+            'registered limit delete' f' {registered_limit_id}',
             cloud=SYSTEM_CLOUD,
         )
         self.assertEqual(0, len(raw_output))

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

@@ -23,12 +23,10 @@ class RoleTests(common.IdentityTests):
         role_name = data_utils.rand_name('TestRole')
         description = data_utils.rand_name('description')
         raw_output = self.openstack(
-            'role create '
-            '--description %(description)s '
-            '%(name)s' % {'description': description, 'name': role_name}
+            'role create ' f'--description {description} ' f'{role_name}'
         )
         role = self.parse_show_as_object(raw_output)
-        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(description, role['description'])
@@ -36,7 +34,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):
@@ -47,7 +45,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)
 
@@ -58,7 +56,7 @@ class RoleTests(common.IdentityTests):
             f'role set --name {new_role_name} {role_name}'
         )
         self.assertEqual(0, len(raw_output))
-        raw_output = self.openstack('role show %s' % new_role_name)
+        raw_output = self.openstack(f'role show {new_role_name}')
         role = self.parse_show_as_object(raw_output)
         self.assertEqual(new_role_name, role['name'])
 
@@ -69,7 +67,7 @@ class RoleTests(common.IdentityTests):
             f'role set --description {description} {role_name}'
         )
         self.assertEqual(0, len(raw_output))
-        raw_output = self.openstack('role show %s' % role_name)
+        raw_output = self.openstack(f'role show {role_name}')
         role = self.parse_show_as_object(raw_output)
         self.assertEqual(description, role['description'])
 
@@ -78,34 +76,20 @@ class RoleTests(common.IdentityTests):
         username = self._create_dummy_user()
         raw_output = self.openstack(
             'role add '
-            '--project %(project)s '
-            '--project-domain %(project_domain)s '
-            '--user %(user)s '
-            '--user-domain %(user_domain)s '
-            '%(role)s'
-            % {
-                'project': self.project_name,
-                'project_domain': self.domain_name,
-                'user': username,
-                'user_domain': self.domain_name,
-                'role': role_name,
-            }
+            f'--project {self.project_name} '
+            f'--project-domain {self.domain_name} '
+            f'--user {username} '
+            f'--user-domain {self.domain_name} '
+            f'{role_name}'
         )
         self.addCleanup(
             self.openstack,
             'role remove '
-            '--project %(project)s '
-            '--project-domain %(project_domain)s '
-            '--user %(user)s '
-            '--user-domain %(user_domain)s '
-            '%(role)s'
-            % {
-                'project': self.project_name,
-                'project_domain': self.domain_name,
-                'user': username,
-                'user_domain': self.domain_name,
-                'role': role_name,
-            },
+            f'--project {self.project_name} '
+            f'--project-domain {self.domain_name} '
+            f'--user {username} '
+            f'--user-domain {self.domain_name} '
+            f'{role_name}',
         )
         self.assertEqual(0, len(raw_output))
 
@@ -114,33 +98,19 @@ class RoleTests(common.IdentityTests):
         username = self._create_dummy_user()
         add_raw_output = self.openstack(
             'role add '
-            '--project %(project)s '
-            '--project-domain %(project_domain)s '
-            '--user %(user)s '
-            '--user-domain %(user_domain)s '
-            '%(role)s'
-            % {
-                'project': self.project_name,
-                'project_domain': self.domain_name,
-                'user': username,
-                'user_domain': self.domain_name,
-                'role': role_name,
-            }
+            f'--project {self.project_name} '
+            f'--project-domain {self.domain_name} '
+            f'--user {username} '
+            f'--user-domain {self.domain_name} '
+            f'{role_name}'
         )
         remove_raw_output = self.openstack(
             'role remove '
-            '--project %(project)s '
-            '--project-domain %(project_domain)s '
-            '--user %(user)s '
-            '--user-domain %(user_domain)s '
-            '%(role)s'
-            % {
-                'project': self.project_name,
-                'project_domain': self.domain_name,
-                'user': username,
-                'user_domain': self.domain_name,
-                'role': role_name,
-            }
+            f'--project {self.project_name} '
+            f'--project-domain {self.domain_name} '
+            f'--user {username} '
+            f'--user-domain {self.domain_name} '
+            f'{role_name}'
         )
         self.assertEqual(0, len(add_raw_output))
         self.assertEqual(0, len(remove_raw_output))
@@ -165,15 +135,15 @@ class RoleTests(common.IdentityTests):
         implied_role_name = self._create_dummy_role()
         self.openstack(
             'implied role create '
-            '--implied-role %(implied_role)s '
-            '%(role)s' % {'implied_role': implied_role_name, 'role': role_name}
+            f'--implied-role {implied_role_name} '
+            f'{role_name}'
         )
 
     def test_implied_role_delete(self):
         implied_role_name, role_name = self._create_dummy_implied_role()
         raw_output = self.openstack(
             'implied role delete '
-            '--implied-role %(implied_role)s '
-            '%(role)s' % {'implied_role': implied_role_name, 'role': role_name}
+            f'--implied-role {implied_role_name} '
+            f'{role_name}'
         )
         self.assertEqual(0, len(raw_output))

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

@@ -25,43 +25,33 @@ class RoleAssignmentTests(common.IdentityTests):
         system = 'all'
         raw_output = self.openstack(
             'role add '
-            '--user %(user)s '
-            '--system %(system)s '
-            '%(role)s'
-            % {
-                'user': username,
-                'system': system,
-                'role': role_name,
-            }
+            f'--user {username} '
+            f'--system {system} '
+            f'{role_name}'
         )
         self.addCleanup(
             self.openstack,
             'role remove '
-            '--user %(user)s '
-            '--system  %(system)s '
-            '%(role)s'
-            % {
-                'user': username,
-                'system': system,
-                'role': role_name,
-            },
+            f'--user {username} '
+            f'--system  {system} '
+            f'{role_name}',
         )
         self.assertEqual(0, len(raw_output))
 
         raw_output = self.openstack(
-            'role assignment list ' '--user %(user)s ' % {'user': username}
+            'role assignment list ' f'--user {username} '
         )
         items = self.parse_listing(raw_output)
         self.assert_table_structure(items, self.ROLE_ASSIGNMENT_LIST_HEADERS)
 
         raw_output = self.openstack(
-            'role assignment list ' '--role %(role)s ' % {'role': role_name}
+            'role assignment list ' f'--role {role_name} '
         )
         items = self.parse_listing(raw_output)
         self.assert_table_structure(items, self.ROLE_ASSIGNMENT_LIST_HEADERS)
 
         raw_output = self.openstack(
-            'role assignment list ' '--system %(system)s ' % {'system': system}
+            'role assignment list ' f'--system {system} '
         )
         items = self.parse_listing(raw_output)
         self.assert_table_structure(items, self.ROLE_ASSIGNMENT_LIST_HEADERS)
@@ -72,30 +62,20 @@ class RoleAssignmentTests(common.IdentityTests):
         system = 'all'
         raw_output = self.openstack(
             'role add '
-            '--group %(group)s '
-            '--system %(system)s '
-            '%(role)s'
-            % {
-                'group': group,
-                'system': system,
-                'role': role_name,
-            }
+            f'--group {group} '
+            f'--system {system} '
+            f'{role_name}'
         )
         self.addCleanup(
             self.openstack,
             'role remove '
-            '--group %(group)s '
-            '--system %(system)s '
-            '%(role)s'
-            % {
-                'group': group,
-                'system': system,
-                'role': role_name,
-            },
+            f'--group {group} '
+            f'--system {system} '
+            f'{role_name}',
         )
         self.assertEqual(0, len(raw_output))
         raw_output = self.openstack(
-            'role assignment list ' '--group %(group)s ' % {'group': group}
+            'role assignment list ' f'--group {group} '
         )
         items = self.parse_listing(raw_output)
         self.assert_table_structure(items, self.ROLE_ASSIGNMENT_LIST_HEADERS)
@@ -105,31 +85,20 @@ class RoleAssignmentTests(common.IdentityTests):
         username = self._create_dummy_user()
         raw_output = self.openstack(
             'role add '
-            '--domain %(domain)s '
-            '--user %(user)s '
-            '%(role)s'
-            % {
-                'domain': self.domain_name,
-                'user': username,
-                'role': role_name,
-            }
+            f'--domain {self.domain_name} '
+            f'--user {username} '
+            f'{role_name}'
         )
         self.addCleanup(
             self.openstack,
             'role remove '
-            '--domain %(domain)s '
-            '--user %(user)s '
-            '%(role)s'
-            % {
-                'domain': self.domain_name,
-                'user': username,
-                'role': role_name,
-            },
+            f'--domain {self.domain_name} '
+            f'--user {username} '
+            f'{role_name}',
         )
         self.assertEqual(0, len(raw_output))
         raw_output = self.openstack(
-            'role assignment list '
-            '--domain %(domain)s ' % {'domain': self.domain_name}
+            'role assignment list ' f'--domain {self.domain_name} '
         )
         items = self.parse_listing(raw_output)
         self.assert_table_structure(items, self.ROLE_ASSIGNMENT_LIST_HEADERS)
@@ -139,31 +108,20 @@ class RoleAssignmentTests(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}',
         )
         self.assertEqual(0, len(raw_output))
         raw_output = self.openstack(
-            'role assignment list '
-            '--project %(project)s ' % {'project': self.project_name}
+            'role assignment list ' f'--project {self.project_name} '
         )
         items = self.parse_listing(raw_output)
         self.assert_table_structure(items, self.ROLE_ASSIGNMENT_LIST_HEADERS)
@@ -188,15 +146,10 @@ class RoleAssignmentTests(common.IdentityTests):
         username = self._create_dummy_user()
         raw_output = self.openstack(
             'role add '
-            '--project %(project)s '
-            '--user %(user)s '
+            f'--project {self.project_name} '
+            f'--user {username} '
             '--inherited '
-            '%(role)s'
-            % {
-                'project': self.project_name,
-                'user': username,
-                'role': role_name,
-            }
+            f'{role_name}'
         )
         self.assertEqual(0, len(raw_output))
 

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

@@ -21,7 +21,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):
@@ -44,21 +44,15 @@ class ServiceTests(common.IdentityTests):
         new_service_type = data_utils.rand_name('NewTestType')
         raw_output = self.openstack(
             'service set '
-            '--type %(type)s '
-            '--name %(name)s '
-            '--description %(description)s '
+            f'--type {new_service_type} '
+            f'--name {new_service_name} '
+            f'--description {new_service_description} '
             '--disable '
-            '%(service)s'
-            % {
-                'type': new_service_type,
-                'name': new_service_name,
-                'description': new_service_description,
-                'service': service_name,
-            }
+            f'{service_name}'
         )
         self.assertEqual(0, len(raw_output))
         # get service details
-        raw_output = self.openstack('service show %s' % new_service_name)
+        raw_output = self.openstack(f'service show {new_service_name}')
         # assert service details
         service = self.parse_show_as_object(raw_output)
         self.assertEqual(new_service_type, service['type'])
@@ -67,6 +61,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/v3/test_service_provider.py

@@ -24,7 +24,7 @@ class ServiceProviderTests(common.IdentityTests):
     def test_sp_delete(self):
         service_provider = self._create_dummy_sp(add_clean_up=False)
         raw_output = self.openstack(
-            'service provider delete %s' % service_provider
+            f'service provider delete {service_provider}'
         )
         self.assertEqual(0, len(raw_output))
 
@@ -37,7 +37,7 @@ class ServiceProviderTests(common.IdentityTests):
     def test_sp_show(self):
         service_provider = self._create_dummy_sp(add_clean_up=True)
         raw_output = self.openstack(
-            'service provider show %s' % service_provider
+            f'service provider show {service_provider}'
         )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.SERVICE_PROVIDER_FIELDS)
@@ -62,7 +62,7 @@ class ServiceProviderTests(common.IdentityTests):
         )
         self.assertEqual(0, len(raw_output))
         raw_output = self.openstack(
-            'service provider show %s' % service_provider
+            f'service provider show {service_provider}'
         )
         updated_value = self.parse_show_as_object(raw_output)
         self.assertIn(new_description, updated_value['description'])

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

@@ -22,9 +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 '
-            '--domain %(domain)s '
-            '%(name)s' % {'domain': self.domain_name, 'name': username}
+            'user delete ' f'--domain {self.domain_name} ' f'{username}'
         )
         self.assertEqual(0, len(raw_output))
 
@@ -36,25 +34,19 @@ class UserTests(common.IdentityTests):
     def test_user_set(self):
         username = self._create_dummy_user()
         raw_output = self.openstack(
-            'user show '
-            '--domain %(domain)s '
-            '%(name)s' % {'domain': self.domain_name, 'name': username}
+            'user show ' f'--domain {self.domain_name} ' f'{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 '
-            '--domain %(domain)s '
-            '%(name)s' % {'domain': self.domain_name, 'name': new_username}
+            'user show ' f'--domain {self.domain_name} ' f'{new_username}'
         )
         updated_user = self.parse_show_as_object(raw_output)
         self.assertEqual(user['id'], updated_user['id'])
@@ -65,36 +57,29 @@ class UserTests(common.IdentityTests):
         project_name = self._create_dummy_project()
         # get original user details
         raw_output = self.openstack(
-            'user show '
-            '--domain %(domain)s '
-            '%(name)s' % {'domain': self.domain_name, 'name': username}
+            'user show ' f'--domain {self.domain_name} ' f'{username}'
         )
         user = self.parse_show_as_object(raw_output)
         # update user
         raw_output = self.openstack(
             'user set '
-            '--project %(project)s '
-            '--project-domain %(project_domain)s '
-            '%(id)s'
-            % {
-                'project': project_name,
-                'project_domain': self.domain_name,
-                'id': user['id'],
-            }
+            '--project {project} '
+            '--project-domain {project_domain} '
+            '{id}'.format(
+                project=project_name,
+                project_domain=self.domain_name,
+                id=user['id'],
+            )
         )
         self.assertEqual(0, len(raw_output))
         # get updated user details
         raw_output = self.openstack(
-            'user show '
-            '--domain %(domain)s '
-            '%(name)s' % {'domain': self.domain_name, 'name': username}
+            'user show ' f'--domain {self.domain_name} ' f'{username}'
         )
         updated_user = self.parse_show_as_object(raw_output)
         # get project details
         raw_output = self.openstack(
-            'project show '
-            '--domain %(domain)s '
-            '%(name)s' % {'domain': self.domain_name, 'name': project_name}
+            'project show ' f'--domain {self.domain_name} ' f'{project_name}'
         )
         project = self.parse_show_as_object(raw_output)
         # check updated user details
@@ -104,9 +89,7 @@ class UserTests(common.IdentityTests):
     def test_user_show(self):
         username = self._create_dummy_user()
         raw_output = self.openstack(
-            'user show '
-            '--domain %(domain)s '
-            '%(name)s' % {'domain': self.domain_name, 'name': username}
+            'user show ' f'--domain {self.domain_name} ' f'{username}'
         )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.USER_FIELDS)