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

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

@@ -156,10 +156,9 @@ class IdentityTests(base.TestCase):
         cls.openstack(
             '--os-identity-api-version 3 '
             'domain create '
-            '--description %(description)s '
+            f'--description {cls.domain_description} '
             '--enable '
-            '%(name)s'
-            % {'description': cls.domain_description, 'name': cls.domain_name}
+            f'{cls.domain_name}'
         )
 
         # create dummy project
@@ -168,15 +167,10 @@ class IdentityTests(base.TestCase):
         cls.openstack(
             '--os-identity-api-version 3 '
             'project create '
-            '--domain %(domain)s '
-            '--description %(description)s '
+            f'--domain {cls.domain_name} '
+            f'--description {cls.project_description} '
             '--enable '
-            '%(name)s'
-            % {
-                'domain': cls.domain_name,
-                'description': cls.project_description,
-                'name': cls.project_name,
-            }
+            f'{cls.project_name}'
         )
 
     @classmethod
@@ -185,16 +179,16 @@ class IdentityTests(base.TestCase):
             # delete dummy project
             cls.openstack(
                 '--os-identity-api-version 3 '
-                'project delete %s' % cls.project_name
+                f'project delete {cls.project_name}'
             )
             # disable and delete dummy domain
             cls.openstack(
                 '--os-identity-api-version 3 '
-                'domain set --disable %s' % cls.domain_name
+                f'domain set --disable {cls.domain_name}'
             )
             cls.openstack(
                 '--os-identity-api-version 3 '
-                'domain delete %s' % cls.domain_name
+                f'domain delete {cls.domain_name}'
             )
         finally:
             super().tearDownClass()
@@ -220,28 +214,21 @@ class IdentityTests(base.TestCase):
         description = data_utils.rand_name('description')
         raw_output = self.openstack(
             'user create '
-            '--domain %(domain)s '
-            '--project %(project)s '
-            '--project-domain %(project_domain)s '
-            '--password %(password)s '
-            '--email %(email)s '
-            '--description %(description)s '
+            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} '
             '--enable '
-            '%(name)s'
-            % {
-                'domain': self.domain_name,
-                'project': self.project_name,
-                'project_domain': self.domain_name,
-                'email': email,
-                'password': password,
-                'description': description,
-                '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)
@@ -249,10 +236,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'])
@@ -263,8 +252,8 @@ class IdentityTests(base.TestCase):
         implied_role_name = self._create_dummy_role(add_clean_up)
         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}'
         )
 
         return implied_role_name, role_name
@@ -274,21 +263,16 @@ class IdentityTests(base.TestCase):
         description = data_utils.rand_name('description')
         raw_output = self.openstack(
             'group create '
-            '--domain %(domain)s '
-            '--description %(description)s '
-            '%(name)s'
-            % {
-                'domain': self.domain_name,
-                'description': description,
-                'name': group_name,
-            }
+            f'--domain {self.domain_name} '
+            f'--description {description} '
+            f'{group_name}'
         )
         if add_clean_up:
             self.addCleanup(
                 self.openstack,
                 'group delete '
-                '--domain %(domain)s '
-                '%(name)s' % {'domain': self.domain_name, 'name': group_name},
+                f'--domain {self.domain_name} '
+                f'{group_name}',
             )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.GROUP_FIELDS)
@@ -299,14 +283,13 @@ class IdentityTests(base.TestCase):
         domain_description = data_utils.rand_name('description')
         self.openstack(
             'domain create '
-            '--description %(description)s '
-            '--enable %(name)s'
-            % {'description': domain_description, 'name': domain_name}
+            f'--description {domain_description} '
+            f'--enable {domain_name}'
         )
         if add_clean_up:
-            self.addCleanup(self.openstack, 'domain delete %s' % domain_name)
+            self.addCleanup(self.openstack, f'domain delete {domain_name}')
             self.addCleanup(
-                self.openstack, 'domain set --disable %s' % domain_name
+                self.openstack, f'domain set --disable {domain_name}'
             )
         return domain_name
 
@@ -315,22 +298,16 @@ class IdentityTests(base.TestCase):
         project_description = data_utils.rand_name('description')
         self.openstack(
             'project create '
-            '--domain %(domain)s '
-            '--description %(description)s '
-            '--enable %(name)s'
-            % {
-                'domain': self.domain_name,
-                'description': project_description,
-                'name': project_name,
-            }
+            f'--domain {self.domain_name} '
+            f'--description {project_description} '
+            f'--enable {project_name}'
         )
         if add_clean_up:
             self.addCleanup(
                 self.openstack,
                 'project delete '
-                '--domain %(domain)s '
-                '%(name)s'
-                % {'domain': self.domain_name, 'name': project_name},
+                f'--domain {self.domain_name} '
+                f'{project_name}',
             )
         return project_name
 
