diff options
Diffstat (limited to 'openstackclient/tests/functional')
25 files changed, 792 insertions, 534 deletions
diff --git a/openstackclient/tests/functional/identity/v2/common.py b/openstackclient/tests/functional/identity/v2/common.py index 43c0cbf2..9d3601eb 100644 --- a/openstackclient/tests/functional/identity/v2/common.py +++ b/openstackclient/tests/functional/identity/v2/common.py @@ -23,21 +23,37 @@ BASIC_LIST_HEADERS = ['ID', 'Name'] class IdentityTests(base.TestCase): - """Functional tests for Identity commands. """ + """Functional tests for Identity commands.""" USER_FIELDS = ['email', 'enabled', 'id', 'name', 'project_id', 'username'] PROJECT_FIELDS = ['enabled', 'id', 'name', 'description'] TOKEN_FIELDS = ['expires', 'id', 'project_id', 'user_id'] ROLE_FIELDS = ['id', 'name', 'domain_id'] SERVICE_FIELDS = ['id', 'enabled', 'name', 'type', 'description'] - ENDPOINT_FIELDS = ['id', 'region', 'service_id', 'service_name', - 'service_type', 'publicurl', - 'adminurl', 'internalurl'] - - EC2_CREDENTIALS_FIELDS = ['access', 'project_id', 'secret', - 'trust_id', 'user_id'] - EC2_CREDENTIALS_LIST_HEADERS = ['Access', 'Secret', - 'Project ID', 'User ID'] + ENDPOINT_FIELDS = [ + 'id', + 'region', + 'service_id', + 'service_name', + 'service_type', + 'publicurl', + 'adminurl', + 'internalurl', + ] + + EC2_CREDENTIALS_FIELDS = [ + 'access', + 'project_id', + 'secret', + 'trust_id', + 'user_id', + ] + EC2_CREDENTIALS_LIST_HEADERS = [ + 'Access', + 'Secret', + 'Project ID', + 'User ID', + ] CATALOG_LIST_HEADERS = ['Name', 'Type', 'Endpoints'] ENDPOINT_LIST_HEADERS = ['ID', 'Region', 'Service Name', 'Service Type'] @@ -53,7 +69,8 @@ class IdentityTests(base.TestCase): 'project create ' '--description %(description)s ' '--enable ' - '%(name)s' % { + '%(name)s' + % { 'description': cls.project_description, 'name': cls.project_name, } @@ -70,7 +87,8 @@ class IdentityTests(base.TestCase): try: cls.openstack( '--os-identity-api-version 2 ' - 'project delete %s' % cls.project_name) + 'project delete %s' % cls.project_name + ) finally: super(IdentityTests, cls).tearDownClass() @@ -78,7 +96,8 @@ class IdentityTests(base.TestCase): super(IdentityTests, self).setUp() # prepare v2 env ver_fixture = fixtures.EnvironmentVariable( - 'OS_IDENTITY_API_VERSION', '2.0') + 'OS_IDENTITY_API_VERSION', '2.0' + ) self.useFixture(ver_fixture) auth_url = os.environ.get('OS_AUTH_URL') if auth_url: @@ -93,13 +112,14 @@ class IdentityTests(base.TestCase): raw_output = self.openstack( 'project create ' '--description %(description)s ' - '--enable %(name)s' % {'description': project_description, - 'name': project_name}) + '--enable %(name)s' + % {'description': project_description, 'name': 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 %s' % project['id'] + ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.PROJECT_FIELDS) return project_name @@ -114,14 +134,19 @@ class IdentityTests(base.TestCase): '--password %(password)s ' '--email %(email)s ' '--enable ' - '%(name)s' % {'project': self.project_name, - 'email': email, - 'password': password, - 'name': username}) + '%(name)s' + % { + 'project': self.project_name, + 'email': email, + 'password': password, + 'name': username, + } + ) if add_clean_up: self.addCleanup( self.openstack, - 'user delete %s' % self.parse_show_as_object(raw_output)['id']) + 'user delete %s' % self.parse_show_as_object(raw_output)['id'], + ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.USER_FIELDS) return username @@ -131,9 +156,7 @@ class IdentityTests(base.TestCase): raw_output = self.openstack('role create %s' % 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 %s' % role['id']) items = self.parse_show(raw_output) self.assert_show_fields(items, self.ROLE_FIELDS) self.assertEqual(role_name, role['name']) @@ -145,8 +168,8 @@ 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, 'ec2 credentials delete %s' % access_key + ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.EC2_CREDENTIALS_FIELDS) return access_key @@ -155,8 +178,7 @@ 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 %s' % token['id']) items = self.parse_show(raw_output) self.assert_show_fields(items, self.TOKEN_FIELDS) return token['id'] @@ -169,13 +191,18 @@ class IdentityTests(base.TestCase): 'service create ' '--name %(name)s ' '--description %(description)s ' - '%(type)s' % {'name': service_name, - 'description': description, - 'type': type_name}) + '%(type)s' + % { + 'name': service_name, + 'description': description, + 'type': type_name, + } + ) if add_clean_up: service = self.parse_show_as_object(raw_output) - self.addCleanup(self.openstack, - 'service delete %s' % service['id']) + self.addCleanup( + self.openstack, 'service delete %s' % service['id'] + ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.SERVICE_FIELDS) return service_name @@ -192,16 +219,20 @@ class IdentityTests(base.TestCase): '--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}) + '%(service)s' + % { + 'publicurl': public_url, + 'adminurl': admin_url, + 'internalurl': internal_url, + 'region': region_id, + 'service': 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 %s' % endpoint['id'] + ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.ENDPOINT_FIELDS) return endpoint['id'] diff --git a/openstackclient/tests/functional/identity/v2/test_catalog.py b/openstackclient/tests/functional/identity/v2/test_catalog.py index f403fbfc..1cef314f 100644 --- a/openstackclient/tests/functional/identity/v2/test_catalog.py +++ b/openstackclient/tests/functional/identity/v2/test_catalog.py @@ -14,7 +14,6 @@ from openstackclient.tests.functional.identity.v2 import common class CatalogTests(common.IdentityTests): - def test_catalog_list(self): raw_output = self.openstack('catalog list') items = self.parse_listing(raw_output) diff --git a/openstackclient/tests/functional/identity/v2/test_ec2_credentials.py b/openstackclient/tests/functional/identity/v2/test_ec2_credentials.py index 43dff91f..6d25bdae 100644 --- a/openstackclient/tests/functional/identity/v2/test_ec2_credentials.py +++ b/openstackclient/tests/functional/identity/v2/test_ec2_credentials.py @@ -14,7 +14,6 @@ from openstackclient.tests.functional.identity.v2 import common class EC2CredentialsTests(common.IdentityTests): - def test_ec2_credentials_create(self): self._create_dummy_ec2_credentials() diff --git a/openstackclient/tests/functional/identity/v2/test_endpoint.py b/openstackclient/tests/functional/identity/v2/test_endpoint.py index 9df5ca8a..bafbfdae 100644 --- a/openstackclient/tests/functional/identity/v2/test_endpoint.py +++ b/openstackclient/tests/functional/identity/v2/test_endpoint.py @@ -14,21 +14,20 @@ from openstackclient.tests.functional.identity.v2 import common class EndpointTests(common.IdentityTests): - def test_endpoint_create(self): self._create_dummy_endpoint() 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('endpoint delete %s' % endpoint_id) self.assertEqual(0, len(raw_output)) def test_endpoint_multi_delete(self): endpoint_id_1 = self._create_dummy_endpoint(add_clean_up=False) endpoint_id_2 = self._create_dummy_endpoint(add_clean_up=False) raw_output = self.openstack( - 'endpoint delete ' + endpoint_id_1 + ' ' + endpoint_id_2) + 'endpoint delete ' + endpoint_id_1 + ' ' + endpoint_id_2 + ) self.assertEqual(0, len(raw_output)) def test_endpoint_list(self): diff --git a/openstackclient/tests/functional/identity/v2/test_project.py b/openstackclient/tests/functional/identity/v2/test_project.py index 38777c36..1ad0edaa 100644 --- a/openstackclient/tests/functional/identity/v2/test_project.py +++ b/openstackclient/tests/functional/identity/v2/test_project.py @@ -16,7 +16,6 @@ from openstackclient.tests.functional.identity.v2 import common class ProjectTests(common.IdentityTests): - def test_project_create(self): project_name = data_utils.rand_name('TestProject') description = data_utils.rand_name('description') @@ -26,12 +25,9 @@ class ProjectTests(common.IdentityTests): '--enable ' '--property k1=v1 ' '--property k2=v2 ' - '%(name)s' % {'description': description, - 'name': project_name}) - self.addCleanup( - self.openstack, - 'project delete %s' % project_name + '%(name)s' % {'description': description, 'name': project_name} ) + self.addCleanup(self.openstack, 'project delete %s' % project_name) items = self.parse_show(raw_output) show_fields = list(self.PROJECT_FIELDS) show_fields.extend(['k1', 'k2']) @@ -42,8 +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('project delete %s' % project_name) self.assertEqual(0, len(raw_output)) def test_project_list(self): @@ -59,13 +54,11 @@ class ProjectTests(common.IdentityTests): '--name %(new_name)s ' '--disable ' '--property k0=v0 ' - '%(name)s' % {'new_name': new_project_name, - 'name': project_name}) + '%(name)s' % {'new_name': new_project_name, 'name': 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('project show %s' % new_project_name) items = self.parse_show(raw_output) fields = list(self.PROJECT_FIELDS) fields.extend(['properties']) @@ -77,9 +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('project show %s' % project_name) items = self.parse_show(raw_output) fields = list(self.PROJECT_FIELDS) fields.extend(['properties']) diff --git a/openstackclient/tests/functional/identity/v2/test_role.py b/openstackclient/tests/functional/identity/v2/test_role.py index 124603d8..fb22f018 100644 --- a/openstackclient/tests/functional/identity/v2/test_role.py +++ b/openstackclient/tests/functional/identity/v2/test_role.py @@ -14,7 +14,6 @@ from openstackclient.tests.functional.identity.v2 import common class RoleTests(common.IdentityTests): - def test_role_create(self): self._create_dummy_role() @@ -42,17 +41,25 @@ class RoleTests(common.IdentityTests): 'role add ' '--project %(project)s ' '--user %(user)s ' - '%(role)s' % {'project': self.project_name, - 'user': username, - 'role': role_name}) + '%(role)s' + % { + 'project': self.project_name, + 'user': username, + 'role': 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}) + '%(role)s' + % { + 'project': self.project_name, + 'user': username, + 'role': role_name, + }, + ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.ROLE_FIELDS) @@ -63,16 +70,24 @@ class RoleTests(common.IdentityTests): 'role add ' '--project %(project)s ' '--user %(user)s ' - '%(role)s' % {'project': self.project_name, - 'user': username, - 'role': role_name}) + '%(role)s' + % { + 'project': self.project_name, + 'user': username, + 'role': 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}) + '%(role)s' + % { + 'project': self.project_name, + 'user': username, + 'role': role_name, + } + ) items = self.parse_show(add_raw_output) self.assert_show_fields(items, self.ROLE_FIELDS) self.assertEqual(0, len(del_raw_output)) diff --git a/openstackclient/tests/functional/identity/v2/test_service.py b/openstackclient/tests/functional/identity/v2/test_service.py index d0e03804..7afa967d 100644 --- a/openstackclient/tests/functional/identity/v2/test_service.py +++ b/openstackclient/tests/functional/identity/v2/test_service.py @@ -14,7 +14,6 @@ from openstackclient.tests.functional.identity.v2 import common class ServiceTests(common.IdentityTests): - def test_service_create(self): self._create_dummy_service() @@ -27,7 +26,8 @@ class ServiceTests(common.IdentityTests): service_name_1 = self._create_dummy_service(add_clean_up=False) service_name_2 = self._create_dummy_service(add_clean_up=False) raw_output = self.openstack( - 'service delete ' + service_name_1 + ' ' + service_name_2) + 'service delete ' + service_name_1 + ' ' + service_name_2 + ) self.assertEqual(0, len(raw_output)) def test_service_list(self): @@ -38,7 +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('service show %s' % service_name) items = self.parse_show(raw_output) self.assert_show_fields(items, self.SERVICE_FIELDS) diff --git a/openstackclient/tests/functional/identity/v2/test_token.py b/openstackclient/tests/functional/identity/v2/test_token.py index f8569744..d2ef78e3 100644 --- a/openstackclient/tests/functional/identity/v2/test_token.py +++ b/openstackclient/tests/functional/identity/v2/test_token.py @@ -14,7 +14,6 @@ from openstackclient.tests.functional.identity.v2 import common class TokenTests(common.IdentityTests): - def test_token_issue(self): self._create_dummy_token() diff --git a/openstackclient/tests/functional/identity/v2/test_user.py b/openstackclient/tests/functional/identity/v2/test_user.py index ac609b94..d30e3c45 100644 --- a/openstackclient/tests/functional/identity/v2/test_user.py +++ b/openstackclient/tests/functional/identity/v2/test_user.py @@ -17,7 +17,6 @@ from openstackclient.tests.functional.identity.v2 import common class UserTests(common.IdentityTests): - def test_user_create(self): self._create_dummy_user() @@ -37,12 +36,13 @@ class UserTests(common.IdentityTests): 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']}) + 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']} + ) self.assertEqual(0, len(raw_output)) raw_output = self.openstack('user show %s' % new_username) new_user = self.parse_show_as_object(raw_output) @@ -56,5 +56,6 @@ class UserTests(common.IdentityTests): self.assert_show_fields(items, self.USER_FIELDS) def test_bad_user_command(self): - self.assertRaises(exceptions.CommandFailed, - self.openstack, 'user unlist') + self.assertRaises( + exceptions.CommandFailed, self.openstack, 'user unlist' + ) diff --git a/openstackclient/tests/functional/identity/v3/common.py b/openstackclient/tests/functional/identity/v3/common.py index a5edd9a5..67eccddd 100644 --- a/openstackclient/tests/functional/identity/v3/common.py +++ b/openstackclient/tests/functional/identity/v3/common.py @@ -23,47 +23,121 @@ SYSTEM_CLOUD = os.environ.get('OS_SYSTEM_CLOUD', 'devstack-system-admin') class IdentityTests(base.TestCase): - """Functional tests for Identity commands. """ + """Functional tests for Identity commands.""" DOMAIN_FIELDS = ['description', 'enabled', 'id', 'name'] GROUP_FIELDS = ['description', 'domain_id', 'id', 'name'] TOKEN_FIELDS = ['expires', 'id', 'project_id', 'user_id'] - USER_FIELDS = ['email', 'enabled', 'id', 'name', 'name', - 'domain_id', 'default_project_id', 'description', - 'password_expires_at'] - PROJECT_FIELDS = ['description', 'id', 'domain_id', 'is_domain', - 'enabled', 'name', 'parent_id'] + USER_FIELDS = [ + 'email', + 'enabled', + 'id', + 'name', + 'name', + 'domain_id', + 'default_project_id', + 'description', + 'password_expires_at', + ] + PROJECT_FIELDS = [ + 'description', + 'id', + 'domain_id', + 'is_domain', + 'enabled', + 'name', + 'parent_id', + ] ROLE_FIELDS = ['id', 'name', 'domain_id', 'description'] SERVICE_FIELDS = ['id', 'enabled', 'name', 'type', 'description'] REGION_FIELDS = ['description', 'enabled', 'parent_region', 'region'] - ENDPOINT_FIELDS = ['id', 'region', 'region_id', 'service_id', - 'service_name', 'service_type', 'enabled', - 'interface', 'url'] + ENDPOINT_FIELDS = [ + 'id', + 'region', + 'region_id', + 'service_id', + 'service_name', + 'service_type', + 'enabled', + 'interface', + 'url', + ] REGION_LIST_HEADERS = ['Region', 'Parent Region', 'Description'] - ENDPOINT_LIST_HEADERS = ['ID', 'Region', 'Service Name', 'Service Type', - 'Enabled', 'Interface', 'URL'] + ENDPOINT_LIST_HEADERS = [ + 'ID', + 'Region', + 'Service Name', + 'Service Type', + 'Enabled', + 'Interface', + 'URL', + ] ENDPOINT_LIST_PROJECT_HEADERS = ['ID', 'Name'] - IDENTITY_PROVIDER_FIELDS = ['description', 'enabled', 'id', 'remote_ids', - 'domain_id'] + IDENTITY_PROVIDER_FIELDS = [ + 'description', + 'enabled', + 'id', + 'remote_ids', + 'domain_id', + ] IDENTITY_PROVIDER_LIST_HEADERS = ['ID', 'Enabled', 'Description'] - SERVICE_PROVIDER_FIELDS = ['auth_url', 'description', 'enabled', - 'id', 'relay_state_prefix', 'sp_url'] - SERVICE_PROVIDER_LIST_HEADERS = ['ID', 'Enabled', 'Description', - 'Auth URL'] - IMPLIED_ROLE_LIST_HEADERS = ['Prior Role ID', 'Prior Role Name', - 'Implied Role ID', 'Implied Role Name'] - REGISTERED_LIMIT_FIELDS = ['id', 'service_id', 'resource_name', - 'default_limit', 'description', 'region_id'] - REGISTERED_LIMIT_LIST_HEADERS = ['ID', 'Service ID', 'Resource Name', - 'Default Limit', 'Description', - 'Region ID'] - LIMIT_FIELDS = ['id', 'project_id', 'service_id', 'resource_name', - 'resource_limit', 'description', 'region_id'] - LIMIT_LIST_HEADERS = ['ID', 'Project ID', 'Service ID', 'Resource Name', - 'Resource Limit', 'Description', 'Region ID'] + SERVICE_PROVIDER_FIELDS = [ + 'auth_url', + 'description', + 'enabled', + 'id', + 'relay_state_prefix', + 'sp_url', + ] + SERVICE_PROVIDER_LIST_HEADERS = [ + 'ID', + 'Enabled', + 'Description', + 'Auth URL', + ] + IMPLIED_ROLE_LIST_HEADERS = [ + 'Prior Role ID', + 'Prior Role Name', + 'Implied Role ID', + 'Implied Role Name', + ] + REGISTERED_LIMIT_FIELDS = [ + 'id', + 'service_id', + 'resource_name', + 'default_limit', + 'description', + 'region_id', + ] + REGISTERED_LIMIT_LIST_HEADERS = [ + 'ID', + 'Service ID', + 'Resource Name', + 'Default Limit', + 'Description', + 'Region ID', + ] + LIMIT_FIELDS = [ + 'id', + 'project_id', + 'service_id', + 'resource_name', + 'resource_limit', + 'description', + 'region_id', + ] + LIMIT_LIST_HEADERS = [ + 'ID', + 'Project ID', + 'Service ID', + 'Resource Name', + 'Resource Limit', + 'Description', + 'Region ID', + ] @classmethod def setUpClass(cls): @@ -76,8 +150,9 @@ class IdentityTests(base.TestCase): 'domain create ' '--description %(description)s ' '--enable ' - '%(name)s' % {'description': cls.domain_description, - 'name': cls.domain_name}) + '%(name)s' + % {'description': cls.domain_description, 'name': cls.domain_name} + ) # create dummy project cls.project_name = data_utils.rand_name('TestProject') @@ -88,21 +163,31 @@ class IdentityTests(base.TestCase): '--domain %(domain)s ' '--description %(description)s ' '--enable ' - '%(name)s' % {'domain': cls.domain_name, - 'description': cls.project_description, - 'name': cls.project_name}) + '%(name)s' + % { + 'domain': cls.domain_name, + 'description': cls.project_description, + 'name': cls.project_name, + } + ) @classmethod def tearDownClass(cls): try: # delete dummy project - cls.openstack('--os-identity-api-version 3 ' - 'project delete %s' % cls.project_name) + cls.openstack( + '--os-identity-api-version 3 ' + 'project delete %s' % cls.project_name + ) # disable and delete dummy domain - cls.openstack('--os-identity-api-version 3 ' - 'domain set --disable %s' % cls.domain_name) - cls.openstack('--os-identity-api-version 3 ' - 'domain delete %s' % cls.domain_name) + cls.openstack( + '--os-identity-api-version 3 ' + 'domain set --disable %s' % cls.domain_name + ) + cls.openstack( + '--os-identity-api-version 3 ' + 'domain delete %s' % cls.domain_name + ) finally: super(IdentityTests, cls).tearDownClass() @@ -110,7 +195,8 @@ class IdentityTests(base.TestCase): super(IdentityTests, self).setUp() # prepare v3 env ver_fixture = fixtures.EnvironmentVariable( - 'OS_IDENTITY_API_VERSION', '3') + 'OS_IDENTITY_API_VERSION', '3' + ) self.useFixture(ver_fixture) auth_url = os.environ.get('OS_AUTH_URL') if auth_url: @@ -133,17 +219,22 @@ class IdentityTests(base.TestCase): '--email %(email)s ' '--description %(description)s ' '--enable ' - '%(name)s' % {'domain': self.domain_name, - 'project': self.project_name, - 'project_domain': self.domain_name, - 'email': email, - 'password': password, - 'description': description, - 'name': username}) + '%(name)s' + % { + 'domain': self.domain_name, + 'project': self.project_name, + 'project_domain': self.domain_name, + 'email': email, + 'password': password, + 'description': description, + 'name': username, + } + ) if add_clean_up: self.addCleanup( self.openstack, - 'user delete %s' % self.parse_show_as_object(raw_output)['id']) + 'user delete %s' % self.parse_show_as_object(raw_output)['id'], + ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.USER_FIELDS) return username @@ -153,9 +244,7 @@ class IdentityTests(base.TestCase): raw_output = self.openstack('role create %s' % 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 %s' % role['id']) items = self.parse_show(raw_output) self.assert_show_fields(items, self.ROLE_FIELDS) self.assertEqual(role_name, role['name']) @@ -167,8 +256,8 @@ class IdentityTests(base.TestCase): self.openstack( 'implied role create ' '--implied-role %(implied_role)s ' - '%(role)s' % {'implied_role': implied_role_name, - 'role': role_name}) + '%(role)s' % {'implied_role': implied_role_name, 'role': role_name} + ) return implied_role_name, role_name @@ -179,16 +268,20 @@ class IdentityTests(base.TestCase): 'group create ' '--domain %(domain)s ' '--description %(description)s ' - '%(name)s' % {'domain': self.domain_name, - 'description': description, - 'name': group_name}) + '%(name)s' + % { + 'domain': self.domain_name, + 'description': description, + 'name': group_name, + } + ) if add_clean_up: self.addCleanup( self.openstack, 'group delete ' '--domain %(domain)s ' - '%(name)s' % {'domain': self.domain_name, - 'name': group_name}) + '%(name)s' % {'domain': self.domain_name, 'name': group_name}, + ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.GROUP_FIELDS) return group_name @@ -199,16 +292,13 @@ class IdentityTests(base.TestCase): self.openstack( 'domain create ' '--description %(description)s ' - '--enable %(name)s' % {'description': domain_description, - 'name': domain_name}) + '--enable %(name)s' + % {'description': domain_description, 'name': domain_name} + ) if add_clean_up: + self.addCleanup(self.openstack, 'domain delete %s' % domain_name) self.addCleanup( - self.openstack, - 'domain delete %s' % domain_name - ) - self.addCleanup( - self.openstack, - 'domain set --disable %s' % domain_name + self.openstack, 'domain set --disable %s' % domain_name ) return domain_name @@ -219,16 +309,21 @@ class IdentityTests(base.TestCase): 'project create ' '--domain %(domain)s ' '--description %(description)s ' - '--enable %(name)s' % {'domain': self.domain_name, - 'description': project_description, - 'name': project_name}) + '--enable %(name)s' + % { + 'domain': self.domain_name, + 'description': project_description, + 'name': project_name, + } + ) if add_clean_up: self.addCleanup( self.openstack, 'project delete ' '--domain %(domain)s ' - '%(name)s' % {'domain': self.domain_name, - 'name': project_name}) + '%(name)s' + % {'domain': self.domain_name, 'name': project_name}, + ) return project_name def _create_dummy_region(self, parent_region=None, add_clean_up=True): @@ -241,12 +336,15 @@ class IdentityTests(base.TestCase): 'region create ' '%(parent_region_arg)s ' '--description %(description)s ' - '%(id)s' % {'parent_region_arg': parent_region_arg, - 'description': description, - 'id': region_id}) + '%(id)s' + % { + 'parent_region_arg': parent_region_arg, + 'description': description, + 'id': region_id, + } + ) if add_clean_up: - self.addCleanup(self.openstack, - 'region delete %s' % region_id) + self.addCleanup(self.openstack, 'region delete %s' % region_id) items = self.parse_show(raw_output) self.assert_show_fields(items, self.REGION_FIELDS) return region_id @@ -260,13 +358,18 @@ class IdentityTests(base.TestCase): '--name %(name)s ' '--description %(description)s ' '--enable ' - '%(type)s' % {'name': service_name, - 'description': description, - 'type': type_name}) + '%(type)s' + % { + 'name': service_name, + 'description': description, + 'type': type_name, + } + ) if add_clean_up: service = self.parse_show_as_object(raw_output) - self.addCleanup(self.openstack, - 'service delete %s' % service['id']) + self.addCleanup( + self.openstack, 'service delete %s' % service['id'] + ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.SERVICE_FIELDS) return service_name @@ -281,15 +384,19 @@ class IdentityTests(base.TestCase): '--enable ' '%(service)s ' '%(interface)s ' - '%(url)s' % {'region': region_id, - 'service': service_name, - 'interface': interface, - 'url': endpoint_url}) + '%(url)s' + % { + 'region': region_id, + 'service': service_name, + 'interface': interface, + 'url': 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 %s' % endpoint['id'] + ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.ENDPOINT_FIELDS) return endpoint['id'] @@ -301,12 +408,14 @@ class IdentityTests(base.TestCase): 'identity provider create ' ' %(name)s ' '--description %(description)s ' - '--enable ' % {'name': identity_provider, - 'description': description}) + '--enable ' + % {'name': identity_provider, 'description': description} + ) if add_clean_up: self.addCleanup( self.openstack, - 'identity provider delete %s' % identity_provider) + 'identity provider delete %s' % identity_provider, + ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.IDENTITY_PROVIDER_FIELDS) return identity_provider @@ -320,12 +429,13 @@ class IdentityTests(base.TestCase): '--description %(description)s ' '--auth-url https://sp.example.com:35357 ' '--service-provider-url https://sp.example.com:5000 ' - '--enable ' % {'name': service_provider, - 'description': description}) + '--enable ' + % {'name': service_provider, 'description': description} + ) if add_clean_up: self.addCleanup( - self.openstack, - 'service provider delete %s' % service_provider) + self.openstack, 'service provider delete %s' % service_provider + ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.SERVICE_PROVIDER_FIELDS) return service_provider @@ -336,14 +446,14 @@ class IdentityTests(base.TestCase): params = { 'service_name': service_name, 'default_limit': 10, - 'resource_name': resource_name + 'resource_name': resource_name, } raw_output = self.openstack( 'registered limit create' ' --service %(service_name)s' ' --default-limit %(default_limit)s' ' %(resource_name)s' % params, - cloud=SYSTEM_CLOUD + cloud=SYSTEM_CLOUD, ) items = self.parse_show(raw_output) registered_limit_id = self._extract_value_from_items('id', items) @@ -352,7 +462,7 @@ class IdentityTests(base.TestCase): self.addCleanup( self.openstack, 'registered limit delete %s' % registered_limit_id, - cloud=SYSTEM_CLOUD + cloud=SYSTEM_CLOUD, ) self.assert_show_fields(items, self.REGISTERED_LIMIT_FIELDS) @@ -369,7 +479,7 @@ class IdentityTests(base.TestCase): raw_output = self.openstack( 'registered limit show %s' % registered_limit_id, - cloud=SYSTEM_CLOUD + cloud=SYSTEM_CLOUD, ) items = self.parse_show(raw_output) resource_name = self._extract_value_from_items('resource_name', items) @@ -385,7 +495,7 @@ class IdentityTests(base.TestCase): 'project_id': project_id, 'service_id': service_id, 'resource_name': resource_name, - 'resource_limit': resource_limit + 'resource_limit': resource_limit, } raw_output = self.openstack( @@ -394,15 +504,16 @@ class IdentityTests(base.TestCase): ' --service %(service_id)s' ' --resource-limit %(resource_limit)s' ' %(resource_name)s' % params, - cloud=SYSTEM_CLOUD + cloud=SYSTEM_CLOUD, ) items = self.parse_show(raw_output) limit_id = self._extract_value_from_items('id', items) if add_clean_up: self.addCleanup( - self.openstack, 'limit delete %s' % limit_id, - cloud=SYSTEM_CLOUD + self.openstack, + 'limit delete %s' % limit_id, + cloud=SYSTEM_CLOUD, ) self.assert_show_fields(items, self.LIMIT_FIELDS) diff --git a/openstackclient/tests/functional/identity/v3/test_application_credential.py b/openstackclient/tests/functional/identity/v3/test_application_credential.py index daf64607..dbec1cb2 100644 --- a/openstackclient/tests/functional/identity/v3/test_application_credential.py +++ b/openstackclient/tests/functional/identity/v3/test_application_credential.py @@ -20,124 +20,164 @@ from openstackclient.tests.functional.identity.v3 import common class ApplicationCredentialTests(common.IdentityTests): - - APPLICATION_CREDENTIAL_FIELDS = ['id', 'name', 'project_id', - 'description', 'roles', 'expires_at', - 'unrestricted'] - APPLICATION_CREDENTIAL_LIST_HEADERS = ['ID', 'Name', 'Project ID', - 'Description', 'Expires At'] + APPLICATION_CREDENTIAL_FIELDS = [ + 'id', + 'name', + 'project_id', + 'description', + 'roles', + 'expires_at', + 'unrestricted', + ] + APPLICATION_CREDENTIAL_LIST_HEADERS = [ + 'ID', + 'Name', + 'Project ID', + 'Description', + 'Expires At', + ] def test_application_credential_create(self): name = data_utils.rand_name('name') - raw_output = self.openstack('application credential create %(name)s' - % {'name': name}) + raw_output = self.openstack( + 'application credential create %(name)s' % {'name': name} + ) self.addCleanup( self.openstack, - 'application credential delete %(name)s' % {'name': name}) + 'application credential delete %(name)s' % {'name': name}, + ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.APPLICATION_CREDENTIAL_FIELDS) def _create_role_assignments(self): try: - user = self.openstack('configuration show -f value' - ' -c auth.username') + user = self.openstack( + 'configuration show -f value' ' -c auth.username' + ) except Exception: - user = self.openstack('configuration show -f value' - ' -c auth.user_id') + user = self.openstack( + 'configuration show -f value' ' -c auth.user_id' + ) try: - user_domain = self.openstack('configuration show -f value' - ' -c auth.user_domain_name') + user_domain = self.openstack( + 'configuration show -f value' ' -c auth.user_domain_name' + ) except Exception: - user_domain = self.openstack('configuration show -f value' - ' -c auth.user_domain_id') + user_domain = self.openstack( + 'configuration show -f value' ' -c auth.user_domain_id' + ) try: - project = self.openstack('configuration show -f value' - ' -c auth.project_name') + project = self.openstack( + 'configuration show -f value' ' -c auth.project_name' + ) except Exception: - project = self.openstack('configuration show -f value' - ' -c auth.project_id') + project = self.openstack( + 'configuration show -f value' ' -c auth.project_id' + ) try: - project_domain = self.openstack('configuration show -f value' - ' -c auth.project_domain_name') + project_domain = self.openstack( + 'configuration show -f value' ' -c auth.project_domain_name' + ) except Exception: - project_domain = self.openstack('configuration show -f value' - ' -c auth.project_domain_id') + project_domain = self.openstack( + 'configuration show -f value' ' -c auth.project_domain_id' + ) role1 = self._create_dummy_role() role2 = self._create_dummy_role() 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}) - 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}) + 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, + } + ) + 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, + }, + ) return role1, role2 def test_application_credential_create_with_options(self): name = data_utils.rand_name('name') secret = data_utils.rand_name('secret') description = data_utils.rand_name('description') - tomorrow = (datetime.datetime.utcnow() + - datetime.timedelta(days=1)).strftime('%Y-%m-%dT%H:%M:%S%z') + tomorrow = ( + datetime.datetime.utcnow() + datetime.timedelta(days=1) + ).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' - ' --unrestricted' - % {'name': name, - 'secret': secret, - 'description': description, - 'tomorrow': tomorrow, - 'role1': role1, - 'role2': role2}) + raw_output = self.openstack( + 'application credential create %(name)s' + ' --secret %(secret)s' + ' --description %(description)s' + ' --expiration %(tomorrow)s' + ' --role %(role1)s' + ' --role %(role2)s' + ' --unrestricted' + % { + 'name': name, + 'secret': secret, + 'description': description, + 'tomorrow': tomorrow, + 'role1': role1, + 'role2': role2, + } + ) self.addCleanup( self.openstack, - 'application credential delete %(name)s' % {'name': name}) + 'application credential delete %(name)s' % {'name': name}, + ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.APPLICATION_CREDENTIAL_FIELDS) def test_application_credential_delete(self): name = data_utils.rand_name('name') - self.openstack('application credential create %(name)s' - % {'name': name}) - raw_output = self.openstack('application credential delete ' - '%(name)s' % {'name': name}) + self.openstack( + 'application credential create %(name)s' % {'name': name} + ) + raw_output = self.openstack( + 'application credential delete ' '%(name)s' % {'name': name} + ) self.assertEqual(0, len(raw_output)) def test_application_credential_list(self): raw_output = self.openstack('application credential list') items = self.parse_listing(raw_output) self.assert_table_structure( - items, self.APPLICATION_CREDENTIAL_LIST_HEADERS) + items, self.APPLICATION_CREDENTIAL_LIST_HEADERS + ) def test_application_credential_show(self): name = data_utils.rand_name('name') - raw_output = self.openstack('application credential create %(name)s' - % {'name': name}) + raw_output = self.openstack( + 'application credential create %(name)s' % {'name': name} + ) self.addCleanup( self.openstack, - 'application credential delete %(name)s' % {'name': name}) - raw_output = self.openstack('application credential show ' - '%(name)s' % {'name': name}) + 'application credential delete %(name)s' % {'name': name}, + ) + raw_output = self.openstack( + 'application credential show ' '%(name)s' % {'name': name} + ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.APPLICATION_CREDENTIAL_FIELDS) diff --git a/openstackclient/tests/functional/identity/v3/test_catalog.py b/openstackclient/tests/functional/identity/v3/test_catalog.py index c8361406..9b6df2d1 100644 --- a/openstackclient/tests/functional/identity/v3/test_catalog.py +++ b/openstackclient/tests/functional/identity/v3/test_catalog.py @@ -14,7 +14,6 @@ from openstackclient.tests.functional.identity.v3 import common class CatalogTests(common.IdentityTests): - def test_catalog_list(self): raw_output = self.openstack('catalog list') items = self.parse_listing(raw_output) diff --git a/openstackclient/tests/functional/identity/v3/test_domain.py b/openstackclient/tests/functional/identity/v3/test_domain.py index d8946d1e..bf5020ca 100644 --- a/openstackclient/tests/functional/identity/v3/test_domain.py +++ b/openstackclient/tests/functional/identity/v3/test_domain.py @@ -17,15 +17,14 @@ 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) # 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, 'domain delete %s' % domain_name) + self.addCleanup( + self.openstack, 'domain set --disable %s' % domain_name + ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.DOMAIN_FIELDS) @@ -52,15 +51,18 @@ class DomainTests(common.IdentityTests): raw_output = self.openstack('domain set --disable %s' % domain_2) self.assertEqual(0, len(raw_output)) raw_output = self.openstack( - 'domain delete %s %s' % (domain_1, domain_2)) + 'domain delete %s %s' % (domain_1, domain_2) + ) self.assertEqual(0, len(raw_output)) def test_domain_delete_failure(self): domain_name = self._create_dummy_domain() # cannot delete enabled domain - self.assertRaises(exceptions.CommandFailed, - self.openstack, - 'domain delete %s' % domain_name) + self.assertRaises( + exceptions.CommandFailed, + self.openstack, + 'domain delete %s' % domain_name, + ) def test_domain_show(self): domain_name = self._create_dummy_domain() diff --git a/openstackclient/tests/functional/identity/v3/test_endpoint.py b/openstackclient/tests/functional/identity/v3/test_endpoint.py index 41f0b4c8..53f2bd22 100644 --- a/openstackclient/tests/functional/identity/v3/test_endpoint.py +++ b/openstackclient/tests/functional/identity/v3/test_endpoint.py @@ -16,7 +16,6 @@ from openstackclient.tests.functional.identity.v3 import common class EndpointTests(common.IdentityTests): - def test_endpoint_create(self): self._create_dummy_endpoint(interface='public') self._create_dummy_endpoint(interface='admin') @@ -24,15 +23,15 @@ 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('endpoint delete %s' % endpoint_id) self.assertEqual(0, len(raw_output)) def test_endpoint_multi_delete(self): endpoint_1 = self._create_dummy_endpoint(add_clean_up=False) endpoint_2 = self._create_dummy_endpoint(add_clean_up=False) raw_output = self.openstack( - 'endpoint delete %s %s' % (endpoint_1, endpoint_2)) + 'endpoint delete %s %s' % (endpoint_1, endpoint_2) + ) self.assertEqual(0, len(raw_output)) def test_endpoint_list(self): @@ -48,19 +47,18 @@ class EndpointTests(common.IdentityTests): raw_output = self.openstack( 'endpoint add project ' '%(endpoint_id)s ' - '%(project_id)s' % { - 'project_id': project_id, - 'endpoint_id': endpoint_id}) + '%(project_id)s' + % {'project_id': project_id, 'endpoint_id': endpoint_id} + ) self.assertEqual(0, len(raw_output)) raw_output = self.openstack( - 'endpoint list --endpoint %s' % endpoint_id) + 'endpoint list --endpoint %s' % endpoint_id + ) self.assertIn(project_id, raw_output) items = self.parse_listing(raw_output) - self.assert_table_structure(items, - self.ENDPOINT_LIST_PROJECT_HEADERS) + self.assert_table_structure(items, self.ENDPOINT_LIST_PROJECT_HEADERS) - raw_output = self.openstack( - 'endpoint list --project %s' % project_id) + raw_output = self.openstack('endpoint list --project %s' % project_id) self.assertIn(endpoint_id, raw_output) items = self.parse_listing(raw_output) self.assert_table_structure(items, self.ENDPOINT_LIST_HEADERS) @@ -73,9 +71,13 @@ class EndpointTests(common.IdentityTests): '--interface %(interface)s ' '--url %(url)s ' '--disable ' - '%(endpoint_id)s' % {'interface': 'admin', - 'url': new_endpoint_url, - 'endpoint_id': endpoint_id}) + '%(endpoint_id)s' + % { + 'interface': 'admin', + 'url': new_endpoint_url, + 'endpoint_id': endpoint_id, + } + ) self.assertEqual(0, len(raw_output)) raw_output = self.openstack('endpoint show %s' % endpoint_id) endpoint = self.parse_show_as_object(raw_output) @@ -95,15 +97,15 @@ class EndpointTests(common.IdentityTests): raw_output = self.openstack( 'endpoint add project ' '%(endpoint_id)s ' - '%(project_id)s' % { - 'project_id': project_id, - 'endpoint_id': endpoint_id}) + '%(project_id)s' + % {'project_id': project_id, 'endpoint_id': endpoint_id} + ) self.assertEqual(0, len(raw_output)) raw_output = self.openstack( 'endpoint remove project ' '%(endpoint_id)s ' - '%(project_id)s' % { - 'project_id': project_id, - 'endpoint_id': endpoint_id}) + '%(project_id)s' + % {'project_id': project_id, 'endpoint_id': endpoint_id} + ) self.assertEqual(0, len(raw_output)) diff --git a/openstackclient/tests/functional/identity/v3/test_group.py b/openstackclient/tests/functional/identity/v3/test_group.py index 917d5df0..95d74cb7 100644 --- a/openstackclient/tests/functional/identity/v3/test_group.py +++ b/openstackclient/tests/functional/identity/v3/test_group.py @@ -16,7 +16,6 @@ from openstackclient.tests.functional.identity.v3 import common class GroupTests(common.IdentityTests): - def test_group_create(self): self._create_dummy_group() @@ -30,7 +29,8 @@ class GroupTests(common.IdentityTests): def test_group_list_with_domain(self): group_name = self._create_dummy_group() raw_output = self.openstack( - 'group list --domain %s' % self.domain_name) + 'group list --domain %s' % self.domain_name + ) items = self.parse_listing(raw_output) self.assert_table_structure(items, common.BASIC_LIST_HEADERS) self.assertIn(group_name, raw_output) @@ -40,8 +40,8 @@ class GroupTests(common.IdentityTests): raw_output = self.openstack( 'group delete ' '--domain %(domain)s ' - '%(name)s' % {'domain': self.domain_name, - 'name': group_name}) + '%(name)s' % {'domain': self.domain_name, 'name': group_name} + ) self.assertEqual(0, len(raw_output)) def test_group_show(self): @@ -49,8 +49,8 @@ class GroupTests(common.IdentityTests): raw_output = self.openstack( 'group show ' '--domain %(domain)s ' - '%(name)s' % {'domain': self.domain_name, - 'name': group_name}) + '%(name)s' % {'domain': self.domain_name, 'name': group_name} + ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.GROUP_FIELDS) @@ -61,15 +61,19 @@ class GroupTests(common.IdentityTests): 'group set ' '--domain %(domain)s ' '--name %(new_group)s ' - '%(group)s' % {'domain': self.domain_name, - 'new_group': new_group_name, - 'group': group_name}) + '%(group)s' + % { + 'domain': self.domain_name, + 'new_group': new_group_name, + 'group': group_name, + } + ) self.assertEqual(0, len(raw_output)) raw_output = self.openstack( 'group show ' '--domain %(domain)s ' - '%(group)s' % {'domain': self.domain_name, - 'group': new_group_name}) + '%(group)s' % {'domain': self.domain_name, 'group': 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 @@ -77,9 +81,13 @@ class GroupTests(common.IdentityTests): 'group set ' '--domain %(domain)s ' '--name %(new_group)s ' - '%(group)s' % {'domain': self.domain_name, - 'new_group': group_name, - 'group': new_group_name}) + '%(group)s' + % { + 'domain': self.domain_name, + 'new_group': group_name, + 'group': new_group_name, + } + ) self.assertEqual(0, len(raw_output)) def test_group_add_user(self): @@ -89,19 +97,27 @@ class GroupTests(common.IdentityTests): 'group add user ' '--group-domain %(group_domain)s ' '--user-domain %(user_domain)s ' - '%(group)s %(user)s' % {'group_domain': self.domain_name, - 'user_domain': self.domain_name, - 'group': group_name, - 'user': username}) + '%(group)s %(user)s' + % { + 'group_domain': self.domain_name, + 'user_domain': self.domain_name, + 'group': group_name, + 'user': username, + } + ) self.addCleanup( self.openstack, 'group remove user ' '--group-domain %(group_domain)s ' '--user-domain %(user_domain)s ' - '%(group)s %(user)s' % {'group_domain': self.domain_name, - 'user_domain': self.domain_name, - 'group': group_name, - 'user': username}) + '%(group)s %(user)s' + % { + 'group_domain': self.domain_name, + 'user_domain': self.domain_name, + 'group': group_name, + 'user': username, + }, + ) self.assertOutput('', raw_output) def test_group_contains_user(self): @@ -111,32 +127,45 @@ class GroupTests(common.IdentityTests): 'group add user ' '--group-domain %(group_domain)s ' '--user-domain %(user_domain)s ' - '%(group)s %(user)s' % {'group_domain': self.domain_name, - 'user_domain': self.domain_name, - 'group': group_name, - 'user': username}) + '%(group)s %(user)s' + % { + 'group_domain': self.domain_name, + 'user_domain': self.domain_name, + 'group': group_name, + 'user': username, + } + ) self.addCleanup( self.openstack, 'group remove user ' '--group-domain %(group_domain)s ' '--user-domain %(user_domain)s ' - '%(group)s %(user)s' % {'group_domain': self.domain_name, - 'user_domain': self.domain_name, - 'group': group_name, - 'user': username}) + '%(group)s %(user)s' + % { + 'group_domain': self.domain_name, + 'user_domain': self.domain_name, + 'group': group_name, + 'user': username, + }, + ) self.assertOutput('', raw_output) raw_output = self.openstack( 'group contains user ' '--group-domain %(group_domain)s ' '--user-domain %(user_domain)s ' - '%(group)s %(user)s' % {'group_domain': self.domain_name, - 'user_domain': self.domain_name, - 'group': group_name, - 'user': username}) + '%(group)s %(user)s' + % { + 'group_domain': self.domain_name, + 'user_domain': self.domain_name, + 'group': group_name, + 'user': username, + } + ) self.assertEqual( - '%(user)s in group %(group)s\n' % {'user': username, - 'group': group_name}, - raw_output) + '%(user)s in group %(group)s\n' + % {'user': username, 'group': group_name}, + raw_output, + ) def test_group_remove_user(self): group_name = self._create_dummy_group() @@ -145,17 +174,25 @@ class GroupTests(common.IdentityTests): 'group add user ' '--group-domain %(group_domain)s ' '--user-domain %(user_domain)s ' - '%(group)s %(user)s' % {'group_domain': self.domain_name, - 'user_domain': self.domain_name, - 'group': group_name, - 'user': username}) + '%(group)s %(user)s' + % { + 'group_domain': self.domain_name, + 'user_domain': self.domain_name, + 'group': group_name, + 'user': username, + } + ) remove_raw_output = self.openstack( 'group remove user ' '--group-domain %(group_domain)s ' '--user-domain %(user_domain)s ' - '%(group)s %(user)s' % {'group_domain': self.domain_name, - 'user_domain': self.domain_name, - 'group': group_name, - 'user': username}) + '%(group)s %(user)s' + % { + 'group_domain': self.domain_name, + 'user_domain': self.domain_name, + 'group': group_name, + 'user': username, + } + ) self.assertOutput('', add_raw_output) self.assertOutput('', remove_raw_output) diff --git a/openstackclient/tests/functional/identity/v3/test_idp.py b/openstackclient/tests/functional/identity/v3/test_idp.py index 5db3610a..b359da7c 100644 --- a/openstackclient/tests/functional/identity/v3/test_idp.py +++ b/openstackclient/tests/functional/identity/v3/test_idp.py @@ -23,21 +23,24 @@ class IdentityProviderTests(common.IdentityTests): def test_idp_delete(self): identity_provider = self._create_dummy_idp(add_clean_up=False) - raw_output = self.openstack('identity provider delete %s' - % identity_provider) + raw_output = self.openstack( + 'identity provider delete %s' % identity_provider + ) self.assertEqual(0, len(raw_output)) def test_idp_multi_delete(self): idp_1 = self._create_dummy_idp(add_clean_up=False) idp_2 = self._create_dummy_idp(add_clean_up=False) raw_output = self.openstack( - 'identity provider delete %s %s' % (idp_1, idp_2)) + 'identity provider delete %s %s' % (idp_1, idp_2) + ) self.assertEqual(0, len(raw_output)) def test_idp_show(self): identity_provider = self._create_dummy_idp(add_clean_up=True) - raw_output = self.openstack('identity provider show %s' - % identity_provider) + raw_output = self.openstack( + 'identity provider show %s' % identity_provider + ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.IDENTITY_PROVIDER_FIELDS) @@ -50,13 +53,18 @@ class IdentityProviderTests(common.IdentityTests): def test_idp_set(self): identity_provider = self._create_dummy_idp(add_clean_up=True) new_remoteid = data_utils.rand_name('newRemoteId') - raw_output = self.openstack('identity provider set ' - '%(identity-provider)s ' - '--remote-id %(remote-id)s ' - % {'identity-provider': identity_provider, - 'remote-id': new_remoteid}) + raw_output = self.openstack( + 'identity provider set ' + '%(identity-provider)s ' + '--remote-id %(remote-id)s ' + % { + 'identity-provider': identity_provider, + 'remote-id': new_remoteid, + } + ) self.assertEqual(0, len(raw_output)) - raw_output = self.openstack('identity provider show %s' - % identity_provider) + raw_output = self.openstack( + 'identity provider show %s' % identity_provider + ) updated_value = self.parse_show_as_object(raw_output) self.assertIn(new_remoteid, updated_value['remote_ids']) diff --git a/openstackclient/tests/functional/identity/v3/test_limit.py b/openstackclient/tests/functional/identity/v3/test_limit.py index b03f0f28..32c65107 100644 --- a/openstackclient/tests/functional/identity/v3/test_limit.py +++ b/openstackclient/tests/functional/identity/v3/test_limit.py @@ -20,12 +20,11 @@ SYSTEM_CLOUD = os.environ.get('OS_SYSTEM_CLOUD', 'devstack-system-admin') class LimitTestCase(common.IdentityTests): - def test_limit_create_with_service_name(self): registered_limit_id = self._create_dummy_registered_limit() raw_output = self.openstack( 'registered limit show %s' % registered_limit_id, - cloud=SYSTEM_CLOUD + cloud=SYSTEM_CLOUD, ) items = self.parse_show(raw_output) service_id = self._extract_value_from_items('service_id', items) @@ -44,7 +43,7 @@ class LimitTestCase(common.IdentityTests): 'project_id': project_id, 'service_name': service_name, 'resource_name': resource_name, - 'resource_limit': 15 + 'resource_limit': 15, } raw_output = self.openstack( 'limit create' @@ -52,14 +51,12 @@ class LimitTestCase(common.IdentityTests): ' --service %(service_name)s' ' --resource-limit %(resource_limit)s' ' %(resource_name)s' % params, - cloud=SYSTEM_CLOUD + cloud=SYSTEM_CLOUD, ) items = self.parse_show(raw_output) limit_id = self._extract_value_from_items('id', items) self.addCleanup( - self.openstack, - 'limit delete %s' % limit_id, - cloud=SYSTEM_CLOUD + self.openstack, 'limit delete %s' % limit_id, cloud=SYSTEM_CLOUD ) self.assert_show_fields(items, self.LIMIT_FIELDS) @@ -68,7 +65,7 @@ class LimitTestCase(common.IdentityTests): registered_limit_id = self._create_dummy_registered_limit() raw_output = self.openstack( 'registered limit show %s' % registered_limit_id, - cloud=SYSTEM_CLOUD + cloud=SYSTEM_CLOUD, ) items = self.parse_show(raw_output) service_id = self._extract_value_from_items('service_id', items) @@ -84,7 +81,7 @@ class LimitTestCase(common.IdentityTests): 'project_name': project_name, 'service_name': service_name, 'resource_name': resource_name, - 'resource_limit': 15 + 'resource_limit': 15, } raw_output = self.openstack( 'limit create' @@ -92,14 +89,12 @@ class LimitTestCase(common.IdentityTests): ' --service %(service_name)s' ' --resource-limit %(resource_limit)s' ' %(resource_name)s' % params, - cloud=SYSTEM_CLOUD + cloud=SYSTEM_CLOUD, ) items = self.parse_show(raw_output) limit_id = self._extract_value_from_items('id', items) self.addCleanup( - self.openstack, - 'limit delete %s' % limit_id, - cloud=SYSTEM_CLOUD + self.openstack, 'limit delete %s' % limit_id, cloud=SYSTEM_CLOUD ) self.assert_show_fields(items, self.LIMIT_FIELDS) @@ -117,14 +112,14 @@ class LimitTestCase(common.IdentityTests): params = { 'region_id': region_id, - 'registered_limit_id': registered_limit_id + 'registered_limit_id': registered_limit_id, } raw_output = self.openstack( 'registered limit set' ' %(registered_limit_id)s' ' --region %(region_id)s' % params, - cloud=SYSTEM_CLOUD + cloud=SYSTEM_CLOUD, ) items = self.parse_show(raw_output) service_id = self._extract_value_from_items('service_id', items) @@ -142,7 +137,7 @@ class LimitTestCase(common.IdentityTests): 'resource_name': resource_name, 'resource_limit': 15, 'region_id': region_id, - 'description': description + 'description': description, } raw_output = self.openstack( 'limit create' @@ -152,14 +147,12 @@ class LimitTestCase(common.IdentityTests): ' --region %(region_id)s' ' --description %(description)s' ' %(resource_name)s' % params, - cloud=SYSTEM_CLOUD + cloud=SYSTEM_CLOUD, ) items = self.parse_show(raw_output) limit_id = self._extract_value_from_items('id', items) self.addCleanup( - self.openstack, - 'limit delete %s' % limit_id, - cloud=SYSTEM_CLOUD + self.openstack, 'limit delete %s' % limit_id, cloud=SYSTEM_CLOUD ) self.assert_show_fields(items, self.LIMIT_FIELDS) @@ -167,8 +160,7 @@ class LimitTestCase(common.IdentityTests): def test_limit_show(self): limit_id = self._create_dummy_limit() raw_output = self.openstack( - 'limit show %s' % limit_id, - cloud=SYSTEM_CLOUD + 'limit show %s' % limit_id, cloud=SYSTEM_CLOUD ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.LIMIT_FIELDS) @@ -178,14 +170,14 @@ class LimitTestCase(common.IdentityTests): params = { 'description': data_utils.arbitrary_string(), - 'limit_id': limit_id + 'limit_id': limit_id, } raw_output = self.openstack( 'limit set' ' --description %(description)s' ' %(limit_id)s' % params, - cloud=SYSTEM_CLOUD + cloud=SYSTEM_CLOUD, ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.LIMIT_FIELDS) @@ -193,16 +185,13 @@ class LimitTestCase(common.IdentityTests): def test_limit_set_resource_limit(self): limit_id = self._create_dummy_limit() - params = { - 'resource_limit': 5, - 'limit_id': limit_id - } + params = {'resource_limit': 5, 'limit_id': limit_id} raw_output = self.openstack( 'limit set' ' --resource-limit %(resource_limit)s' ' %(limit_id)s' % params, - cloud=SYSTEM_CLOUD + cloud=SYSTEM_CLOUD, ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.LIMIT_FIELDS) @@ -216,6 +205,6 @@ class LimitTestCase(common.IdentityTests): def test_limit_delete(self): limit_id = self._create_dummy_limit(add_clean_up=False) raw_output = self.openstack( - 'limit delete %s' % limit_id, - cloud=SYSTEM_CLOUD) + 'limit delete %s' % limit_id, cloud=SYSTEM_CLOUD + ) self.assertEqual(0, len(raw_output)) diff --git a/openstackclient/tests/functional/identity/v3/test_project.py b/openstackclient/tests/functional/identity/v3/test_project.py index b3d31aa7..d91ba87a 100644 --- a/openstackclient/tests/functional/identity/v3/test_project.py +++ b/openstackclient/tests/functional/identity/v3/test_project.py @@ -16,7 +16,6 @@ from openstackclient.tests.functional.identity.v3 import common class ProjectTests(common.IdentityTests): - def test_project_create(self): project_name = data_utils.rand_name('TestProject') description = data_utils.rand_name('description') @@ -27,15 +26,18 @@ class ProjectTests(common.IdentityTests): '--enable ' '--property k1=v1 ' '--property k2=v2 ' - '%(name)s' % {'domain': self.domain_name, - 'description': description, - 'name': project_name}) + '%(name)s' + % { + 'domain': self.domain_name, + 'description': description, + 'name': project_name, + } + ) self.addCleanup( self.openstack, 'project delete ' '--domain %(domain)s ' - '%(name)s' % {'domain': self.domain_name, - 'name': project_name} + '%(name)s' % {'domain': self.domain_name, 'name': project_name}, ) items = self.parse_show(raw_output) show_fields = list(self.PROJECT_FIELDS) @@ -50,8 +52,8 @@ class ProjectTests(common.IdentityTests): raw_output = self.openstack( 'project delete ' '--domain %(domain)s ' - '%(name)s' % {'domain': self.domain_name, - 'name': project_name}) + '%(name)s' % {'domain': self.domain_name, 'name': project_name} + ) self.assertEqual(0, len(raw_output)) def test_project_list(self): @@ -62,7 +64,8 @@ class ProjectTests(common.IdentityTests): def test_project_list_with_domain(self): project_name = self._create_dummy_project() raw_output = self.openstack( - 'project list --domain %s' % self.domain_name) + 'project list --domain %s' % self.domain_name + ) items = self.parse_listing(raw_output) self.assert_table_structure(items, common.BASIC_LIST_HEADERS) self.assertIn(project_name, raw_output) @@ -76,15 +79,14 @@ class ProjectTests(common.IdentityTests): '--name %(new_name)s ' '--disable ' '--property k0=v0 ' - '%(name)s' % {'new_name': new_project_name, - 'name': project_name}) + '%(name)s' % {'new_name': new_project_name, 'name': project_name} + ) self.assertEqual(0, len(raw_output)) # check project details raw_output = self.openstack( 'project show ' '--domain %(domain)s ' - '%(name)s' % {'domain': self.domain_name, - 'name': new_project_name} + '%(name)s' % {'domain': self.domain_name, 'name': new_project_name} ) items = self.parse_show(raw_output) fields = list(self.PROJECT_FIELDS) @@ -99,15 +101,16 @@ class ProjectTests(common.IdentityTests): 'project set ' '--name %(new_name)s ' '--enable ' - '%(name)s' % {'new_name': project_name, - 'name': new_project_name}) + '%(name)s' % {'new_name': project_name, 'name': new_project_name} + ) def test_project_show(self): raw_output = self.openstack( 'project show ' '--domain %(domain)s ' - '%(name)s' % {'domain': self.domain_name, - 'name': self.project_name}) + '%(name)s' + % {'domain': self.domain_name, 'name': self.project_name} + ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.PROJECT_FIELDS) @@ -116,10 +119,10 @@ class ProjectTests(common.IdentityTests): 'project show ' '--parents --children ' '--domain %(domain)s ' - '%(name)s' % {'domain': self.domain_name, - 'name': self.project_name}, + '%(name)s' + % {'domain': self.domain_name, 'name': 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')) diff --git a/openstackclient/tests/functional/identity/v3/test_region.py b/openstackclient/tests/functional/identity/v3/test_region.py index 2a402bd1..bc014737 100644 --- a/openstackclient/tests/functional/identity/v3/test_region.py +++ b/openstackclient/tests/functional/identity/v3/test_region.py @@ -14,7 +14,6 @@ from openstackclient.tests.functional.identity.v3 import common class RegionTests(common.IdentityTests): - def test_region_create(self): self._create_dummy_region() @@ -31,7 +30,8 @@ class RegionTests(common.IdentityTests): region_1 = self._create_dummy_region(add_clean_up=False) region_2 = self._create_dummy_region(add_clean_up=False) raw_output = self.openstack( - 'region delete %s %s' % (region_1, region_2)) + 'region delete %s %s' % (region_1, region_2) + ) self.assertEqual(0, len(raw_output)) def test_region_list(self): @@ -53,8 +53,9 @@ class RegionTests(common.IdentityTests): raw_output = self.openstack( 'region set ' '--parent-region %(parent_region)s ' - '%(region)s' % {'parent_region': new_parent_region_id, - 'region': region_id}) + '%(region)s' + % {'parent_region': new_parent_region_id, 'region': region_id} + ) self.assertEqual(0, len(raw_output)) # check updated region details raw_output = self.openstack('region show %s' % region_id) diff --git a/openstackclient/tests/functional/identity/v3/test_registered_limit.py b/openstackclient/tests/functional/identity/v3/test_registered_limit.py index 80f51ad9..6e3c30ae 100644 --- a/openstackclient/tests/functional/identity/v3/test_registered_limit.py +++ b/openstackclient/tests/functional/identity/v3/test_registered_limit.py @@ -20,15 +20,13 @@ SYSTEM_CLOUD = os.environ.get('OS_SYSTEM_CLOUD', 'devstack-system-admin') class RegisteredLimitTestCase(common.IdentityTests): - def test_registered_limit_create_with_service_name(self): self._create_dummy_registered_limit() 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} + 'service show' ' %(service_name)s' % {'service_name': service_name} ) service_items = self.parse_show(raw_output) service_id = self._extract_value_from_items('id', service_items) @@ -37,22 +35,22 @@ class RegisteredLimitTestCase(common.IdentityTests): 'registered limit create' ' --service %(service_id)s' ' --default-limit %(default_limit)s' - ' %(resource_name)s' % { + ' %(resource_name)s' + % { 'service_id': service_id, 'default_limit': 10, - 'resource_name': 'cores' + 'resource_name': 'cores', }, - cloud=SYSTEM_CLOUD + 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 - }, - cloud=SYSTEM_CLOUD + ' %(registered_limit_id)s' + % {'registered_limit_id': registered_limit_id}, + cloud=SYSTEM_CLOUD, ) self.assert_show_fields(items, self.REGISTERED_LIMIT_FIELDS) @@ -65,7 +63,7 @@ class RegisteredLimitTestCase(common.IdentityTests): 'resource_name': 'cores', 'default_limit': 10, 'description': 'default limit for cores', - 'region_id': region_id + 'region_id': region_id, } raw_output = self.openstack( @@ -75,16 +73,15 @@ class RegisteredLimitTestCase(common.IdentityTests): ' --service %(service_name)s' ' --default-limit %(default_limit)s' ' %(resource_name)s' % params, - cloud=SYSTEM_CLOUD + 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 - }, - cloud=SYSTEM_CLOUD + 'registered limit delete %(registered_limit_id)s' + % {'registered_limit_id': registered_limit_id}, + cloud=SYSTEM_CLOUD, ) self.assert_show_fields(items, self.REGISTERED_LIMIT_FIELDS) @@ -92,9 +89,8 @@ 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 - } + 'registered limit show %(registered_limit_id)s' + % {'registered_limit_id': registered_limit_id} ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.REGISTERED_LIMIT_FIELDS) @@ -105,13 +101,13 @@ class RegisteredLimitTestCase(common.IdentityTests): params = { 'registered_limit_id': registered_limit_id, - 'region_id': region_id + 'region_id': region_id, } raw_output = self.openstack( 'registered limit set' ' %(registered_limit_id)s' ' --region %(region_id)s' % params, - cloud=SYSTEM_CLOUD + cloud=SYSTEM_CLOUD, ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.REGISTERED_LIMIT_FIELDS) @@ -120,13 +116,13 @@ class RegisteredLimitTestCase(common.IdentityTests): registered_limit_id = self._create_dummy_registered_limit() params = { 'registered_limit_id': registered_limit_id, - 'description': 'updated description' + 'description': 'updated description', } raw_output = self.openstack( 'registered limit set' ' %(registered_limit_id)s' ' --description \'%(description)s\'' % params, - cloud=SYSTEM_CLOUD + cloud=SYSTEM_CLOUD, ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.REGISTERED_LIMIT_FIELDS) @@ -136,13 +132,13 @@ class RegisteredLimitTestCase(common.IdentityTests): service_name = self._create_dummy_service() params = { 'registered_limit_id': registered_limit_id, - 'service': service_name + 'service': service_name, } raw_output = self.openstack( 'registered limit set' ' %(registered_limit_id)s' ' --service %(service)s' % params, - cloud=SYSTEM_CLOUD + cloud=SYSTEM_CLOUD, ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.REGISTERED_LIMIT_FIELDS) @@ -151,13 +147,13 @@ class RegisteredLimitTestCase(common.IdentityTests): registered_limit_id = self._create_dummy_registered_limit() params = { 'registered_limit_id': registered_limit_id, - 'default_limit': 20 + 'default_limit': 20, } raw_output = self.openstack( 'registered limit set' ' %(registered_limit_id)s' ' --default-limit %(default_limit)s' % params, - cloud=SYSTEM_CLOUD + cloud=SYSTEM_CLOUD, ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.REGISTERED_LIMIT_FIELDS) @@ -167,13 +163,13 @@ class RegisteredLimitTestCase(common.IdentityTests): resource_name = data_utils.rand_name('resource_name') params = { 'registered_limit_id': registered_limit_id, - 'resource_name': resource_name + 'resource_name': resource_name, } raw_output = self.openstack( 'registered limit set' ' %(registered_limit_id)s' ' --resource-name %(resource_name)s' % params, - cloud=SYSTEM_CLOUD + cloud=SYSTEM_CLOUD, ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.REGISTERED_LIMIT_FIELDS) @@ -190,9 +186,8 @@ class RegisteredLimitTestCase(common.IdentityTests): ) raw_output = self.openstack( 'registered limit delete' - ' %(registered_limit_id)s' % { - 'registered_limit_id': registered_limit_id - }, - cloud=SYSTEM_CLOUD + ' %(registered_limit_id)s' + % {'registered_limit_id': registered_limit_id}, + cloud=SYSTEM_CLOUD, ) self.assertEqual(0, len(raw_output)) diff --git a/openstackclient/tests/functional/identity/v3/test_role.py b/openstackclient/tests/functional/identity/v3/test_role.py index 3954c4e3..328a14c3 100644 --- a/openstackclient/tests/functional/identity/v3/test_role.py +++ b/openstackclient/tests/functional/identity/v3/test_role.py @@ -16,7 +16,6 @@ from openstackclient.tests.functional.identity.v3 import common class RoleTests(common.IdentityTests): - def test_role_create(self): self._create_dummy_role() @@ -26,8 +25,8 @@ class RoleTests(common.IdentityTests): raw_output = self.openstack( 'role create ' '--description %(description)s ' - '%(name)s' % {'description': description, - 'name': role_name}) + '%(name)s' % {'description': description, 'name': role_name} + ) role = self.parse_show_as_object(raw_output) self.addCleanup(self.openstack, 'role delete %s' % role['id']) items = self.parse_show(raw_output) @@ -56,7 +55,8 @@ class RoleTests(common.IdentityTests): role_name = self._create_dummy_role() new_role_name = data_utils.rand_name('NewTestRole') raw_output = self.openstack( - 'role set --name %s %s' % (new_role_name, role_name)) + 'role set --name %s %s' % (new_role_name, role_name) + ) self.assertEqual(0, len(raw_output)) raw_output = self.openstack('role show %s' % new_role_name) role = self.parse_show_as_object(raw_output) @@ -65,8 +65,9 @@ class RoleTests(common.IdentityTests): def test_role_set_description(self): role_name = self._create_dummy_role() description = data_utils.rand_name("NewDescription") - raw_output = self.openstack('role set --description %s %s' - % (description, role_name)) + raw_output = self.openstack( + 'role set --description %s %s' % (description, role_name) + ) self.assertEqual(0, len(raw_output)) raw_output = self.openstack('role show %s' % role_name) role = self.parse_show_as_object(raw_output) @@ -81,11 +82,15 @@ class RoleTests(common.IdentityTests): '--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}) + '%(role)s' + % { + 'project': self.project_name, + 'project_domain': self.domain_name, + 'user': username, + 'user_domain': self.domain_name, + 'role': role_name, + } + ) self.addCleanup( self.openstack, 'role remove ' @@ -93,11 +98,15 @@ class RoleTests(common.IdentityTests): '--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}) + '%(role)s' + % { + 'project': self.project_name, + 'project_domain': self.domain_name, + 'user': username, + 'user_domain': self.domain_name, + 'role': role_name, + }, + ) self.assertEqual(0, len(raw_output)) def test_role_remove(self): @@ -109,22 +118,30 @@ class RoleTests(common.IdentityTests): '--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}) + '%(role)s' + % { + 'project': self.project_name, + 'project_domain': self.domain_name, + 'user': username, + 'user_domain': self.domain_name, + 'role': 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}) + '%(role)s' + % { + 'project': self.project_name, + 'project_domain': self.domain_name, + 'user': username, + 'user_domain': self.domain_name, + 'role': role_name, + } + ) self.assertEqual(0, len(add_raw_output)) self.assertEqual(0, len(remove_raw_output)) @@ -141,14 +158,14 @@ class RoleTests(common.IdentityTests): self.openstack( 'implied role create ' '--implied-role %(implied_role)s ' - '%(role)s' % {'implied_role': implied_role_name, - 'role': role_name}) + '%(role)s' % {'implied_role': implied_role_name, 'role': 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}) + '%(role)s' % {'implied_role': implied_role_name, 'role': role_name} + ) self.assertEqual(0, len(raw_output)) diff --git a/openstackclient/tests/functional/identity/v3/test_service.py b/openstackclient/tests/functional/identity/v3/test_service.py index 1ecda45a..5d59b65e 100644 --- a/openstackclient/tests/functional/identity/v3/test_service.py +++ b/openstackclient/tests/functional/identity/v3/test_service.py @@ -16,7 +16,6 @@ from openstackclient.tests.functional.identity.v3 import common class ServiceTests(common.IdentityTests): - def test_service_create(self): self._create_dummy_service() @@ -29,7 +28,8 @@ class ServiceTests(common.IdentityTests): service_1 = self._create_dummy_service(add_clean_up=False) service_2 = self._create_dummy_service(add_clean_up=False) raw_output = self.openstack( - 'service delete %s %s' % (service_1, service_2)) + 'service delete %s %s' % (service_1, service_2) + ) self.assertEqual(0, len(raw_output)) def test_service_list(self): @@ -50,10 +50,14 @@ class ServiceTests(common.IdentityTests): '--name %(name)s ' '--description %(description)s ' '--disable ' - '%(service)s' % {'type': new_service_type, - 'name': new_service_name, - 'description': new_service_description, - 'service': service_name}) + '%(service)s' + % { + 'type': new_service_type, + 'name': new_service_name, + 'description': new_service_description, + 'service': service_name, + } + ) self.assertEqual(0, len(raw_output)) # get service details raw_output = self.openstack('service show %s' % new_service_name) @@ -65,7 +69,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('service show %s' % service_name) items = self.parse_show(raw_output) self.assert_show_fields(items, self.SERVICE_FIELDS) diff --git a/openstackclient/tests/functional/identity/v3/test_service_provider.py b/openstackclient/tests/functional/identity/v3/test_service_provider.py index 32b7a463..d6750595 100644 --- a/openstackclient/tests/functional/identity/v3/test_service_provider.py +++ b/openstackclient/tests/functional/identity/v3/test_service_provider.py @@ -23,21 +23,24 @@ 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) + raw_output = self.openstack( + 'service provider delete %s' % service_provider + ) self.assertEqual(0, len(raw_output)) def test_sp_multi_delete(self): sp1 = self._create_dummy_sp(add_clean_up=False) sp2 = self._create_dummy_sp(add_clean_up=False) raw_output = self.openstack( - 'service provider delete %s %s' % (sp1, sp2)) + 'service provider delete %s %s' % (sp1, sp2) + ) self.assertEqual(0, len(raw_output)) 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) + raw_output = self.openstack( + 'service provider show %s' % service_provider + ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.SERVICE_PROVIDER_FIELDS) @@ -50,13 +53,18 @@ class ServiceProviderTests(common.IdentityTests): def test_sp_set(self): service_provider = self._create_dummy_sp(add_clean_up=True) new_description = data_utils.rand_name('newDescription') - raw_output = self.openstack('service provider set ' - '%(service-provider)s ' - '--description %(description)s ' - % {'service-provider': service_provider, - 'description': new_description}) + raw_output = self.openstack( + 'service provider set ' + '%(service-provider)s ' + '--description %(description)s ' + % { + 'service-provider': service_provider, + 'description': new_description, + } + ) self.assertEqual(0, len(raw_output)) - raw_output = self.openstack('service provider show %s' - % service_provider) + raw_output = self.openstack( + 'service provider show %s' % service_provider + ) updated_value = self.parse_show_as_object(raw_output) self.assertIn(new_description, updated_value['description']) diff --git a/openstackclient/tests/functional/identity/v3/test_token.py b/openstackclient/tests/functional/identity/v3/test_token.py index 62e90003..b6b0d8b1 100644 --- a/openstackclient/tests/functional/identity/v3/test_token.py +++ b/openstackclient/tests/functional/identity/v3/test_token.py @@ -14,7 +14,6 @@ from openstackclient.tests.functional.identity.v3 import common class TokenTests(common.IdentityTests): - def test_token_issue(self): raw_output = self.openstack('token issue') items = self.parse_show(raw_output) diff --git a/openstackclient/tests/functional/identity/v3/test_user.py b/openstackclient/tests/functional/identity/v3/test_user.py index 9e9bde96..917da4a3 100644 --- a/openstackclient/tests/functional/identity/v3/test_user.py +++ b/openstackclient/tests/functional/identity/v3/test_user.py @@ -16,16 +16,16 @@ from openstackclient.tests.functional.identity.v3 import common class UserTests(common.IdentityTests): - def test_user_create(self): self._create_dummy_user() 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}) + raw_output = self.openstack( + 'user delete ' + '--domain %(domain)s ' + '%(name)s' % {'domain': self.domain_name, 'name': username} + ) self.assertEqual(0, len(raw_output)) def test_user_list(self): @@ -35,24 +35,27 @@ 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}) + raw_output = self.openstack( + 'user show ' + '--domain %(domain)s ' + '%(name)s' % {'domain': self.domain_name, 'name': 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']}) + 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']} + ) self.assertEqual(0, len(raw_output)) - raw_output = self.openstack('user show ' - '--domain %(domain)s ' - '%(name)s' % {'domain': self.domain_name, - 'name': new_username}) + raw_output = self.openstack( + 'user show ' + '--domain %(domain)s ' + '%(name)s' % {'domain': self.domain_name, 'name': new_username} + ) updated_user = self.parse_show_as_object(raw_output) self.assertEqual(user['id'], updated_user['id']) self.assertEqual(new_email, updated_user['email']) @@ -61,31 +64,38 @@ class UserTests(common.IdentityTests): username = self._create_dummy_user() 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}) + raw_output = self.openstack( + 'user show ' + '--domain %(domain)s ' + '%(name)s' % {'domain': self.domain_name, 'name': 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']}) + 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'], + } + ) 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}) + raw_output = self.openstack( + 'user show ' + '--domain %(domain)s ' + '%(name)s' % {'domain': self.domain_name, 'name': 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}) + raw_output = self.openstack( + 'project show ' + '--domain %(domain)s ' + '%(name)s' % {'domain': self.domain_name, 'name': project_name} + ) project = self.parse_show_as_object(raw_output) # check updated user details self.assertEqual(user['id'], updated_user['id']) @@ -93,9 +103,10 @@ 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}) + raw_output = self.openstack( + 'user show ' + '--domain %(domain)s ' + '%(name)s' % {'domain': self.domain_name, 'name': username} + ) items = self.parse_show(raw_output) self.assert_show_fields(items, self.USER_FIELDS) |