@@ -339,20 +316,15 @@ class IdentityTests(base.TestCase):
         description = data_utils.rand_name('description')
         parent_region_arg = ''
         if parent_region is not None:
-            parent_region_arg = '--parent-region %s' % parent_region
+            parent_region_arg = f'--parent-region {parent_region}'
         raw_output = self.openstack(
             'region create '
-            '%(parent_region_arg)s '
-            '--description %(description)s '
-            '%(id)s'
-            % {
-                'parent_region_arg': parent_region_arg,
-                'description': description,
-                'id': region_id,
-            }
+            f'{parent_region_arg} '
+            f'--description {description} '
+            f'{region_id}'
         )
         if add_clean_up:
-            self.addCleanup(self.openstack, 'region delete %s' % region_id)
+            self.addCleanup(self.openstack, f'region delete {region_id}')
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.REGION_FIELDS)
         return region_id
@@ -363,20 +335,15 @@ class IdentityTests(base.TestCase):
         type_name = data_utils.rand_name('TestType')
         raw_output = self.openstack(
             'service create '
-            '--name %(name)s '
-            '--description %(description)s '
+            f'--name {service_name} '
+            f'--description {description} '
             '--enable '
-            '%(type)s'
-            % {
-                'name': service_name,
-                'description': description,
-                'type': type_name,
-            }
+            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)
@@ -388,22 +355,16 @@ class IdentityTests(base.TestCase):
         endpoint_url = data_utils.rand_url()
         raw_output = self.openstack(
             'endpoint create '
-            '--region %(region)s '
+            f'--region {region_id} '
             '--enable '
-            '%(service)s '
-            '%(interface)s '
-            '%(url)s'
-            % {
-                'region': region_id,
-                'service': service_name,
-                'interface': interface,
-                'url': endpoint_url,
-            }
+            f'{service_name} '
+            f'{interface} '
+            f'{endpoint_url}'
         )
         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)
@@ -414,15 +375,14 @@ class IdentityTests(base.TestCase):
         description = data_utils.rand_name('description')
         raw_output = self.openstack(
             'identity provider create '
-            ' %(name)s '
-            '--description %(description)s '
+            f' {identity_provider} '
+            f'--description {description} '
             '--enable '
-            % {'name': identity_provider, 'description': description}
         )
         if add_clean_up:
             self.addCleanup(
                 self.openstack,
-                'identity provider delete %s' % identity_provider,
+                f'identity provider delete {identity_provider}',
             )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.IDENTITY_PROVIDER_FIELDS)
@@ -433,16 +393,15 @@ class IdentityTests(base.TestCase):
         description = data_utils.rand_name('description')
         raw_output = self.openstack(
             'service provider create '
-            ' %(name)s '
-            '--description %(description)s '
+            f' {service_provider} '
+            f'--description {description} '
             '--auth-url https://sp.example.com:35357 '
             '--service-provider-url https://sp.example.com:5000 '
             '--enable '
-            % {'name': service_provider, 'description': description}
         )
         if add_clean_up:
             self.addCleanup(
-                self.openstack, 'service provider delete %s' % service_provider
+                self.openstack, f'service provider delete {service_provider}'
             )
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.SERVICE_PROVIDER_FIELDS)
@@ -458,9 +417,9 @@ class IdentityTests(base.TestCase):
         }
         raw_output = self.openstack(
             'registered limit create'
-            ' --service %(service_name)s'
-            ' --default-limit %(default_limit)s'
-            ' %(resource_name)s' % params,
+            ' --service {service_name}'
+            ' --default-limit {default_limit}'
+            ' {resource_name}'.format(**params),
             cloud=SYSTEM_CLOUD,
         )
         items = self.parse_show(raw_output)
@@ -469,7 +428,7 @@ class IdentityTests(base.TestCase):
         if add_clean_up:
             self.addCleanup(
                 self.openstack,
-                'registered limit delete %s' % registered_limit_id,
+                f'registered limit delete {registered_limit_id}',
                 cloud=SYSTEM_CLOUD,
             )
 
@@ -486,7 +445,7 @@ class IdentityTests(base.TestCase):
         registered_limit_id = self._create_dummy_registered_limit()
 
         raw_output = self.openstack(
-            'registered limit show %s' % registered_limit_id,
+            f'registered limit show {registered_limit_id}',
             cloud=SYSTEM_CLOUD,
         )
         items = self.parse_show(raw_output)
@@ -495,7 +454,7 @@ class IdentityTests(base.TestCase):
         resource_limit = 15
 
         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)
         project_id = self._extract_value_from_items('id', items)
 
@@ -508,10 +467,10 @@ class IdentityTests(base.TestCase):
 
         raw_output = self.openstack(
             'limit create'
-            ' --project %(project_id)s'
-            ' --service %(service_id)s'
-            ' --resource-limit %(resource_limit)s'
-            ' %(resource_name)s' % params,
+            ' --project {project_id}'
+            ' --service {service_id}'
+            ' --resource-limit {resource_limit}'
+            ' {resource_name}'.format(**params),
             cloud=SYSTEM_CLOUD,
         )
         items = self.parse_show(raw_output)
@@ -520,7 +479,7 @@ class IdentityTests(base.TestCase):
         if add_clean_up:
             self.addCleanup(
                 self.openstack,
-                'limit delete %s' % limit_id,
+                f'limit delete {limit_id}',
                 cloud=SYSTEM_CLOUD,
             )
 

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

@@ -0,0 +1,86 @@
+# 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 ast
+import json
+
+from tempest.lib.common.utils import data_utils
+
+from openstackclient.tests.functional.identity.v3 import common
+
+
+class AccessRuleTests(common.IdentityTests):
+    ACCESS_RULE_FIELDS = [
+        'ID',
+        'Service',
+        'Method',
+        'Path',
+    ]
+    ACCESS_RULE_LIST_HEADERS = [
+        'ID',
+        'Service',
+        'Method',
+        'Path',
+    ]
+
+    def setUp(self):
+        super().setUp()
+
+        application_credential_name = data_utils.rand_name('name')
+        access_rules = json.dumps(
+            [
+                {
+                    'method': 'GET',
+                    'path': '/v2.1/servers',
+                    'service': 'compute',
+                },
+                {
+                    'method': 'GET',
+                    'path': '/v2.0/networks',
+                    'service': 'networking',
+                },
+            ]
+        )
+        raw_output = self.openstack(
+            f"application credential create {application_credential_name} "
+            f"--access-rules '{access_rules}'"
+        )
+        # we immediately delete the application credential since it will leave
+        # the access rules around
+        self.openstack(
+            f'application credential delete {application_credential_name}'
+        )
+
+        items = self.parse_show_as_object(raw_output)
+        self.access_rule_ids = [
+            x['id'] for x in ast.literal_eval(items['access_rules'])
+        ]
+        self.addCleanup(
+            self.openstack,
+            'access rule delete '
+            + ' '.join([x for x in self.access_rule_ids]),
+        )
+
+    def test_access_rule(self):
+        # list
+
+        raw_output = self.openstack('access rule list')
+        items = self.parse_listing(raw_output)
+        self.assert_table_structure(items, self.ACCESS_RULE_LIST_HEADERS)
+
+        # show
+
+        raw_output = self.openstack(
+            f'access rule show {self.access_rule_ids[0]}'
+        )
+        items = self.parse_show(raw_output)
+        self.assert_show_fields(items, self.ACCESS_RULE_FIELDS)

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

@@ -85,34 +85,20 @@ class ApplicationCredentialTests(common.IdentityTests):
         for role in role1, role2:
             self.openstack(
                 'role add'
-                ' --user %(user)s'
-                ' --user-domain %(user_domain)s'
-                ' --project %(project)s'
-                ' --project-domain %(project_domain)s'
-                ' %(role)s'
-                % {
-                    'user': user,
-                    'user_domain': user_domain,
-                    'project': project,
-                    'project_domain': project_domain,
-                    'role': role,
-                }
+                f' --user {user}'
+                f' --user-domain {user_domain}'
+                f' --project {project}'
+                f' --project-domain {project_domain}'
+                f' {role}'
             )
             self.addCleanup(
                 self.openstack,
                 'role remove'
-                ' --user %(user)s'
-                ' --user-domain %(user_domain)s'
-                ' --project %(project)s'
-                ' --project-domain %(project_domain)s'
-                ' %(role)s'
-                % {
-                    'user': user,
-                    'user_domain': user_domain,
-                    'project': project,
-                    'project_domain': project_domain,
-                    'role': role,
-                },
+                f' --user {user}'
+                f' --user-domain {user_domain}'
+                f' --project {project}'
+                f' --project-domain {project_domain}'
+                f' {role}',
             )
         return role1, role2
 
@@ -125,21 +111,13 @@ class ApplicationCredentialTests(common.IdentityTests):
         ).strftime('%Y-%m-%dT%H:%M:%S%z')
         role1, role2 = self._create_role_assignments()
         raw_output = self.openstack(
-            'application credential create %(name)s'
-            ' --secret %(secret)s'
-            ' --description %(description)s'
-            ' --expiration %(tomorrow)s'
-            ' --role %(role1)s'
-            ' --role %(role2)s'
+            f'application credential create {name}'
+            f' --secret {secret}'
+            f' --description {description}'
+            f' --expiration {tomorrow}'
+            f' --role {role1}'
+            f' --role {role2}'
             ' --unrestricted'
-            % {
-                'name': name,
-                'secret': secret,
-                'description': description,
-                'tomorrow': tomorrow,
-                'role1': role1,
-                'role2': role2,
-            }
         )
         self.addCleanup(
             self.openstack,
@@ -151,9 +129,7 @@ class ApplicationCredentialTests(common.IdentityTests):
     def test_application_credential_delete(self):
         name = data_utils.rand_name('name')
         self.openstack(f'application credential create {name}')
-        raw_output = self.openstack(
-            'application credential delete ' '%(name)s' % {'name': name}
-        )
+        raw_output = self.openstack('application credential delete ' f'{name}')
         self.assertEqual(0, len(raw_output))
 
     def test_application_credential_list(self):
@@ -170,8 +146,6 @@ class ApplicationCredentialTests(common.IdentityTests):
             self.openstack,
             f'application credential delete {name}',
         )
-        raw_output = self.openstack(
-            'application credential show ' '%(name)s' % {'name': name}
-        )
+        raw_output = self.openstack('application credential show ' f'{name}')
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.APPLICATION_CREDENTIAL_FIELDS)

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

@@ -38,7 +38,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', '', 'id'])

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

@@ -19,12 +19,10 @@ from openstackclient.tests.functional.identity.v3 import common
 class DomainTests(common.IdentityTests):
     def test_domain_create(self):
         domain_name = data_utils.rand_name('TestDomain')
-        raw_output = self.openstack('domain create %s' % domain_name)
+        raw_output = self.openstack(f'domain create {domain_name}')
         # disable domain first before deleting it
-        self.addCleanup(self.openstack, 'domain delete %s' % domain_name)
-        self.addCleanup(
-            self.openstack, 'domain set --disable %s' % domain_name
-        )
+        self.addCleanup(self.openstack, f'domain delete {domain_name}')
+        self.addCleanup(self.openstack, f'domain set --disable {domain_name}')
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.DOMAIN_FIELDS)
 
@@ -37,18 +35,18 @@ class DomainTests(common.IdentityTests):
     def test_domain_delete(self):
         domain_name = self._create_dummy_domain(add_clean_up=False)
         # cannot delete enabled domain, disable it first
-        raw_output = self.openstack('domain set --disable %s' % domain_name)
+        raw_output = self.openstack(f'domain set --disable {domain_name}')
         self.assertEqual(0, len(raw_output))
-        raw_output = self.openstack('domain delete %s' % domain_name)
+        raw_output = self.openstack(f'domain delete {domain_name}')
         self.assertEqual(0, len(raw_output))
 
     def test_domain_multi_delete(self):
         domain_1 = self._create_dummy_domain(add_clean_up=False)
         domain_2 = self._create_dummy_domain(add_clean_up=False)
         # cannot delete enabled domain, disable it first
-        raw_output = self.openstack('domain set --disable %s' % domain_1)
+        raw_output = self.openstack(f'domain set --disable {domain_1}')
         self.assertEqual(0, len(raw_output))
-        raw_output = self.openstack('domain set --disable %s' % domain_2)
+        raw_output = self.openstack(f'domain set --disable {domain_2}')
         self.assertEqual(0, len(raw_output))
         raw_output = self.openstack(f'domain delete {domain_1} {domain_2}')
         self.assertEqual(0, len(raw_output))
@@ -59,11 +57,11 @@ class DomainTests(common.IdentityTests):
         self.assertRaises(
             exceptions.CommandFailed,
             self.openstack,
-            'domain delete %s' % domain_name,
+            f'domain delete {domain_name}',
         )
 
     def test_domain_show(self):
         domain_name = self._create_dummy_domain()
-        raw_output = self.openstack('domain show %s' % domain_name)
+        raw_output = self.openstack(f'domain show {domain_name}')
         items = self.parse_show(raw_output)
         self.assert_show_fields(items, self.DOMAIN_FIELDS)