diff options
| author | Stephen Finucane <sfinucan@redhat.com> | 2023-05-08 11:32:01 +0100 |
|---|---|---|
| committer | Stephen Finucane <sfinucan@redhat.com> | 2023-05-10 10:51:30 +0100 |
| commit | aed521d426f45b335e1c69d8b2f6d103c916f75c (patch) | |
| tree | 39eca8c658a0339cfbbe3b0e9e69232037be17f6 | |
| parent | 6475dc58e8baa199d948c4b2d250c1fb45e0bd30 (diff) | |
| download | python-openstackclient-aed521d426f45b335e1c69d8b2f6d103c916f75c.tar.gz | |
Blacken openstackclient.identity
Black used with the '-l 79 -S' flags.
A future change will ignore this commit in git-blame history by adding a
'git-blame-ignore-revs' file.
Change-Id: I2eeade1ce6653be8e9179ecc40105182c5ff5f16
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
100 files changed, 4901 insertions, 4011 deletions
diff --git a/openstackclient/identity/client.py b/openstackclient/identity/client.py index 0292aac2..5ed81e58 100644 --- a/openstackclient/identity/client.py +++ b/openstackclient/identity/client.py @@ -43,18 +43,15 @@ AUTH_VERSIONS = { def make_client(instance): """Returns an identity service client.""" identity_client = utils.get_client_class( - API_NAME, - instance._api_version[API_NAME], - API_VERSIONS) + API_NAME, instance._api_version[API_NAME], API_VERSIONS + ) LOG.debug('Instantiating identity client: %s', identity_client) # Remember interface only if interface is set kwargs = utils.build_kwargs_dict('interface', instance.interface) client = identity_client( - session=instance.session, - region_name=instance.region_name, - **kwargs + session=instance.session, region_name=instance.region_name, **kwargs ) return client @@ -66,8 +63,11 @@ def build_option_parser(parser): '--os-identity-api-version', metavar='<identity-api-version>', default=utils.env('OS_IDENTITY_API_VERSION'), - help=_('Identity API version, default=%s ' - '(Env: OS_IDENTITY_API_VERSION)') % DEFAULT_API_VERSION, + help=_( + 'Identity API version, default=%s ' + '(Env: OS_IDENTITY_API_VERSION)' + ) + % DEFAULT_API_VERSION, ) return parser diff --git a/openstackclient/identity/common.py b/openstackclient/identity/common.py index a75db4f8..745ffb2b 100644 --- a/openstackclient/identity/common.py +++ b/openstackclient/identity/common.py @@ -33,7 +33,8 @@ def find_service_in_list(service_list, service_id): if service.id == service_id: return service raise exceptions.CommandError( - "No service with a type, name or ID of '%s' exists." % service_id) + "No service with a type, name or ID of '%s' exists." % service_id + ) def find_service(identity_client, name_type_or_id): @@ -52,8 +53,10 @@ def find_service(identity_client, name_type_or_id): except identity_exc.NotFound: pass except identity_exc.NoUniqueMatch: - msg = _("Multiple service matches found for '%s', " - "use an ID to be more specific.") + msg = _( + "Multiple service matches found for '%s', " + "use an ID to be more specific." + ) raise exceptions.CommandError(msg % name_type_or_id) try: @@ -63,8 +66,10 @@ def find_service(identity_client, name_type_or_id): msg = _("No service with a type, name or ID of '%s' exists.") raise exceptions.CommandError(msg % name_type_or_id) except identity_exc.NoUniqueMatch: - msg = _("Multiple service matches found for '%s', " - "use an ID to be more specific.") + msg = _( + "Multiple service matches found for '%s', " + "use an ID to be more specific." + ) raise exceptions.CommandError(msg % name_type_or_id) @@ -141,42 +146,56 @@ def _get_domain_id_if_requested(identity_client, domain_name_or_id): def find_domain(identity_client, name_or_id): - return _find_identity_resource(identity_client.domains, name_or_id, - domains.Domain) + return _find_identity_resource( + identity_client.domains, name_or_id, domains.Domain + ) def find_group(identity_client, name_or_id, domain_name_or_id=None): domain_id = _get_domain_id_if_requested(identity_client, domain_name_or_id) if not domain_id: - return _find_identity_resource(identity_client.groups, name_or_id, - groups.Group) + return _find_identity_resource( + identity_client.groups, name_or_id, groups.Group + ) else: - return _find_identity_resource(identity_client.groups, name_or_id, - groups.Group, domain_id=domain_id) + return _find_identity_resource( + identity_client.groups, + name_or_id, + groups.Group, + domain_id=domain_id, + ) def find_project(identity_client, name_or_id, domain_name_or_id=None): domain_id = _get_domain_id_if_requested(identity_client, domain_name_or_id) if not domain_id: - return _find_identity_resource(identity_client.projects, name_or_id, - projects.Project) + return _find_identity_resource( + identity_client.projects, name_or_id, projects.Project + ) else: - return _find_identity_resource(identity_client.projects, name_or_id, - projects.Project, domain_id=domain_id) + return _find_identity_resource( + identity_client.projects, + name_or_id, + projects.Project, + domain_id=domain_id, + ) def find_user(identity_client, name_or_id, domain_name_or_id=None): domain_id = _get_domain_id_if_requested(identity_client, domain_name_or_id) if not domain_id: - return _find_identity_resource(identity_client.users, name_or_id, - users.User) + return _find_identity_resource( + identity_client.users, name_or_id, users.User + ) else: - return _find_identity_resource(identity_client.users, name_or_id, - users.User, domain_id=domain_id) + return _find_identity_resource( + identity_client.users, name_or_id, users.User, domain_id=domain_id + ) -def _find_identity_resource(identity_client_manager, name_or_id, - resource_type, **kwargs): +def _find_identity_resource( + identity_client_manager, name_or_id, resource_type, **kwargs +): """Find a specific identity resource. Using keystoneclient's manager, attempt to find a specific resource by its @@ -203,8 +222,9 @@ def _find_identity_resource(identity_client_manager, name_or_id, """ try: - identity_resource = utils.find_resource(identity_client_manager, - name_or_id, **kwargs) + identity_resource = utils.find_resource( + identity_client_manager, name_or_id, **kwargs + ) if identity_resource is not None: return identity_resource except (exceptions.Forbidden, identity_exc.Forbidden): @@ -226,9 +246,11 @@ def add_user_domain_option_to_parser(parser): parser.add_argument( '--user-domain', metavar='<user-domain>', - help=_('Domain the user belongs to (name or ID). ' - 'This can be used in case collisions between user names ' - 'exist.'), + help=_( + 'Domain the user belongs to (name or ID). ' + 'This can be used in case collisions between user names ' + 'exist.' + ), ) @@ -236,9 +258,11 @@ def add_group_domain_option_to_parser(parser): parser.add_argument( '--group-domain', metavar='<group-domain>', - help=_('Domain the group belongs to (name or ID). ' - 'This can be used in case collisions between group names ' - 'exist.'), + help=_( + 'Domain the group belongs to (name or ID). ' + 'This can be used in case collisions between group names ' + 'exist.' + ), ) @@ -246,9 +270,13 @@ def add_project_domain_option_to_parser(parser, enhance_help=lambda _h: _h): parser.add_argument( '--project-domain', metavar='<project-domain>', - help=enhance_help(_('Domain the project belongs to (name or ID). This ' - 'can be used in case collisions between project ' - 'names exist.')), + help=enhance_help( + _( + 'Domain the project belongs to (name or ID). This ' + 'can be used in case collisions between project ' + 'names exist.' + ) + ), ) @@ -256,9 +284,11 @@ def add_role_domain_option_to_parser(parser): parser.add_argument( '--role-domain', metavar='<role-domain>', - help=_('Domain the role belongs to (name or ID). ' - 'This must be specified when the name of a domain specific ' - 'role is used.'), + help=_( + 'Domain the role belongs to (name or ID). ' + 'This must be specified when the name of a domain specific ' + 'role is used.' + ), ) @@ -267,8 +297,9 @@ def add_inherited_option_to_parser(parser): '--inherited', action='store_true', default=False, - help=_('Specifies if the role grant is inheritable to the sub ' - 'projects'), + help=_( + 'Specifies if the role grant is inheritable to the sub ' 'projects' + ), ) @@ -277,8 +308,10 @@ def add_resource_option_to_parser(parser): enable_group.add_argument( '--immutable', action='store_true', - help=_('Make resource immutable. An immutable project may not ' - 'be deleted or modified except to remove the immutable flag'), + help=_( + 'Make resource immutable. An immutable project may not ' + 'be deleted or modified except to remove the immutable flag' + ), ) enable_group.add_argument( '--no-immutable', diff --git a/openstackclient/identity/v2_0/catalog.py b/openstackclient/identity/v2_0/catalog.py index 05d0e9ae..bea97cce 100644 --- a/openstackclient/identity/v2_0/catalog.py +++ b/openstackclient/identity/v2_0/catalog.py @@ -47,7 +47,6 @@ class ListCatalog(command.Lister): _description = _("List services in the service catalog") def take_action(self, parsed_args): - # Trigger auth if it has not happened yet auth_ref = self.app.client_manager.auth_ref if not auth_ref: @@ -57,13 +56,19 @@ class ListCatalog(command.Lister): data = auth_ref.service_catalog.catalog columns = ('Name', 'Type', 'Endpoints') - return (columns, - (utils.get_dict_properties( - s, columns, + return ( + columns, + ( + utils.get_dict_properties( + s, + columns, formatters={ 'Endpoints': EndpointsColumn, }, - ) for s in data)) + ) + for s in data + ), + ) class ShowCatalog(command.ShowOne): @@ -79,7 +84,6 @@ class ShowCatalog(command.ShowOne): return parser def take_action(self, parsed_args): - # Trigger auth if it has not happened yet auth_ref = self.app.client_manager.auth_ref if not auth_ref: @@ -89,8 +93,10 @@ class ShowCatalog(command.ShowOne): data = None for service in auth_ref.service_catalog.catalog: - if (service.get('name') == parsed_args.service or - service.get('type') == parsed_args.service): + if ( + service.get('name') == parsed_args.service + or service.get('type') == parsed_args.service + ): data = service.copy() data['endpoints'] = EndpointsColumn(data['endpoints']) if 'endpoints_links' in data: diff --git a/openstackclient/identity/v2_0/ec2creds.py b/openstackclient/identity/v2_0/ec2creds.py index f712bf45..94d68330 100644 --- a/openstackclient/identity/v2_0/ec2creds.py +++ b/openstackclient/identity/v2_0/ec2creds.py @@ -77,9 +77,7 @@ class CreateEC2Creds(command.ShowOne): info.update(creds._info) if 'tenant_id' in info: - info.update( - {'project_id': info.pop('tenant_id')} - ) + info.update({'project_id': info.pop('tenant_id')}) return zip(*sorted(info.items())) @@ -120,14 +118,19 @@ class DeleteEC2Creds(command.Command): identity_client.ec2.delete(user, access_key) except Exception as e: result += 1 - LOG.error(_("Failed to delete EC2 credentials with " - "access key '%(access_key)s': %(e)s"), - {'access_key': access_key, 'e': e}) + LOG.error( + _( + "Failed to delete EC2 credentials with " + "access key '%(access_key)s': %(e)s" + ), + {'access_key': access_key, 'e': e}, + ) if result > 0: total = len(parsed_args.access_keys) - msg = (_("%(result)s of %(total)s EC2 keys failed " - "to delete.") % {'result': result, 'total': total}) + msg = _( + "%(result)s of %(total)s EC2 keys failed " "to delete." + ) % {'result': result, 'total': total} raise exceptions.CommandError(msg) @@ -159,11 +162,17 @@ class ListEC2Creds(command.Lister): column_headers = ('Access', 'Secret', 'Project ID', 'User ID') data = identity_client.ec2.list(user) - return (column_headers, - (utils.get_item_properties( - s, columns, + return ( + column_headers, + ( + utils.get_item_properties( + s, + columns, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) class ShowEC2Creds(command.ShowOne): @@ -201,8 +210,6 @@ class ShowEC2Creds(command.ShowOne): info.update(creds._info) if 'tenant_id' in info: - info.update( - {'project_id': info.pop('tenant_id')} - ) + info.update({'project_id': info.pop('tenant_id')}) return zip(*sorted(info.items())) diff --git a/openstackclient/identity/v2_0/endpoint.py b/openstackclient/identity/v2_0/endpoint.py index 57906ddf..2b9970a6 100644 --- a/openstackclient/identity/v2_0/endpoint.py +++ b/openstackclient/identity/v2_0/endpoint.py @@ -69,7 +69,8 @@ class CreateEndpoint(command.ShowOne): service.id, parsed_args.publicurl, parsed_args.adminurl, - parsed_args.internalurl,) + parsed_args.internalurl, + ) info = {} info.update(endpoint._info) @@ -100,14 +101,19 @@ class DeleteEndpoint(command.Command): identity_client.endpoints.delete(endpoint) except Exception as e: result += 1 - LOG.error(_("Failed to delete endpoint with " - "ID '%(endpoint)s': %(e)s"), - {'endpoint': endpoint, 'e': e}) + LOG.error( + _( + "Failed to delete endpoint with " + "ID '%(endpoint)s': %(e)s" + ), + {'endpoint': endpoint, 'e': e}, + ) if result > 0: total = len(parsed_args.endpoints) - msg = (_("%(result)s of %(total)s endpoints failed " - "to delete.") % {'result': result, 'total': total}) + msg = _( + "%(result)s of %(total)s endpoints failed " "to delete." + ) % {'result': result, 'total': total} raise exceptions.CommandError(msg) @@ -127,8 +133,15 @@ class ListEndpoint(command.Lister): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity if parsed_args.long: - columns = ('ID', 'Region', 'Service Name', 'Service Type', - 'PublicURL', 'AdminURL', 'InternalURL') + columns = ( + 'ID', + 'Region', + 'Service Name', + 'Service Type', + 'PublicURL', + 'AdminURL', + 'InternalURL', + ) else: columns = ('ID', 'Region', 'Service Name', 'Service Type') data = identity_client.endpoints.list() @@ -137,11 +150,17 @@ class ListEndpoint(command.Lister): service = common.find_service(identity_client, ep.service_id) ep.service_name = service.name ep.service_type = service.type - return (columns, - (utils.get_item_properties( - s, columns, + return ( + columns, + ( + utils.get_item_properties( + s, + columns, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) class ShowEndpoint(command.ShowOne): @@ -152,8 +171,10 @@ class ShowEndpoint(command.ShowOne): parser.add_argument( 'endpoint_or_service', metavar='<endpoint>', - help=_('Endpoint to display (endpoint ID, service ID,' - ' service name, service type)'), + help=_( + 'Endpoint to display (endpoint ID, service ID,' + ' service name, service type)' + ), ) return parser @@ -166,8 +187,9 @@ class ShowEndpoint(command.ShowOne): match = ep service = common.find_service(identity_client, ep.service_id) if match is None: - service = common.find_service(identity_client, - parsed_args.endpoint_or_service) + service = common.find_service( + identity_client, parsed_args.endpoint_or_service + ) for ep in data: if ep.service_id == service.id: match = ep diff --git a/openstackclient/identity/v2_0/project.py b/openstackclient/identity/v2_0/project.py index f431c021..e2f378db 100644 --- a/openstackclient/identity/v2_0/project.py +++ b/openstackclient/identity/v2_0/project.py @@ -60,8 +60,10 @@ class CreateProject(command.ShowOne): '--property', metavar='<key=value>', action=parseractions.KeyValueAction, - help=_('Add a property to <name> ' - '(repeat option to set multiple properties)'), + help=_( + 'Add a property to <name> ' + '(repeat option to set multiple properties)' + ), ) parser.add_argument( '--or-show', @@ -128,14 +130,19 @@ class DeleteProject(command.Command): identity_client.tenants.delete(project_obj.id) except Exception as e: errors += 1 - LOG.error(_("Failed to delete project with " - "name or ID '%(project)s': %(e)s"), - {'project': project, 'e': e}) + LOG.error( + _( + "Failed to delete project with " + "name or ID '%(project)s': %(e)s" + ), + {'project': project, 'e': e}, + ) if errors > 0: total = len(parsed_args.projects) - msg = (_("%(errors)s of %(total)s projects failed " - "to delete.") % {'errors': errors, 'total': total}) + msg = _( + "%(errors)s of %(total)s projects failed " "to delete." + ) % {'errors': errors, 'total': total} raise exceptions.CommandError(msg) @@ -153,9 +160,11 @@ class ListProject(command.Lister): parser.add_argument( '--sort', metavar='<key>[:<direction>]', - help=_('Sort output by selected keys and directions (asc or desc) ' - '(default: asc), repeat this option to specify multiple ' - 'keys and directions.'), + help=_( + 'Sort output by selected keys and directions (asc or desc) ' + '(default: asc), repeat this option to specify multiple ' + 'keys and directions.' + ), ) return parser @@ -167,11 +176,17 @@ class ListProject(command.Lister): data = self.app.client_manager.identity.tenants.list() if parsed_args.sort: data = utils.sort_items(data, parsed_args.sort) - return (columns, - (utils.get_item_properties( - s, columns, + return ( + columns, + ( + utils.get_item_properties( + s, + columns, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) class SetProject(command.Command): @@ -209,8 +224,10 @@ class SetProject(command.Command): '--property', metavar='<key=value>', action=parseractions.KeyValueAction, - help=_('Set a project property ' - '(repeat option to set multiple properties)'), + help=_( + 'Set a project property ' + '(repeat option to set multiple properties)' + ), ) return parser @@ -268,8 +285,8 @@ class ShowProject(command.ShowOne): except ks_exc.Forbidden: auth_ref = self.app.client_manager.auth_ref if ( - parsed_args.project == auth_ref.project_id or - parsed_args.project == auth_ref.project_name + parsed_args.project == auth_ref.project_id + or parsed_args.project == auth_ref.project_name ): # Ask for currently auth'ed project so return it info = { @@ -316,8 +333,10 @@ class UnsetProject(command.Command): metavar='<key>', action='append', default=[], - help=_('Unset a project property ' - '(repeat option to unset multiple properties)'), + help=_( + 'Unset a project property ' + '(repeat option to unset multiple properties)' + ), ) return parser diff --git a/openstackclient/identity/v2_0/role.py b/openstackclient/identity/v2_0/role.py index 5c53fbcd..931957bd 100644 --- a/openstackclient/identity/v2_0/role.py +++ b/openstackclient/identity/v2_0/role.py @@ -133,14 +133,20 @@ class DeleteRole(command.Command): identity_client.roles.delete(role_obj.id) except Exception as e: errors += 1 - LOG.error(_("Failed to delete role with " - "name or ID '%(role)s': %(e)s"), - {'role': role, 'e': e}) + LOG.error( + _( + "Failed to delete role with " + "name or ID '%(role)s': %(e)s" + ), + {'role': role, 'e': e}, + ) if errors > 0: total = len(parsed_args.roles) - msg = (_("%(errors)s of %(total)s roles failed " - "to delete.") % {'errors': errors, 'total': total}) + msg = _("%(errors)s of %(total)s roles failed " "to delete.") % { + 'errors': errors, + 'total': total, + } raise exceptions.CommandError(msg) @@ -153,11 +159,17 @@ class ListRole(command.Lister): columns = ('ID', 'Name') data = identity_client.roles.list() - return (columns, - (utils.get_item_properties( - s, columns, + return ( + columns, + ( + utils.get_item_properties( + s, + columns, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) class RemoveRole(command.Command): @@ -192,10 +204,7 @@ class RemoveRole(command.Command): parsed_args.project, ) user = utils.find_resource(identity_client.users, parsed_args.user) - identity_client.roles.remove_user_role( - user.id, - role.id, - project.id) + identity_client.roles.remove_user_role(user.id, role.id, project.id) class ShowRole(command.ShowOne): diff --git a/openstackclient/identity/v2_0/role_assignment.py b/openstackclient/identity/v2_0/role_assignment.py index 8236bbfc..c3d492e2 100644 --- a/openstackclient/identity/v2_0/role_assignment.py +++ b/openstackclient/identity/v2_0/role_assignment.py @@ -51,7 +51,7 @@ class ListRoleAssignment(command.Lister): action="store_true", dest='authproject', help='Only list assignments for the project to which the ' - 'authenticated user\'s token is scoped', + 'authenticated user\'s token is scoped', ) return parser @@ -70,8 +70,7 @@ class ListRoleAssignment(command.Lister): elif parsed_args.authuser: if auth_ref: user = utils.find_resource( - identity_client.users, - auth_ref.user_id + identity_client.users, auth_ref.user_id ) project = None @@ -83,8 +82,7 @@ class ListRoleAssignment(command.Lister): elif parsed_args.authproject: if auth_ref: project = utils.find_resource( - identity_client.projects, - auth_ref.project_id + identity_client.projects, auth_ref.project_id ) # If user or project is not specified, we would ideally list all @@ -107,8 +105,14 @@ class ListRoleAssignment(command.Lister): user_role.user = user.id user_role.project = project.id - return (columns, - (utils.get_item_properties( - s, columns, + return ( + columns, + ( + utils.get_item_properties( + s, + columns, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) diff --git a/openstackclient/identity/v2_0/service.py b/openstackclient/identity/v2_0/service.py index afc0b3d7..15203e69 100644 --- a/openstackclient/identity/v2_0/service.py +++ b/openstackclient/identity/v2_0/service.py @@ -90,14 +90,19 @@ class DeleteService(command.Command): identity_client.services.delete(service.id) except Exception as e: result += 1 - LOG.error(_("Failed to delete service with " - "name or ID '%(service)s': %(e)s"), - {'service': service, 'e': e}) + LOG.error( + _( + "Failed to delete service with " + "name or ID '%(service)s': %(e)s" + ), + {'service': service, 'e': e}, + ) if result > 0: total = len(parsed_args.services) - msg = (_("%(result)s of %(total)s services failed " - "to delete.") % {'result': result, 'total': total}) + msg = _( + "%(result)s of %(total)s services failed " "to delete." + ) % {'result': result, 'total': total} raise exceptions.CommandError(msg) @@ -115,7 +120,6 @@ class ListService(command.Lister): return parser def take_action(self, parsed_args): - if parsed_args.long: columns = ('ID', 'Name', 'Type', 'Description') else: @@ -151,15 +155,17 @@ class ShowService(command.ShowOne): if parsed_args.catalog: endpoints = auth_ref.service_catalog.get_endpoints( - service_type=parsed_args.service) - for (service, service_endpoints) in endpoints.items(): + service_type=parsed_args.service + ) + for service, service_endpoints in endpoints.items(): if service_endpoints: info = {"type": service} info.update(service_endpoints[0]) return zip(*sorted(info.items())) - msg = _("No service catalog with a type, name or ID of '%s' " - "exists.") % (parsed_args.service) + msg = _( + "No service catalog with a type, name or ID of '%s' " "exists." + ) % (parsed_args.service) raise exceptions.CommandError(msg) else: service = common.find_service(identity_client, parsed_args.service) diff --git a/openstackclient/identity/v2_0/token.py b/openstackclient/identity/v2_0/token.py index 205e15d3..8759df8d 100644 --- a/openstackclient/identity/v2_0/token.py +++ b/openstackclient/identity/v2_0/token.py @@ -35,7 +35,8 @@ class IssueToken(command.ShowOne): auth_ref = self.app.client_manager.auth_ref if not auth_ref: raise exceptions.AuthorizationFailure( - "Only an authorized user may issue a new token.") + "Only an authorized user may issue a new token." + ) data = {} if auth_ref.auth_token: diff --git a/openstackclient/identity/v2_0/user.py b/openstackclient/identity/v2_0/user.py index 8dac093e..7bcbc451 100644 --- a/openstackclient/identity/v2_0/user.py +++ b/openstackclient/identity/v2_0/user.py @@ -122,8 +122,12 @@ class CreateUser(command.ShowOne): parsed_args.password = utils.get_password(self.app.stdin) if not parsed_args.password: - LOG.warning(_("No password was supplied, authentication will fail " - "when a user does not have a password.")) + LOG.warning( + _( + "No password was supplied, authentication will fail " + "when a user does not have a password." + ) + ) try: user = identity_client.users.create( @@ -147,9 +151,7 @@ class CreateUser(command.ShowOne): # the returned resource has 'tenantId'. Sigh. # We're using project_id now inside OSC so there. if 'tenantId' in user._info: - user._info.update( - {'project_id': user._info.pop('tenantId')} - ) + user._info.update({'project_id': user._info.pop('tenantId')}) info = {} info.update(user._info) @@ -182,14 +184,20 @@ class DeleteUser(command.Command): identity_client.users.delete(user_obj.id) except Exception as e: errors += 1 - LOG.error(_("Failed to delete user with " - "name or ID '%(user)s': %(e)s"), - {'user': user, 'e': e}) + LOG.error( + _( + "Failed to delete user with " + "name or ID '%(user)s': %(e)s" + ), + {'user': user, 'e': e}, + ) if errors > 0: total = len(parsed_args.users) - msg = (_("%(errors)s of %(total)s users failed " - "to delete.") % {'errors': errors, 'total': total}) + msg = _("%(errors)s of %(total)s users failed " "to delete.") % { + 'errors': errors, + 'total': total, + } raise exceptions.CommandError(msg) @@ -246,7 +254,8 @@ class ListUser(command.Lister): # Just forget it if there's any trouble pass formatters['tenantId'] = functools.partial( - ProjectColumn, project_cache=project_cache) + ProjectColumn, project_cache=project_cache + ) else: columns = column_headers = ('ID', 'Name') data = identity_client.users.list(tenant_id=project) @@ -267,12 +276,18 @@ class ListUser(command.Lister): d._info['tenantId'] = d._info.pop('tenant_id') d._add_details(d._info) - return (column_headers, - (utils.get_item_properties( - s, columns, + return ( + column_headers, + ( + utils.get_item_properties( + s, + columns, mixed_case_fields=('tenantId',), formatters=formatters, - ) for s in data)) + ) + for s in data + ), + ) class SetUser(command.Command): @@ -331,8 +346,12 @@ class SetUser(command.Command): parsed_args.password = utils.get_password(self.app.stdin) if '' == parsed_args.password: - LOG.warning(_("No password was supplied, authentication will fail " - "when a user does not have a password.")) + LOG.warning( + _( + "No password was supplied, authentication will fail " + "when a user does not have a password." + ) + ) user = utils.find_resource( identity_client.users, @@ -394,8 +413,8 @@ class ShowUser(command.ShowOne): except ks_exc.Forbidden: auth_ref = self.app.client_manager.auth_ref if ( - parsed_args.user == auth_ref.user_id or - parsed_args.user == auth_ref.username + parsed_args.user == auth_ref.user_id + or parsed_args.user == auth_ref.username ): # Ask for currently auth'ed project so return it info = { @@ -409,12 +428,8 @@ class ShowUser(command.ShowOne): raise if 'tenantId' in info: - info.update( - {'project_id': info.pop('tenantId')} - ) + info.update({'project_id': info.pop('tenantId')}) if 'tenant_id' in info: - info.update( - {'project_id': info.pop('tenant_id')} - ) + info.update({'project_id': info.pop('tenant_id')}) return zip(*sorted(info.items())) diff --git a/openstackclient/identity/v3/access_rule.py b/openstackclient/identity/v3/access_rule.py index ffda04f9..5eff39c7 100644 --- a/openstackclient/identity/v3/access_rule.py +++ b/openstackclient/identity/v3/access_rule.py @@ -48,18 +48,24 @@ class DeleteAccessRule(command.Command): for ac in parsed_args.access_rule: try: access_rule = utils.find_resource( - identity_client.access_rules, ac) + identity_client.access_rules, ac + ) identity_client.access_rules.delete(access_rule.id) except Exception as e: errors += 1 - LOG.error(_("Failed to delete access rule with " - "ID '%(ac)s': %(e)s"), - {'ac': ac, 'e': e}) + LOG.error( + _( + "Failed to delete access rule with " + "ID '%(ac)s': %(e)s" + ), + {'ac': ac, 'e': e}, + ) if errors > 0: total = len(parsed_args.access_rule) - msg = (_("%(errors)s of %(total)s access rules failed " - "to delete.") % {'errors': errors, 'total': total}) + msg = _( + "%(errors)s of %(total)s access rules failed " "to delete." + ) % {'errors': errors, 'total': total} raise exceptions.CommandError(msg) @@ -79,20 +85,25 @@ class ListAccessRule(command.Lister): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity if parsed_args.user: - user_id = common.find_user(identity_client, - parsed_args.user, - parsed_args.user_domain).id + user_id = common.find_user( + identity_client, parsed_args.user, parsed_args.user_domain + ).id else: user_id = None columns = ('ID', 'Service', 'Method', 'Path') - data = identity_client.access_rules.list( - user=user_id) - return (columns, - (utils.get_item_properties( - s, columns, + data = identity_client.access_rules.list(user=user_id) + return ( + columns, + ( + utils.get_item_properties( + s, + columns, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) class ShowAccessRule(command.ShowOne): @@ -109,8 +120,9 @@ class ShowAccessRule(command.ShowOne): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - access_rule = utils.find_resource(identity_client.access_rules, - parsed_args.access_rule) + access_rule = utils.find_resource( + identity_client.access_rules, parsed_args.access_rule + ) access_rule._info.pop('links', None) diff --git a/openstackclient/identity/v3/application_credential.py b/openstackclient/identity/v3/application_credential.py index a2089856..c75de3a4 100644 --- a/openstackclient/identity/v3/application_credential.py +++ b/openstackclient/identity/v3/application_credential.py @@ -43,23 +43,29 @@ class CreateApplicationCredential(command.ShowOne): parser.add_argument( '--secret', metavar='<secret>', - help=_('Secret to use for authentication (if not provided, one' - ' will be generated)'), + help=_( + 'Secret to use for authentication (if not provided, one' + ' will be generated)' + ), ) parser.add_argument( '--role', metavar='<role>', action='append', default=[], - help=_('Roles to authorize (name or ID) (repeat option to set' - ' multiple values)'), + help=_( + 'Roles to authorize (name or ID) (repeat option to set' + ' multiple values)' + ), ) parser.add_argument( '--expiration', metavar='<expiration>', - help=_('Sets an expiration date for the application credential,' - ' format of YYYY-mm-ddTHH:MM:SS (if not provided, the' - ' application credential will not expire)'), + help=_( + 'Sets an expiration date for the application credential,' + ' format of YYYY-mm-ddTHH:MM:SS (if not provided, the' + ' application credential will not expire)' + ), ) parser.add_argument( '--description', @@ -69,27 +75,32 @@ class CreateApplicationCredential(command.ShowOne): parser.add_argument( '--unrestricted', action="store_true", - help=_('Enable application credential to create and delete other' - ' application credentials and trusts (this is potentially' - ' dangerous behavior and is disabled by default)'), + help=_( + 'Enable application credential to create and delete other' + ' application credentials and trusts (this is potentially' + ' dangerous behavior and is disabled by default)' + ), ) parser.add_argument( '--restricted', action="store_true", - help=_('Prohibit application credential from creating and deleting' - ' other application credentials and trusts (this is the' - ' default behavior)'), + help=_( + 'Prohibit application credential from creating and deleting' + ' other application credentials and trusts (this is the' + ' default behavior)' + ), ) parser.add_argument( '--access-rules', metavar='<access-rules>', - help=_('Either a string or file path containing a JSON-formatted ' - 'list of access rules, each containing a request method, ' - 'path, and service, for example ' - '\'[{"method": "GET", ' - '"path": "/v2.1/servers", ' - '"service": "compute"}]\''), - + help=_( + 'Either a string or file path containing a JSON-formatted ' + 'list of access rules, each containing a request method, ' + 'path, and service, for example ' + '\'[{"method": "GET", ' + '"path": "/v2.1/servers", ' + '"service": "compute"}]\'' + ), ) return parser @@ -103,14 +114,16 @@ class CreateApplicationCredential(command.ShowOne): # which they are currently scoped with a subset of the role # assignments they have on that project. Don't bother trying to # look up roles via keystone, just introspect the token. - role_id = common._get_token_resource(identity_client, "roles", - role) + role_id = common._get_token_resource( + identity_client, "roles", role + ) role_ids.append(role_id) expires_at = None if parsed_args.expiration: - expires_at = datetime.datetime.strptime(parsed_args.expiration, - '%Y-%m-%dT%H:%M:%S') + expires_at = datetime.datetime.strptime( + parsed_args.expiration, '%Y-%m-%dT%H:%M:%S' + ) if parsed_args.restricted: unrestricted = False @@ -125,9 +138,11 @@ class CreateApplicationCredential(command.ShowOne): with open(parsed_args.access_rules) as f: access_rules = json.load(f) except IOError: - raise exceptions.CommandError( - _("Access rules is not valid JSON string or file does" - " not exist.")) + msg = _( + "Access rules is not valid JSON string or file does" + " not exist." + ) + raise exceptions.CommandError(msg) else: access_rules = None @@ -172,18 +187,25 @@ class DeleteApplicationCredential(command.Command): for ac in parsed_args.application_credential: try: app_cred = utils.find_resource( - identity_client.application_credentials, ac) + identity_client.application_credentials, ac + ) identity_client.application_credentials.delete(app_cred.id) except Exception as e: errors += 1 - LOG.error(_("Failed to delete application credential with " - "name or ID '%(ac)s': %(e)s"), - {'ac': ac, 'e': e}) + LOG.error( + _( + "Failed to delete application credential with " + "name or ID '%(ac)s': %(e)s" + ), + {'ac': ac, 'e': e}, + ) if errors > 0: total = len(parsed_args.application_credential) - msg = (_("%(errors)s of %(total)s application credentials failed " - "to delete.") % {'errors': errors, 'total': total}) + msg = _( + "%(errors)s of %(total)s application credentials failed " + "to delete." + ) % {'errors': errors, 'total': total} raise exceptions.CommandError(msg) @@ -203,20 +225,25 @@ class ListApplicationCredential(command.Lister): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity if parsed_args.user: - user_id = common.find_user(identity_client, - parsed_args.user, - parsed_args.user_domain).id + user_id = common.find_user( + identity_client, parsed_args.user, parsed_args.user_domain + ).id else: user_id = None columns = ('ID', 'Name', 'Project ID', 'Description', 'Expires At') - data = identity_client.application_credentials.list( - user=user_id) - return (columns, - (utils.get_item_properties( - s, columns, + data = identity_client.application_credentials.list(user=user_id) + return ( + columns, + ( + utils.get_item_properties( + s, + columns, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) class ShowApplicationCredential(command.ShowOne): @@ -233,8 +260,10 @@ class ShowApplicationCredential(command.ShowOne): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - app_cred = utils.find_resource(identity_client.application_credentials, - parsed_args.application_credential) + app_cred = utils.find_resource( + identity_client.application_credentials, + parsed_args.application_credential, + ) app_cred._info.pop('links', None) diff --git a/openstackclient/identity/v3/catalog.py b/openstackclient/identity/v3/catalog.py index d1f7d319..a5c2ee47 100644 --- a/openstackclient/identity/v3/catalog.py +++ b/openstackclient/identity/v3/catalog.py @@ -42,7 +42,6 @@ class ListCatalog(command.Lister): _description = _("List services in the service catalog") def take_action(self, parsed_args): - # Trigger auth if it has not happened yet auth_ref = self.app.client_manager.auth_ref if not auth_ref: @@ -52,13 +51,19 @@ class ListCatalog(command.Lister): data = auth_ref.service_catalog.catalog columns = ('Name', 'Type', 'Endpoints') - return (columns, - (utils.get_dict_properties( - s, columns, + return ( + columns, + ( + utils.get_dict_properties( + s, + columns, formatters={ 'Endpoints': EndpointsColumn, }, - ) for s in data)) + ) + for s in data + ), + ) class ShowCatalog(command.ShowOne): @@ -74,7 +79,6 @@ class ShowCatalog(command.ShowOne): return parser def take_action(self, parsed_args): - # Trigger auth if it has not happened yet auth_ref = self.app.client_manager.auth_ref if not auth_ref: @@ -84,8 +88,10 @@ class ShowCatalog(command.ShowOne): data = None for service in auth_ref.service_catalog.catalog: - if (service.get('name') == parsed_args.service or - service.get('type') == parsed_args.service): + if ( + service.get('name') == parsed_args.service + or service.get('type') == parsed_args.service + ): data = dict(service) data['endpoints'] = EndpointsColumn(data['endpoints']) if 'links' in data: diff --git a/openstackclient/identity/v3/consumer.py b/openstackclient/identity/v3/consumer.py index 2f925aba..c40c9886 100644 --- a/openstackclient/identity/v3/consumer.py +++ b/openstackclient/identity/v3/consumer.py @@ -67,17 +67,24 @@ class DeleteConsumer(command.Command): for i in parsed_args.consumer: try: consumer = utils.find_resource( - identity_client.oauth1.consumers, i) + identity_client.oauth1.consumers, i + ) identity_client.oauth1.consumers.delete(consumer.id) except Exception as e: result += 1 - LOG.error(_("Failed to delete consumer with name or " - "ID '%(consumer)s': %(e)s"), {'consumer': i, 'e': e}) + LOG.error( + _( + "Failed to delete consumer with name or " + "ID '%(consumer)s': %(e)s" + ), + {'consumer': i, 'e': e}, + ) if result > 0: total = len(parsed_args.consumer) - msg = (_("%(result)s of %(total)s consumers failed " - "to delete.") % {'result': result, 'total': total}) + msg = _( + "%(result)s of %(total)s consumers failed " "to delete." + ) % {'result': result, 'total': total} raise exceptions.CommandError(msg) @@ -87,11 +94,17 @@ class ListConsumer(command.Lister): def take_action(self, parsed_args): columns = ('ID', 'Description') data = self.app.client_manager.identity.oauth1.consumers.list() - return (columns, - (utils.get_item_properties( - s, columns, + return ( + columns, + ( + utils.get_item_properties( + s, + columns, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) class SetConsumer(command.Command): @@ -114,13 +127,15 @@ class SetConsumer(command.Command): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity consumer = utils.find_resource( - identity_client.oauth1.consumers, parsed_args.consumer) + identity_client.oauth1.consumers, parsed_args.consumer + ) kwargs = {} if parsed_args.description: kwargs['description'] = parsed_args.description consumer = identity_client.oauth1.consumers.update( - consumer.id, **kwargs) + consumer.id, **kwargs + ) class ShowConsumer(command.ShowOne): @@ -138,7 +153,8 @@ class ShowConsumer(command.ShowOne): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity consumer = utils.find_resource( - identity_client.oauth1.consumers, parsed_args.consumer) + identity_client.oauth1.consumers, parsed_args.consumer + ) consumer._info.pop('links', None) return zip(*sorted(consumer._info.items())) diff --git a/openstackclient/identity/v3/credential.py b/openstackclient/identity/v3/credential.py index bf48df83..80b65bef 100644 --- a/openstackclient/identity/v3/credential.py +++ b/openstackclient/identity/v3/credential.py @@ -52,25 +52,30 @@ class CreateCredential(command.ShowOne): parser.add_argument( '--project', metavar='<project>', - help=_('Project which limits the scope of ' - 'the credential (name or ID)'), + help=_( + 'Project which limits the scope of ' + 'the credential (name or ID)' + ), ) return parser def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - user_id = utils.find_resource(identity_client.users, - parsed_args.user).id + user_id = utils.find_resource( + identity_client.users, parsed_args.user + ).id if parsed_args.project: - project = utils.find_resource(identity_client.projects, - parsed_args.project).id + project = utils.find_resource( + identity_client.projects, parsed_args.project + ).id else: project = None credential = identity_client.credentials.create( user=user_id, type=parsed_args.type, blob=parsed_args.data, - project=project) + project=project, + ) credential._info.pop('links') return zip(*sorted(credential._info.items())) @@ -97,14 +102,19 @@ class DeleteCredential(command.Command): identity_client.credentials.delete(i) except Exception as e: result += 1 - LOG.error(_("Failed to delete credentials with " - "ID '%(credential)s': %(e)s"), - {'credential': i, 'e': e}) + LOG.error( + _( + "Failed to delete credentials with " + "ID '%(credential)s': %(e)s" + ), + {'credential': i, 'e': e}, + ) if result > 0: total = len(parsed_args.credential) - msg = (_("%(result)s of %(total)s credential failed " - "to delete.") % {'result': result, 'total': total}) + msg = _( + "%(result)s of %(total)s credential failed " "to delete." + ) % {'result': result, 'total': total} raise exceptions.CommandError(msg) @@ -144,11 +154,17 @@ class ListCredential(command.Lister): columns = ('ID', 'Type', 'User ID', 'Blob', 'Project ID') column_headers = ('ID', 'Type', 'User ID', 'Data', 'Project ID') data = self.app.client_manager.identity.credentials.list(**kwargs) - return (column_headers, - (utils.get_item_properties( - s, columns, + return ( + column_headers, + ( + utils.get_item_properties( + s, + columns, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) class SetCredential(command.Command): @@ -182,28 +198,34 @@ class SetCredential(command.Command): parser.add_argument( '--project', metavar='<project>', - help=_('Project which limits the scope of ' - 'the credential (name or ID)'), + help=_( + 'Project which limits the scope of ' + 'the credential (name or ID)' + ), ) return parser def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - user_id = utils.find_resource(identity_client.users, - parsed_args.user).id + user_id = utils.find_resource( + identity_client.users, parsed_args.user + ).id if parsed_args.project: - project = utils.find_resource(identity_client.projects, - parsed_args.project).id + project = utils.find_resource( + identity_client.projects, parsed_args.project + ).id else: project = None - identity_client.credentials.update(parsed_args.credential, - user=user_id, - type=parsed_args.type, - blob=parsed_args.data, - project=project) + identity_client.credentials.update( + parsed_args.credential, + user=user_id, + type=parsed_args.type, + blob=parsed_args.data, + project=project, + ) class ShowCredential(command.ShowOne): @@ -220,8 +242,9 @@ class ShowCredential(command.ShowOne): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - credential = utils.find_resource(identity_client.credentials, - parsed_args.credential) + credential = utils.find_resource( + identity_client.credentials, parsed_args.credential + ) credential._info.pop('links') return zip(*sorted(credential._info.items())) diff --git a/openstackclient/identity/v3/domain.py b/openstackclient/identity/v3/domain.py index e0bd1020..1fcf245c 100644 --- a/openstackclient/identity/v3/domain.py +++ b/openstackclient/identity/v3/domain.py @@ -81,8 +81,9 @@ class CreateDomain(command.ShowOne): ) except ks_exc.Conflict: if parsed_args.or_show: - domain = utils.find_resource(identity_client.domains, - parsed_args.name) + domain = utils.find_resource( + identity_client.domains, parsed_args.name + ) LOG.info(_('Returning existing domain %s'), domain.name) else: raise @@ -113,13 +114,20 @@ class DeleteDomain(command.Command): identity_client.domains.delete(domain.id) except Exception as e: result += 1 - LOG.error(_("Failed to delete domain with name or " - "ID '%(domain)s': %(e)s"), {'domain': i, 'e': e}) + LOG.error( + _( + "Failed to delete domain with name or " + "ID '%(domain)s': %(e)s" + ), + {'domain': i, 'e': e}, + ) if result > 0: total = len(parsed_args.domain) - msg = (_("%(result)s of %(total)s domains failed " - "to delete.") % {'result': result, 'total': total}) + msg = _("%(result)s of %(total)s domains failed " "to delete.") % { + 'result': result, + 'total': total, + } raise exceptions.CommandError(msg) @@ -150,11 +158,17 @@ class ListDomain(command.Lister): columns = ('ID', 'Name', 'Enabled', 'Description') data = self.app.client_manager.identity.domains.list(**kwargs) - return (columns, - (utils.get_item_properties( - s, columns, + return ( + columns, + ( + utils.get_item_properties( + s, + columns, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) class SetDomain(command.Command): @@ -193,8 +207,9 @@ class SetDomain(command.Command): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - domain = utils.find_resource(identity_client.domains, - parsed_args.domain) + domain = utils.find_resource( + identity_client.domains, parsed_args.domain + ) kwargs = {} if parsed_args.name: kwargs['name'] = parsed_args.name @@ -228,11 +243,11 @@ class ShowDomain(command.ShowOne): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - domain_str = common._get_token_resource(identity_client, 'domain', - parsed_args.domain) + domain_str = common._get_token_resource( + identity_client, 'domain', parsed_args.domain + ) - domain = utils.find_resource(identity_client.domains, - domain_str) + domain = utils.find_resource(identity_client.domains, domain_str) domain._info.pop('links') return zip(*sorted(domain._info.items())) diff --git a/openstackclient/identity/v3/ec2creds.py b/openstackclient/identity/v3/ec2creds.py index 921b9168..49bedc74 100644 --- a/openstackclient/identity/v3/ec2creds.py +++ b/openstackclient/identity/v3/ec2creds.py @@ -36,17 +36,20 @@ def _determine_ec2_user(parsed_args, client_manager): user_domain = None if parsed_args.user_domain: - user_domain = common.find_domain(client_manager.identity, - parsed_args.user_domain) + user_domain = common.find_domain( + client_manager.identity, parsed_args.user_domain + ) if parsed_args.user: if user_domain is not None: - user = utils.find_resource(client_manager.identity.users, - parsed_args.user, - domain_id=user_domain.id).id - else: user = utils.find_resource( client_manager.identity.users, - parsed_args.user).id + parsed_args.user, + domain_id=user_domain.id, + ).id + else: + user = utils.find_resource( + client_manager.identity.users, parsed_args.user + ).id else: # Get the user from the current auth user = client_manager.auth_ref.user_id @@ -61,14 +64,18 @@ class CreateEC2Creds(command.ShowOne): parser.add_argument( '--project', metavar='<project>', - help=_('Create credentials in project ' - '(name or ID; default: current authenticated project)'), + help=_( + 'Create credentials in project ' + '(name or ID; default: current authenticated project)' + ), ) parser.add_argument( '--user', metavar='<user>', - help=_('Create credentials for user ' - '(name or ID; default: current authenticated user)'), + help=_( + 'Create credentials for user ' + '(name or ID; default: current authenticated user)' + ), ) common.add_user_domain_option_to_parser(parser) common.add_project_domain_option_to_parser(parser) @@ -81,18 +88,21 @@ class CreateEC2Creds(command.ShowOne): project_domain = None if parsed_args.project_domain: - project_domain = common.find_domain(identity_client, - parsed_args.project_domain) + project_domain = common.find_domain( + identity_client, parsed_args.project_domain + ) if parsed_args.project: if project_domain is not None: - project = utils.find_resource(identity_client.projects, - parsed_args.project, - domain_id=project_domain.id).id - else: project = utils.find_resource( identity_client.projects, - parsed_args.project).id + parsed_args.project, + domain_id=project_domain.id, + ).id + else: + project = utils.find_resource( + identity_client.projects, parsed_args.project + ).id else: # Get the project from the current auth project = self.app.client_manager.auth_ref.project_id @@ -103,9 +113,7 @@ class CreateEC2Creds(command.ShowOne): info.update(creds._info) if 'tenant_id' in info: - info.update( - {'project_id': info.pop('tenant_id')} - ) + info.update({'project_id': info.pop('tenant_id')}) return zip(*sorted(info.items())) @@ -138,14 +146,19 @@ class DeleteEC2Creds(command.Command): client_manager.identity.ec2.delete(user, i) except Exception as e: result += 1 - LOG.error(_("Failed to delete EC2 credentials with " - "access key '%(access_key)s': %(e)s"), - {'access_key': i, 'e': e}) + LOG.error( + _( + "Failed to delete EC2 credentials with " + "access key '%(access_key)s': %(e)s" + ), + {'access_key': i, 'e': e}, + ) if result > 0: total = len(parsed_args.access_key) - msg = (_("%(result)s of %(total)s EC2 keys failed " - "to delete.") % {'result': result, 'total': total}) + msg = _( + "%(result)s of %(total)s EC2 keys failed " "to delete." + ) % {'result': result, 'total': total} raise exceptions.CommandError(msg) @@ -170,11 +183,17 @@ class ListEC2Creds(command.Lister): column_headers = ('Access', 'Secret', 'Project ID', 'User ID') data = client_manager.identity.ec2.list(user) - return (column_headers, - (utils.get_item_properties( - s, columns, + return ( + column_headers, + ( + utils.get_item_properties( + s, + columns, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) class ShowEC2Creds(command.ShowOne): @@ -204,8 +223,6 @@ class ShowEC2Creds(command.ShowOne): info.update(creds._info) if 'tenant_id' in info: - info.update( - {'project_id': info.pop('tenant_id')} - ) + info.update({'project_id': info.pop('tenant_id')}) return zip(*sorted(info.items())) diff --git a/openstackclient/identity/v3/endpoint.py b/openstackclient/identity/v3/endpoint.py index a3bd2683..7d954ce1 100644 --- a/openstackclient/identity/v3/endpoint.py +++ b/openstackclient/identity/v3/endpoint.py @@ -39,19 +39,20 @@ class AddProjectToEndpoint(command.Command): _description = _("Associate a project to an endpoint") def get_parser(self, prog_name): - parser = super( - AddProjectToEndpoint, self).get_parser(prog_name) + parser = super(AddProjectToEndpoint, self).get_parser(prog_name) parser.add_argument( 'endpoint', metavar='<endpoint>', - help=_('Endpoint to associate with ' - 'specified project (name or ID)'), + help=_( + 'Endpoint to associate with ' 'specified project (name or ID)' + ), ) parser.add_argument( 'project', metavar='<project>', - help=_('Project to associate with ' - 'specified endpoint name or ID)'), + help=_( + 'Project to associate with ' 'specified endpoint name or ID)' + ), ) common.add_project_domain_option_to_parser(parser) return parser @@ -59,16 +60,15 @@ class AddProjectToEndpoint(command.Command): def take_action(self, parsed_args): client = self.app.client_manager.identity - endpoint = utils.find_resource(client.endpoints, - parsed_args.endpoint) + endpoint = utils.find_resource(client.endpoints, parsed_args.endpoint) - project = common.find_project(client, - parsed_args.project, - parsed_args.project_domain) + project = common.find_project( + client, parsed_args.project, parsed_args.project_domain + ) client.endpoint_filter.add_endpoint_to_project( - project=project.id, - endpoint=endpoint.id) + project=project.id, endpoint=endpoint.id + ) class CreateEndpoint(command.ShowOne): @@ -122,7 +122,7 @@ class CreateEndpoint(command.ShowOne): url=parsed_args.url, interface=parsed_args.interface, region=parsed_args.region, - enabled=parsed_args.enabled + enabled=parsed_args.enabled, ) info = {} @@ -152,17 +152,24 @@ class DeleteEndpoint(command.Command): for i in parsed_args.endpoint: try: endpoint_id = utils.find_resource( - identity_client.endpoints, i).id + identity_client.endpoints, i + ).id identity_client.endpoints.delete(endpoint_id) except Exception as e: result += 1 - LOG.error(_("Failed to delete endpoint with " - "ID '%(endpoint)s': %(e)s"), {'endpoint': i, 'e': e}) + LOG.error( + _( + "Failed to delete endpoint with " + "ID '%(endpoint)s': %(e)s" + ), + {'endpoint': i, 'e': e}, + ) if result > 0: total = len(parsed_args.endpoint) - msg = (_("%(result)s of %(total)s endpoints failed " - "to delete.") % {'result': result, 'total': total}) + msg = _( + "%(result)s of %(total)s endpoints failed " "to delete." + ) % {'result': result, 'total': total} raise exceptions.CommandError(msg) @@ -206,27 +213,37 @@ class ListEndpoint(command.Lister): endpoint = None if parsed_args.endpoint: - endpoint = utils.find_resource(identity_client.endpoints, - parsed_args.endpoint) + endpoint = utils.find_resource( + identity_client.endpoints, parsed_args.endpoint + ) project = None if parsed_args.project: - project = common.find_project(identity_client, - parsed_args.project, - parsed_args.project_domain) + project = common.find_project( + identity_client, + parsed_args.project, + parsed_args.project_domain, + ) if endpoint: columns = ('ID', 'Name') - data = ( - identity_client.endpoint_filter - .list_projects_for_endpoint(endpoint=endpoint.id) + data = identity_client.endpoint_filter.list_projects_for_endpoint( + endpoint=endpoint.id ) else: - columns = ('ID', 'Region', 'Service Name', 'Service Type', - 'Enabled', 'Interface', 'URL') + columns = ( + 'ID', + 'Region', + 'Service Name', + 'Service Type', + 'Enabled', + 'Interface', + 'URL', + ) kwargs = {} if parsed_args.service: - service = common.find_service(identity_client, - parsed_args.service) + service = common.find_service( + identity_client, parsed_args.service + ) kwargs['service'] = service.id if parsed_args.interface: kwargs['interface'] = parsed_args.interface @@ -235,8 +252,9 @@ class ListEndpoint(command.Lister): if project: data = ( - identity_client.endpoint_filter - .list_endpoints_for_project(project=project.id) + identity_client.endpoint_filter.list_endpoints_for_project( + project=project.id + ) ) else: data = identity_client.endpoints.list(**kwargs) @@ -244,35 +262,43 @@ class ListEndpoint(command.Lister): service_list = identity_client.services.list() for ep in data: - service = common.find_service_in_list(service_list, - ep.service_id) + service = common.find_service_in_list( + service_list, ep.service_id + ) ep.service_name = get_service_name(service) ep.service_type = service.type - return (columns, - (utils.get_item_properties( - s, columns, + return ( + columns, + ( + utils.get_item_properties( + s, + columns, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) class RemoveProjectFromEndpoint(command.Command): _description = _("Dissociate a project from an endpoint") def get_parser(self, prog_name): - parser = super( - RemoveProjectFromEndpoint, self).get_parser(prog_name) + parser = super(RemoveProjectFromEndpoint, self).get_parser(prog_name) parser.add_argument( 'endpoint', metavar='<endpoint>', - help=_('Endpoint to dissociate from ' - 'specified project (name or ID)'), + help=_( + 'Endpoint to dissociate from ' 'specified project (name or ID)' + ), ) parser.add_argument( 'project', metavar='<project>', - help=_('Project to dissociate from ' - 'specified endpoint name or ID)'), + help=_( + 'Project to dissociate from ' 'specified endpoint name or ID)' + ), ) common.add_project_domain_option_to_parser(parser) return parser @@ -280,16 +306,15 @@ class RemoveProjectFromEndpoint(command.Command): def take_action(self, parsed_args): client = self.app.client_manager.identity - endpoint = utils.find_resource(client.endpoints, - parsed_args.endpoint) + endpoint = utils.find_resource(client.endpoints, parsed_args.endpoint) - project = common.find_project(client, - parsed_args.project, - parsed_args.project_domain) + project = common.find_project( + client, parsed_args.project, parsed_args.project_domain + ) client.endpoint_filter.delete_endpoint_from_project( - project=project.id, - endpoint=endpoint.id) + project=project.id, endpoint=endpoint.id + ) class SetEndpoint(command.Command): @@ -340,8 +365,9 @@ class SetEndpoint(command.Command): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - endpoint = utils.find_resource(identity_client.endpoints, - parsed_args.endpoint) + endpoint = utils.find_resource( + identity_client.endpoints, parsed_args.endpoint + ) service_id = None if parsed_args.service: @@ -359,7 +385,7 @@ class SetEndpoint(command.Command): url=parsed_args.url, interface=parsed_args.interface, region=parsed_args.region, - enabled=enabled + enabled=enabled, ) @@ -371,15 +397,18 @@ class ShowEndpoint(command.ShowOne): parser.add_argument( 'endpoint', metavar='<endpoint>', - help=_('Endpoint to display (endpoint ID, service ID,' - ' service name, service type)'), + help=_( + 'Endpoint to display (endpoint ID, service ID,' + ' service name, service type)' + ), ) return parser def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - endpoint = utils.find_resource(identity_client.endpoints, - parsed_args.endpoint) + endpoint = utils.find_resource( + identity_client.endpoints, parsed_args.endpoint + ) service = common.find_service(identity_client, endpoint.service_id) diff --git a/openstackclient/identity/v3/endpoint_group.py b/openstackclient/identity/v3/endpoint_group.py index 9bb026a9..1d3e5ddd 100644 --- a/openstackclient/identity/v3/endpoint_group.py +++ b/openstackclient/identity/v3/endpoint_group.py @@ -50,8 +50,10 @@ class _FiltersReader(object): try: rules = json.loads(blob) except ValueError as e: - msg = _("An error occurred when reading filters from file " - "%(path)s: %(error)s") % {"path": path, "error": e} + msg = _( + "An error occurred when reading filters from file " + "%(path)s: %(error)s" + ) % {"path": path, "error": e} raise exceptions.CommandError(msg) else: return rules @@ -61,8 +63,7 @@ class AddProjectToEndpointGroup(command.Command): _description = _("Add a project to an endpoint group") def get_parser(self, prog_name): - parser = super( - AddProjectToEndpointGroup, self).get_parser(prog_name) + parser = super(AddProjectToEndpointGroup, self).get_parser(prog_name) parser.add_argument( 'endpointgroup', metavar='<endpoint-group>', @@ -79,16 +80,17 @@ class AddProjectToEndpointGroup(command.Command): def take_action(self, parsed_args): client = self.app.client_manager.identity - endpointgroup = utils.find_resource(client.endpoint_groups, - parsed_args.endpointgroup) + endpointgroup = utils.find_resource( + client.endpoint_groups, parsed_args.endpointgroup + ) - project = common.find_project(client, - parsed_args.project, - parsed_args.project_domain) + project = common.find_project( + client, parsed_args.project, parsed_args.project_domain + ) client.endpoint_filter.add_endpoint_group_to_project( - endpoint_group=endpointgroup.id, - project=project.id) + endpoint_group=endpointgroup.id, project=project.id + ) class CreateEndpointGroup(command.ShowOne, _FiltersReader): @@ -122,7 +124,7 @@ class CreateEndpointGroup(command.ShowOne, _FiltersReader): endpoint_group = identity_client.endpoint_groups.create( name=parsed_args.name, filters=filters, - description=parsed_args.description + description=parsed_args.description, ) info = {} @@ -150,18 +152,24 @@ class DeleteEndpointGroup(command.Command): for i in parsed_args.endpointgroup: try: endpoint_id = utils.find_resource( - identity_client.endpoint_groups, i).id + identity_client.endpoint_groups, i + ).id identity_client.endpoint_groups.delete(endpoint_id) except Exception as e: result += 1 - LOG.error(_("Failed to delete endpoint group with " - "ID '%(endpointgroup)s': %(e)s"), - {'endpointgroup': i, 'e': e}) + LOG.error( + _( + "Failed to delete endpoint group with " + "ID '%(endpointgroup)s': %(e)s" + ), + {'endpointgroup': i, 'e': e}, + ) if result > 0: total = len(parsed_args.endpointgroup) - msg = (_("%(result)s of %(total)s endpointgroups failed " - "to delete.") % {'result': result, 'total': total}) + msg = _( + "%(result)s of %(total)s endpointgroups failed " "to delete." + ) % {'result': result, 'total': total} raise exceptions.CommandError(msg) @@ -193,40 +201,50 @@ class ListEndpointGroup(command.Lister): endpointgroup = None if parsed_args.endpointgroup: - endpointgroup = utils.find_resource(client.endpoint_groups, - parsed_args.endpointgroup) + endpointgroup = utils.find_resource( + client.endpoint_groups, parsed_args.endpointgroup + ) project = None if parsed_args.project: - project = common.find_project(client, - parsed_args.project, - parsed_args.domain) + project = common.find_project( + client, parsed_args.project, parsed_args.domain + ) if endpointgroup: # List projects associated to the endpoint group columns = ('ID', 'Name', 'Description') data = client.endpoint_filter.list_projects_for_endpoint_group( - endpoint_group=endpointgroup.id) + endpoint_group=endpointgroup.id + ) elif project: columns = ('ID', 'Name', 'Description') data = client.endpoint_filter.list_endpoint_groups_for_project( - project=project.id) + project=project.id + ) else: columns = ('ID', 'Name', 'Description') data = client.endpoint_groups.list() - return (columns, - (utils.get_item_properties( - s, columns, + return ( + columns, + ( + utils.get_item_properties( + s, + columns, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) class RemoveProjectFromEndpointGroup(command.Command): _description = _("Remove project from endpoint group") def get_parser(self, prog_name): - parser = super( - RemoveProjectFromEndpointGroup, self).get_parser(prog_name) + parser = super(RemoveProjectFromEndpointGroup, self).get_parser( + prog_name + ) parser.add_argument( 'endpointgroup', metavar='<endpoint-group>', @@ -243,16 +261,17 @@ class RemoveProjectFromEndpointGroup(command.Command): def take_action(self, parsed_args): client = self.app.client_manager.identity - endpointgroup = utils.find_resource(client.endpoint_groups, - parsed_args.endpointgroup) + endpointgroup = utils.find_resource( + client.endpoint_groups, parsed_args.endpointgroup + ) - project = common.find_project(client, - parsed_args.project, - parsed_args.project_domain) + project = common.find_project( + client, parsed_args.project, parsed_args.project_domain + ) client.endpoint_filter.delete_endpoint_group_from_project( - endpoint_group=endpointgroup.id, - project=project.id) + endpoint_group=endpointgroup.id, project=project.id + ) class SetEndpointGroup(command.Command, _FiltersReader): @@ -285,8 +304,9 @@ class SetEndpointGroup(command.Command, _FiltersReader): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - endpointgroup = utils.find_resource(identity_client.endpoint_groups, - parsed_args.endpointgroup) + endpointgroup = utils.find_resource( + identity_client.endpoint_groups, parsed_args.endpointgroup + ) filters = None if parsed_args.filters: @@ -296,7 +316,7 @@ class SetEndpointGroup(command.Command, _FiltersReader): endpointgroup.id, name=parsed_args.name, filters=filters, - description=parsed_args.description + description=parsed_args.description, ) @@ -314,8 +334,9 @@ class ShowEndpointGroup(command.ShowOne): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - endpoint_group = utils.find_resource(identity_client.endpoint_groups, - parsed_args.endpointgroup) + endpoint_group = utils.find_resource( + identity_client.endpoint_groups, parsed_args.endpointgroup + ) info = {} endpoint_group._info.pop('links') diff --git a/openstackclient/identity/v3/federation_protocol.py b/openstackclient/identity/v3/federation_protocol.py index 0929469e..ae62390d 100644 --- a/openstackclient/identity/v3/federation_protocol.py +++ b/openstackclient/identity/v3/federation_protocol.py @@ -34,15 +34,19 @@ class CreateProtocol(command.ShowOne): parser.add_argument( 'federation_protocol', metavar='<name>', - help=_('New federation protocol name (must be unique ' - 'per identity provider)'), + help=_( + 'New federation protocol name (must be unique ' + 'per identity provider)' + ), ) parser.add_argument( '--identity-provider', metavar='<identity-provider>', required=True, - help=_('Identity provider that will support the new federation ' - ' protocol (name or ID) (required)'), + help=_( + 'Identity provider that will support the new federation ' + ' protocol (name or ID) (required)' + ), ) parser.add_argument( '--mapping', @@ -58,7 +62,8 @@ class CreateProtocol(command.ShowOne): protocol = identity_client.federation.protocols.create( protocol_id=parsed_args.federation_protocol, identity_provider=parsed_args.identity_provider, - mapping=parsed_args.mapping) + mapping=parsed_args.mapping, + ) info = dict(protocol._info) # NOTE(marek-denis): Identity provider is not included in a response # from Keystone, however it should be listed to the user. Add it @@ -85,8 +90,10 @@ class DeleteProtocol(command.Command): '--identity-provider', metavar='<identity-provider>', required=True, - help=_('Identity provider that supports <federation-protocol> ' - '(name or ID) (required)'), + help=_( + 'Identity provider that supports <federation-protocol> ' + '(name or ID) (required)' + ), ) return parser @@ -97,17 +104,24 @@ class DeleteProtocol(command.Command): for i in parsed_args.federation_protocol: try: identity_client.federation.protocols.delete( - parsed_args.identity_provider, i) + parsed_args.identity_provider, i + ) except Exception as e: result += 1 - LOG.error(_("Failed to delete federation protocol " - "with name or ID '%(protocol)s': %(e)s"), - {'protocol': i, 'e': e}) + LOG.error( + _( + "Failed to delete federation protocol " + "with name or ID '%(protocol)s': %(e)s" + ), + {'protocol': i, 'e': e}, + ) if result > 0: total = len(parsed_args.federation_protocol) - msg = (_("%(result)s of %(total)s federation protocols failed" - " to delete.") % {'result': result, 'total': total}) + msg = _( + "%(result)s of %(total)s federation protocols failed" + " to delete." + ) % {'result': result, 'total': total} raise exceptions.CommandError(msg) @@ -129,11 +143,14 @@ class ListProtocols(command.Lister): identity_client = self.app.client_manager.identity protocols = identity_client.federation.protocols.list( - parsed_args.identity_provider) + parsed_args.identity_provider + ) columns = ('id', 'mapping') response_attributes = ('id', 'mapping_id') - items = [utils.get_item_properties(s, response_attributes) - for s in protocols] + items = [ + utils.get_item_properties(s, response_attributes) + for s in protocols + ] return (columns, items) @@ -151,8 +168,10 @@ class SetProtocol(command.Command): '--identity-provider', metavar='<identity-provider>', required=True, - help=_('Identity provider that supports <federation-protocol> ' - '(name or ID) (required)'), + help=_( + 'Identity provider that supports <federation-protocol> ' + '(name or ID) (required)' + ), ) parser.add_argument( '--mapping', @@ -165,8 +184,10 @@ class SetProtocol(command.Command): identity_client = self.app.client_manager.identity protocol = identity_client.federation.protocols.update( - parsed_args.identity_provider, parsed_args.federation_protocol, - parsed_args.mapping) + parsed_args.identity_provider, + parsed_args.federation_protocol, + parsed_args.mapping, + ) info = dict(protocol._info) # NOTE(marek-denis): Identity provider is not included in a response # from Keystone, however it should be listed to the user. Add it @@ -191,8 +212,10 @@ class ShowProtocol(command.ShowOne): '--identity-provider', metavar='<identity-provider>', required=True, - help=_('Identity provider that supports <federation-protocol> ' - '(name or ID) (required)'), + help=_( + 'Identity provider that supports <federation-protocol> ' + '(name or ID) (required)' + ), ) return parser @@ -200,7 +223,8 @@ class ShowProtocol(command.ShowOne): identity_client = self.app.client_manager.identity protocol = identity_client.federation.protocols.get( - parsed_args.identity_provider, parsed_args.federation_protocol) + parsed_args.identity_provider, parsed_args.federation_protocol + ) info = dict(protocol._info) info['mapping'] = info.pop('mapping_id') info.pop('links', None) diff --git a/openstackclient/identity/v3/group.py b/openstackclient/identity/v3/group.py index 46c3142c..65eb261a 100644 --- a/openstackclient/identity/v3/group.py +++ b/openstackclient/identity/v3/group.py @@ -43,8 +43,10 @@ class AddUserToGroup(command.Command): 'user', metavar='<user>', nargs='+', - help=_('User(s) to add to <group> (name or ID) ' - '(repeat option to add multiple users)'), + help=_( + 'User(s) to add to <group> (name or ID) ' + '(repeat option to add multiple users)' + ), ) common.add_group_domain_option_to_parser(parser) common.add_user_domain_option_to_parser(parser) @@ -53,16 +55,16 @@ class AddUserToGroup(command.Command): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - group_id = common.find_group(identity_client, - parsed_args.group, - parsed_args.group_domain).id + group_id = common.find_group( + identity_client, parsed_args.group, parsed_args.group_domain + ).id result = 0 for i in parsed_args.user: try: - user_id = common.find_user(identity_client, - i, - parsed_args.user_domain).id + user_id = common.find_user( + identity_client, i, parsed_args.user_domain + ).id identity_client.users.add_to_group(user_id, group_id) except Exception as e: result += 1 @@ -74,8 +76,12 @@ class AddUserToGroup(command.Command): LOG.error(msg) if result > 0: total = len(parsed_args.user) - msg = (_("%(result)s of %(total)s users not added to group " - "%(group)s.")) % { + msg = ( + _( + "%(result)s of %(total)s users not added to group " + "%(group)s." + ) + ) % { 'result': result, 'total': total, 'group': parsed_args.group, @@ -105,12 +111,12 @@ class CheckUserInGroup(command.Command): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - user_id = common.find_user(identity_client, - parsed_args.user, - parsed_args.user_domain).id - group_id = common.find_group(identity_client, - parsed_args.group, - parsed_args.group_domain).id + user_id = common.find_user( + identity_client, parsed_args.user, parsed_args.user_domain + ).id + group_id = common.find_group( + identity_client, parsed_args.group, parsed_args.group_domain + ).id try: identity_client.users.check_in_group(user_id, group_id) @@ -163,19 +169,19 @@ class CreateGroup(command.ShowOne): domain = None if parsed_args.domain: - domain = common.find_domain(identity_client, - parsed_args.domain).id + domain = common.find_domain(identity_client, parsed_args.domain).id try: group = identity_client.groups.create( name=parsed_args.name, domain=domain, - description=parsed_args.description) + description=parsed_args.description, + ) except ks_exc.Conflict: if parsed_args.or_show: - group = utils.find_resource(identity_client.groups, - parsed_args.name, - domain_id=domain) + group = utils.find_resource( + identity_client.groups, parsed_args.name, domain_id=domain + ) LOG.info(_('Returning existing group %s'), group.name) else: raise @@ -208,20 +214,26 @@ class DeleteGroup(command.Command): errors = 0 for group in parsed_args.groups: try: - group_obj = common.find_group(identity_client, - group, - parsed_args.domain) + group_obj = common.find_group( + identity_client, group, parsed_args.domain + ) identity_client.groups.delete(group_obj.id) except Exception as e: errors += 1 - LOG.error(_("Failed to delete group with " - "name or ID '%(group)s': %(e)s"), - {'group': group, 'e': e}) + LOG.error( + _( + "Failed to delete group with " + "name or ID '%(group)s': %(e)s" + ), + {'group': group, 'e': e}, + ) if errors > 0: total = len(parsed_args.groups) - msg = (_("%(errors)s of %(total)s groups failed " - "to delete.") % {'errors': errors, 'total': total}) + msg = _("%(errors)s of %(total)s groups failed " "to delete.") % { + 'errors': errors, + 'total': total, + } raise exceptions.CommandError(msg) @@ -254,8 +266,7 @@ class ListGroup(command.Lister): domain = None if parsed_args.domain: - domain = common.find_domain(identity_client, - parsed_args.domain).id + domain = common.find_domain(identity_client, parsed_args.domain).id if parsed_args.user: user = common.find_user( @@ -278,10 +289,14 @@ class ListGroup(command.Lister): return ( columns, - (utils.get_item_properties( - s, columns, - formatters={}, - ) for s in data) + ( + utils.get_item_properties( + s, + columns, + formatters={}, + ) + for s in data + ), ) @@ -299,8 +314,10 @@ class RemoveUserFromGroup(command.Command): 'user', metavar='<user>', nargs='+', - help=_('User(s) to remove from <group> (name or ID) ' - '(repeat option to remove multiple users)'), + help=_( + 'User(s) to remove from <group> (name or ID) ' + '(repeat option to remove multiple users)' + ), ) common.add_group_domain_option_to_parser(parser) common.add_user_domain_option_to_parser(parser) @@ -309,16 +326,16 @@ class RemoveUserFromGroup(command.Command): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - group_id = common.find_group(identity_client, - parsed_args.group, - parsed_args.group_domain).id + group_id = common.find_group( + identity_client, parsed_args.group, parsed_args.group_domain + ).id result = 0 for i in parsed_args.user: try: - user_id = common.find_user(identity_client, - i, - parsed_args.user_domain).id + user_id = common.find_user( + identity_client, i, parsed_args.user_domain + ).id identity_client.users.remove_from_group(user_id, group_id) except Exception as e: result += 1 @@ -330,8 +347,12 @@ class RemoveUserFromGroup(command.Command): LOG.error(msg) if result > 0: total = len(parsed_args.user) - msg = (_("%(result)s of %(total)s users not removed from group " - "%(group)s.")) % { + msg = ( + _( + "%(result)s of %(total)s users not removed from group " + "%(group)s." + ) + ) % { 'result': result, 'total': total, 'group': parsed_args.group, @@ -368,8 +389,9 @@ class SetGroup(command.Command): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - group = common.find_group(identity_client, parsed_args.group, - parsed_args.domain) + group = common.find_group( + identity_client, parsed_args.group, parsed_args.domain + ) kwargs = {} if parsed_args.name: kwargs['name'] = parsed_args.name @@ -399,9 +421,11 @@ class ShowGroup(command.ShowOne): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - group = common.find_group(identity_client, - parsed_args.group, - domain_name_or_id=parsed_args.domain) + group = common.find_group( + identity_client, + parsed_args.group, + domain_name_or_id=parsed_args.domain, + ) group._info.pop('links') return zip(*sorted(group._info.items())) diff --git a/openstackclient/identity/v3/identity_provider.py b/openstackclient/identity/v3/identity_provider.py index 19a62144..230f8198 100644 --- a/openstackclient/identity/v3/identity_provider.py +++ b/openstackclient/identity/v3/identity_provider.py @@ -42,14 +42,18 @@ class CreateIdentityProvider(command.ShowOne): '--remote-id', metavar='<remote-id>', action='append', - help=_('Remote IDs to associate with the Identity Provider ' - '(repeat option to provide multiple values)'), + help=_( + 'Remote IDs to associate with the Identity Provider ' + '(repeat option to provide multiple values)' + ), ) identity_remote_id_provider.add_argument( '--remote-id-file', metavar='<file-name>', - help=_('Name of a file that contains many remote IDs to associate ' - 'with the identity provider, one per line'), + help=_( + 'Name of a file that contains many remote IDs to associate ' + 'with the identity provider, one per line' + ), ) parser.add_argument( '--description', @@ -59,19 +63,23 @@ class CreateIdentityProvider(command.ShowOne): parser.add_argument( '--domain', metavar='<domain>', - help=_('Domain to associate with the identity provider. If not ' - 'specified, a domain will be created automatically. ' - '(Name or ID)'), + help=_( + 'Domain to associate with the identity provider. If not ' + 'specified, a domain will be created automatically. ' + '(Name or ID)' + ), ) parser.add_argument( '--authorization-ttl', metavar='<authorization-ttl>', type=int, - help=_('Time to keep the role assignments for users ' - 'authenticating via this identity provider. ' - 'When not provided, global default configured in the ' - 'Identity service will be used. ' - 'Available since Identity API version 3.14 (Ussuri).'), + help=_( + 'Time to keep the role assignments for users ' + 'authenticating via this identity provider. ' + 'When not provided, global default configured in the ' + 'Identity service will be used. ' + 'Available since Identity API version 3.14 (Ussuri).' + ), ) enable_identity_provider = parser.add_mutually_exclusive_group() enable_identity_provider.add_argument( @@ -93,25 +101,29 @@ class CreateIdentityProvider(command.ShowOne): identity_client = self.app.client_manager.identity if parsed_args.remote_id_file: file_content = utils.read_blob_file_contents( - parsed_args.remote_id_file) + parsed_args.remote_id_file + ) remote_ids = file_content.splitlines() remote_ids = list(map(str.strip, remote_ids)) else: - remote_ids = (parsed_args.remote_id - if parsed_args.remote_id else None) + remote_ids = ( + parsed_args.remote_id if parsed_args.remote_id else None + ) domain_id = None if parsed_args.domain: - domain_id = common.find_domain(identity_client, - parsed_args.domain).id + domain_id = common.find_domain( + identity_client, parsed_args.domain + ).id # TODO(pas-ha) actually check for 3.14 microversion kwargs = {} auth_ttl = parsed_args.authorization_ttl if auth_ttl is not None: if auth_ttl < 0: - msg = (_("%(param)s must be positive integer or zero." - ) % {"param": "authorization-ttl"}) + msg = _("%(param)s must be positive integer or zero.") % { + "param": "authorization-ttl" + } raise exceptions.CommandError(msg) kwargs['authorization_ttl'] = auth_ttl @@ -121,7 +133,8 @@ class CreateIdentityProvider(command.ShowOne): description=parsed_args.description, domain_id=domain_id, enabled=parsed_args.enabled, - **kwargs) + **kwargs + ) idp._info.pop('links', None) remote_ids = format_columns.ListColumn(idp._info.pop('remote_ids', [])) @@ -150,14 +163,20 @@ class DeleteIdentityProvider(command.Command): identity_client.federation.identity_providers.delete(i) except Exception as e: result += 1 - LOG.error(_("Failed to delete identity providers with " - "name or ID '%(provider)s': %(e)s"), - {'provider': i, 'e': e}) + LOG.error( + _( + "Failed to delete identity providers with " + "name or ID '%(provider)s': %(e)s" + ), + {'provider': i, 'e': e}, + ) if result > 0: total = len(parsed_args.identity_provider) - msg = (_("%(result)s of %(total)s identity providers failed" - " to delete.") % {'result': result, 'total': total}) + msg = _( + "%(result)s of %(total)s identity providers failed" + " to delete." + ) % {'result': result, 'total': total} raise exceptions.CommandError(msg) @@ -190,11 +209,17 @@ class ListIdentityProvider(command.Lister): kwargs['enabled'] = True data = identity_client.federation.identity_providers.list(**kwargs) - return (columns, - (utils.get_item_properties( - s, columns, + return ( + columns, + ( + utils.get_item_properties( + s, + columns, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) class SetIdentityProvider(command.Command): @@ -217,22 +242,28 @@ class SetIdentityProvider(command.Command): '--remote-id', metavar='<remote-id>', action='append', - help=_('Remote IDs to associate with the Identity Provider ' - '(repeat option to provide multiple values)'), + help=_( + 'Remote IDs to associate with the Identity Provider ' + '(repeat option to provide multiple values)' + ), ) identity_remote_id_provider.add_argument( '--remote-id-file', metavar='<file-name>', - help=_('Name of a file that contains many remote IDs to associate ' - 'with the identity provider, one per line'), + help=_( + 'Name of a file that contains many remote IDs to associate ' + 'with the identity provider, one per line' + ), ) parser.add_argument( '--authorization-ttl', metavar='<authorization-ttl>', type=int, - help=_('Time to keep the role assignments for users ' - 'authenticating via this identity provider. ' - 'Available since Identity API version 3.14 (Ussuri).'), + help=_( + 'Time to keep the role assignments for users ' + 'authenticating via this identity provider. ' + 'Available since Identity API version 3.14 (Ussuri).' + ), ) enable_identity_provider = parser.add_mutually_exclusive_group() enable_identity_provider.add_argument( @@ -253,7 +284,8 @@ class SetIdentityProvider(command.Command): # Always set remote_ids if either is passed in if parsed_args.remote_id_file: file_content = utils.read_blob_file_contents( - parsed_args.remote_id_file) + parsed_args.remote_id_file + ) remote_ids = file_content.splitlines() remote_ids = list(map(str.strip, remote_ids)) elif parsed_args.remote_id: @@ -279,14 +311,14 @@ class SetIdentityProvider(command.Command): auth_ttl = parsed_args.authorization_ttl if auth_ttl is not None: if auth_ttl < 0: - msg = (_("%(param)s must be positive integer or zero." - ) % {"param": "authorization-ttl"}) + msg = _("%(param)s must be positive integer or zero.") % { + "param": "authorization-ttl" + } raise exceptions.CommandError(msg) kwargs['authorization_ttl'] = auth_ttl federation_client.identity_providers.update( - parsed_args.identity_provider, - **kwargs + parsed_args.identity_provider, **kwargs ) @@ -307,7 +339,8 @@ class ShowIdentityProvider(command.ShowOne): idp = utils.find_resource( identity_client.federation.identity_providers, parsed_args.identity_provider, - id=parsed_args.identity_provider) + id=parsed_args.identity_provider, + ) idp._info.pop('links', None) remote_ids = format_columns.ListColumn(idp._info.pop('remote_ids', [])) diff --git a/openstackclient/identity/v3/implied_role.py b/openstackclient/identity/v3/implied_role.py index 054f3028..9d26ccd3 100644 --- a/openstackclient/identity/v3/implied_role.py +++ b/openstackclient/identity/v3/implied_role.py @@ -48,7 +48,6 @@ def _get_role_ids(identity_client, parsed_args): class CreateImpliedRole(command.ShowOne): - _description = _("Creates an association between prior and implied roles") def get_parser(self, prog_name): @@ -69,16 +68,16 @@ class CreateImpliedRole(command.ShowOne): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity (prior_role_id, implied_role_id) = _get_role_ids( - identity_client, parsed_args) + identity_client, parsed_args + ) response = identity_client.inference_rules.create( - prior_role_id, implied_role_id) + prior_role_id, implied_role_id + ) response._info.pop('links', None) - return zip(*sorted([(k, v['id']) - for k, v in response._info.items()])) + return zip(*sorted([(k, v['id']) for k, v in response._info.items()])) class DeleteImpliedRole(command.Command): - _description = _("Deletes an association between prior and implied roles") def get_parser(self, prog_name): @@ -99,16 +98,19 @@ class DeleteImpliedRole(command.Command): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity (prior_role_id, implied_role_id) = _get_role_ids( - identity_client, parsed_args) - identity_client.inference_rules.delete( - prior_role_id, implied_role_id) + identity_client, parsed_args + ) + identity_client.inference_rules.delete(prior_role_id, implied_role_id) class ListImpliedRole(command.Lister): - _description = _("List implied roles") - _COLUMNS = ['Prior Role ID', 'Prior Role Name', - 'Implied Role ID', 'Implied Role Name'] + _COLUMNS = [ + 'Prior Role ID', + 'Prior Role Name', + 'Implied Role ID', + 'Implied Role Name', + ] def get_parser(self, prog_name): parser = super(ListImpliedRole, self).get_parser(prog_name) @@ -118,10 +120,12 @@ class ListImpliedRole(command.Lister): def _list_implied(response): for rule in response: for implies in rule.implies: - yield (rule.prior_role['id'], - rule.prior_role['name'], - implies['id'], - implies['name']) + yield ( + rule.prior_role['id'], + rule.prior_role['name'], + implies['id'], + implies['name'], + ) identity_client = self.app.client_manager.identity response = identity_client.inference_rules.list_inference_roles() diff --git a/openstackclient/identity/v3/limit.py b/openstackclient/identity/v3/limit.py index b155cbd8..1610b68d 100644 --- a/openstackclient/identity/v3/limit.py +++ b/openstackclient/identity/v3/limit.py @@ -97,7 +97,7 @@ class CreateLimit(command.ShowOne): parsed_args.resource_name, parsed_args.resource_limit, description=parsed_args.description, - region=region + region=region, ) limit._info.pop('links', None) @@ -168,12 +168,17 @@ class ListLimit(command.Lister): service=service, resource_name=parsed_args.resource_name, region=region, - project=project + project=project, ) columns = ( - 'ID', 'Project ID', 'Service ID', 'Resource Name', - 'Resource Limit', 'Description', 'Region ID' + 'ID', + 'Project ID', + 'Service ID', + 'Resource Name', + 'Resource Limit', + 'Description', + 'Region ID', ) return ( columns, @@ -230,7 +235,7 @@ class SetLimit(command.ShowOne): limit = identity_client.limits.update( parsed_args.limit_id, description=parsed_args.description, - resource_limit=parsed_args.resource_limit + resource_limit=parsed_args.resource_limit, ) limit._info.pop('links', None) @@ -260,12 +265,15 @@ class DeleteLimit(command.Command): identity_client.limits.delete(limit_id) except Exception as e: errors += 1 - LOG.error(_("Failed to delete limit with ID " - "'%(id)s': %(e)s"), - {'id': limit_id, 'e': e}) + LOG.error( + _("Failed to delete limit with ID " "'%(id)s': %(e)s"), + {'id': limit_id, 'e': e}, + ) if errors > 0: total = len(parsed_args.limit_id) - msg = (_("%(errors)s of %(total)s limits failed to " - "delete.") % {'errors': errors, 'total': total}) + msg = _("%(errors)s of %(total)s limits failed to " "delete.") % { + 'errors': errors, + 'total': total, + } raise exceptions.CommandError(msg) diff --git a/openstackclient/identity/v3/mapping.py b/openstackclient/identity/v3/mapping.py index 7d40a2b7..0a5925de 100644 --- a/openstackclient/identity/v3/mapping.py +++ b/openstackclient/identity/v3/mapping.py @@ -73,8 +73,10 @@ class _RulesReader(object): try: rules = json.loads(blob) except ValueError as e: - msg = _("An error occurred when reading rules from file " - "%(path)s: %(error)s") % {"path": path, "error": e} + msg = _( + "An error occurred when reading rules from file " + "%(path)s: %(error)s" + ) % {"path": path, "error": e} raise exceptions.CommandError(msg) else: return rules @@ -92,7 +94,8 @@ class CreateMapping(command.ShowOne, _RulesReader): ) parser.add_argument( '--rules', - metavar='<filename>', required=True, + metavar='<filename>', + required=True, help=_('Filename that contains a set of mapping rules (required)'), ) return parser @@ -102,8 +105,8 @@ class CreateMapping(command.ShowOne, _RulesReader): rules = self._read_rules(parsed_args.rules) mapping = identity_client.federation.mappings.create( - mapping_id=parsed_args.mapping, - rules=rules) + mapping_id=parsed_args.mapping, rules=rules + ) mapping._info.pop('links', None) return zip(*sorted(mapping._info.items())) @@ -130,13 +133,19 @@ class DeleteMapping(command.Command): identity_client.federation.mappings.delete(i) except Exception as e: result += 1 - LOG.error(_("Failed to delete mapping with name or " - "ID '%(mapping)s': %(e)s"), {'mapping': i, 'e': e}) + LOG.error( + _( + "Failed to delete mapping with name or " + "ID '%(mapping)s': %(e)s" + ), + {'mapping': i, 'e': e}, + ) if result > 0: total = len(parsed_args.mapping) - msg = (_("%(result)s of %(total)s mappings failed " - "to delete.") % {'result': result, 'total': total}) + msg = _( + "%(result)s of %(total)s mappings failed " "to delete." + ) % {'result': result, 'total': total} raise exceptions.CommandError(msg) @@ -177,8 +186,8 @@ class SetMapping(command.Command, _RulesReader): rules = self._read_rules(parsed_args.rules) mapping = identity_client.federation.mappings.update( - mapping=parsed_args.mapping, - rules=rules) + mapping=parsed_args.mapping, rules=rules + ) mapping._info.pop('links', None) diff --git a/openstackclient/identity/v3/policy.py b/openstackclient/identity/v3/policy.py index 45674210..2504a467 100644 --- a/openstackclient/identity/v3/policy.py +++ b/openstackclient/identity/v3/policy.py @@ -36,8 +36,10 @@ class CreatePolicy(command.ShowOne): '--type', metavar='<type>', default="application/json", - help=_('New MIME type of the policy rules file ' - '(defaults to application/json)'), + help=_( + 'New MIME type of the policy rules file ' + '(defaults to application/json)' + ), ) parser.add_argument( 'rules', @@ -80,13 +82,20 @@ class DeletePolicy(command.Command): identity_client.policies.delete(i) except Exception as e: result += 1 - LOG.error(_("Failed to delete policy with name or " - "ID '%(policy)s': %(e)s"), {'policy': i, 'e': e}) + LOG.error( + _( + "Failed to delete policy with name or " + "ID '%(policy)s': %(e)s" + ), + {'policy': i, 'e': e}, + ) if result > 0: total = len(parsed_args.policy) - msg = (_("%(result)s of %(total)s policys failed " - "to delete.") % {'result': result, 'total': total}) + msg = _("%(result)s of %(total)s policys failed " "to delete.") % { + 'result': result, + 'total': total, + } raise exceptions.CommandError(msg) @@ -111,11 +120,17 @@ class ListPolicy(command.Lister): columns = ('ID', 'Type') column_headers = columns data = self.app.client_manager.identity.policies.list() - return (column_headers, - (utils.get_item_properties( - s, columns, + return ( + column_headers, + ( + utils.get_item_properties( + s, + columns, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) class SetPolicy(command.Command): @@ -170,8 +185,9 @@ class ShowPolicy(command.ShowOne): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - policy = utils.find_resource(identity_client.policies, - parsed_args.policy) + policy = utils.find_resource( + identity_client.policies, parsed_args.policy + ) policy._info.pop('links') policy._info.update({'rules': policy._info.pop('blob')}) diff --git a/openstackclient/identity/v3/project.py b/openstackclient/identity/v3/project.py index 5e8ce829..6ff264ae 100644 --- a/openstackclient/identity/v3/project.py +++ b/openstackclient/identity/v3/project.py @@ -70,8 +70,10 @@ class CreateProject(command.ShowOne): '--property', metavar='<key=value>', action=parseractions.KeyValueAction, - help=_('Add a property to <name> ' - '(repeat option to set multiple properties)'), + help=_( + 'Add a property to <name> ' + '(repeat option to set multiple properties)' + ), ) parser.add_argument( '--or-show', @@ -87,8 +89,7 @@ class CreateProject(command.ShowOne): domain = None if parsed_args.domain: - domain = common.find_domain(identity_client, - parsed_args.domain).id + domain = common.find_domain(identity_client, parsed_args.domain).id parent = None if parsed_args.parent: @@ -128,9 +129,11 @@ class CreateProject(command.ShowOne): ) except ks_exc.Conflict: if parsed_args.or_show: - project = utils.find_resource(identity_client.projects, - parsed_args.name, - domain_id=domain) + project = utils.find_resource( + identity_client.projects, + parsed_args.name, + domain_id=domain, + ) LOG.info(_('Returning existing project %s'), project.name) else: raise @@ -167,23 +170,29 @@ class DeleteProject(command.Command): for project in parsed_args.projects: try: if domain is not None: - project_obj = utils.find_resource(identity_client.projects, - project, - domain_id=domain.id) + project_obj = utils.find_resource( + identity_client.projects, project, domain_id=domain.id + ) else: - project_obj = utils.find_resource(identity_client.projects, - project) + project_obj = utils.find_resource( + identity_client.projects, project + ) identity_client.projects.delete(project_obj.id) except Exception as e: errors += 1 - LOG.error(_("Failed to delete project with " - "name or ID '%(project)s': %(e)s"), - {'project': project, 'e': e}) + LOG.error( + _( + "Failed to delete project with " + "name or ID '%(project)s': %(e)s" + ), + {'project': project, 'e': e}, + ) if errors > 0: total = len(parsed_args.projects) - msg = (_("%(errors)s of %(total)s projects failed " - "to delete.") % {'errors': errors, 'total': total}) + msg = _( + "%(errors)s of %(total)s projects failed " "to delete." + ) % {'errors': errors, 'total': total} raise exceptions.CommandError(msg) @@ -210,8 +219,10 @@ class ListProject(command.Lister): parser.add_argument( '--my-projects', action='store_true', - help=_('List projects for the authenticated user. ' - 'Supersedes other filters.'), + help=_( + 'List projects for the authenticated user. ' + 'Supersedes other filters.' + ), ) parser.add_argument( '--long', @@ -222,9 +233,11 @@ class ListProject(command.Lister): parser.add_argument( '--sort', metavar='<key>[:<direction>]', - help=_('Sort output by selected keys and directions (asc or desc) ' - '(default: asc), repeat this option to specify multiple ' - 'keys and directions.'), + help=_( + 'Sort output by selected keys and directions (asc or desc) ' + '(default: asc), repeat this option to specify multiple ' + 'keys and directions.' + ), ) tag.add_tag_filtering_option_to_parser(parser, _('projects')) return parser @@ -239,23 +252,28 @@ class ListProject(command.Lister): domain_id = None if parsed_args.domain: - domain_id = common.find_domain(identity_client, - parsed_args.domain).id + domain_id = common.find_domain( + identity_client, parsed_args.domain + ).id kwargs['domain'] = domain_id if parsed_args.parent: - parent_id = common.find_project(identity_client, - parsed_args.parent).id + parent_id = common.find_project( + identity_client, parsed_args.parent + ).id kwargs['parent'] = parent_id if parsed_args.user: if parsed_args.domain: - user_id = utils.find_resource(identity_client.users, - parsed_args.user, - domain_id=domain_id).id + user_id = utils.find_resource( + identity_client.users, + parsed_args.user, + domain_id=domain_id, + ).id else: - user_id = utils.find_resource(identity_client.users, - parsed_args.user).id + user_id = utils.find_resource( + identity_client.users, parsed_args.user + ).id kwargs['user'] = user_id @@ -272,19 +290,24 @@ class ListProject(command.Lister): # wanting their own project list. if not kwargs: user = self.app.client_manager.auth_ref.user_id - data = identity_client.projects.list( - user=user) + data = identity_client.projects.list(user=user) else: raise if parsed_args.sort: data = utils.sort_items(data, parsed_args.sort) - return (columns, - (utils.get_item_properties( - s, columns, + return ( + columns, + ( + utils.get_item_properties( + s, + columns, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) class SetProject(command.Command): @@ -327,8 +350,10 @@ class SetProject(command.Command): '--property', metavar='<key=value>', action=parseractions.KeyValueAction, - help=_('Set a property on <project> ' - '(repeat option to set multiple properties)'), + help=_( + 'Set a property on <project> ' + '(repeat option to set multiple properties)' + ), ) common.add_resource_option_to_parser(parser) tag.add_tag_option_to_parser_for_set(parser, _('project')) @@ -337,9 +362,9 @@ class SetProject(command.Command): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - project = common.find_project(identity_client, - parsed_args.project, - parsed_args.domain) + project = common.find_project( + identity_client, parsed_args.project, parsed_args.domain + ) kwargs = {} if parsed_args.name: @@ -392,20 +417,19 @@ class ShowProject(command.ShowOne): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - project_str = common._get_token_resource(identity_client, 'project', - parsed_args.project, - parsed_args.domain) + project_str = common._get_token_resource( + identity_client, 'project', parsed_args.project, parsed_args.domain + ) if parsed_args.domain: domain = common.find_domain(identity_client, parsed_args.domain) project = utils.find_resource( - identity_client.projects, - project_str, - domain_id=domain.id) + identity_client.projects, project_str, domain_id=domain.id + ) else: project = utils.find_resource( - identity_client.projects, - project_str) + identity_client.projects, project_str + ) if parsed_args.parents or parsed_args.children: # NOTE(RuiChen): utils.find_resource() can't pass kwargs, @@ -414,7 +438,8 @@ class ShowProject(command.ShowOne): project = identity_client.projects.get( project.id, parents_as_ids=parsed_args.parents, - subtree_as_ids=parsed_args.children) + subtree_as_ids=parsed_args.children, + ) project._info.pop('links') return zip(*sorted(project._info.items())) diff --git a/openstackclient/identity/v3/region.py b/openstackclient/identity/v3/region.py index 20ee073c..21a80b94 100644 --- a/openstackclient/identity/v3/region.py +++ b/openstackclient/identity/v3/region.py @@ -85,13 +85,20 @@ class DeleteRegion(command.Command): identity_client.regions.delete(i) except Exception as e: result += 1 - LOG.error(_("Failed to delete region with " - "ID '%(region)s': %(e)s"), {'region': i, 'e': e}) + LOG.error( + _( + "Failed to delete region with " + "ID '%(region)s': %(e)s" + ), + {'region': i, 'e': e}, + ) if result > 0: total = len(parsed_args.region) - msg = (_("%(result)s of %(total)s regions failed " - "to delete.") % {'result': result, 'total': total}) + msg = _("%(result)s of %(total)s regions failed " "to delete.") % { + 'result': result, + 'total': total, + } raise exceptions.CommandError(msg) @@ -118,11 +125,17 @@ class ListRegion(command.Lister): columns = ('ID', 'Parent Region Id', 'Description') data = identity_client.regions.list(**kwargs) - return (columns_headers, - (utils.get_item_properties( - s, columns, + return ( + columns_headers, + ( + utils.get_item_properties( + s, + columns, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) class SetRegion(command.Command): @@ -174,8 +187,9 @@ class ShowRegion(command.ShowOne): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - region = utils.find_resource(identity_client.regions, - parsed_args.region) + region = utils.find_resource( + identity_client.regions, parsed_args.region + ) region._info['region'] = region._info.pop('id') region._info['parent_region'] = region._info.pop('parent_region_id') diff --git a/openstackclient/identity/v3/registered_limit.py b/openstackclient/identity/v3/registered_limit.py index 53117c71..251eb2db 100644 --- a/openstackclient/identity/v3/registered_limit.py +++ b/openstackclient/identity/v3/registered_limit.py @@ -87,7 +87,7 @@ class CreateRegisteredLimit(command.ShowOne): parsed_args.resource_name, parsed_args.default_limit, description=parsed_args.description, - region=region + region=region, ) registered_limit._info.pop('links', None) @@ -117,15 +117,22 @@ class DeleteRegisteredLimit(command.Command): except Exception as e: errors += 1 from pprint import pprint + pprint(type(e)) - LOG.error(_("Failed to delete registered limit with ID " - "'%(id)s': %(e)s"), - {'id': registered_limit_id, 'e': e}) + LOG.error( + _( + "Failed to delete registered limit with ID " + "'%(id)s': %(e)s" + ), + {'id': registered_limit_id, 'e': e}, + ) if errors > 0: total = len(parsed_args.registered_limit_id) - msg = (_("%(errors)s of %(total)s registered limits failed to " - "delete.") % {'errors': errors, 'total': total}) + msg = _( + "%(errors)s of %(total)s registered limits failed to " + "delete." + ) % {'errors': errors, 'total': total} raise exceptions.CommandError(msg) @@ -179,12 +186,16 @@ class ListRegisteredLimit(command.Lister): registered_limits = identity_client.registered_limits.list( service=service, resource_name=parsed_args.resource_name, - region=region + region=region, ) columns = ( - 'ID', 'Service ID', 'Resource Name', 'Default Limit', - 'Description', 'Region ID' + 'ID', + 'Service ID', + 'Resource Name', + 'Default Limit', + 'Description', + 'Region ID', ) return ( columns, @@ -205,18 +216,22 @@ class SetRegisteredLimit(command.ShowOne): parser.add_argument( '--service', metavar='<service>', - help=_('Service to be updated responsible for the resource to ' - 'limit. Either --service, --resource-name or --region must ' - 'be different than existing value otherwise it will be ' - 'duplicate entry') + help=_( + 'Service to be updated responsible for the resource to ' + 'limit. Either --service, --resource-name or --region must ' + 'be different than existing value otherwise it will be ' + 'duplicate entry' + ), ) parser.add_argument( '--resource-name', metavar='<resource-name>', - help=_('Resource to be updated responsible for the resource to ' - 'limit. Either --service, --resource-name or --region must ' - 'be different than existing value otherwise it will be ' - 'duplicate entry'), + help=_( + 'Resource to be updated responsible for the resource to ' + 'limit. Either --service, --resource-name or --region must ' + 'be different than existing value otherwise it will be ' + 'duplicate entry' + ), ) parser.add_argument( '--default-limit', @@ -232,10 +247,12 @@ class SetRegisteredLimit(command.ShowOne): parser.add_argument( '--region', metavar='<region>', - help=_('Region for the registered limit to affect. Either ' - '--service, --resource-name or --region must be ' - 'different than existing value otherwise it will be ' - 'duplicate entry'), + help=_( + 'Region for the registered limit to affect. Either ' + '--service, --resource-name or --region must be ' + 'different than existing value otherwise it will be ' + 'duplicate entry' + ), ) return parser @@ -270,7 +287,7 @@ class SetRegisteredLimit(command.ShowOne): resource_name=parsed_args.resource_name, default_limit=parsed_args.default_limit, description=parsed_args.description, - region=region + region=region, ) registered_limit._info.pop('links', None) diff --git a/openstackclient/identity/v3/role.py b/openstackclient/identity/v3/role.py index a674564f..4c435885 100644 --- a/openstackclient/identity/v3/role.py +++ b/openstackclient/identity/v3/role.py @@ -63,16 +63,15 @@ def _add_identity_and_resource_options_to_parser(parser): common.add_inherited_option_to_parser(parser) -def _process_identity_and_resource_options(parsed_args, - identity_client_manager, - validate_actor_existence=True): - +def _process_identity_and_resource_options( + parsed_args, identity_client_manager, validate_actor_existence=True +): def _find_user(): try: return common.find_user( identity_client_manager, parsed_args.user, - parsed_args.user_domain + parsed_args.user_domain, ).id except exceptions.CommandError: if not validate_actor_existence: @@ -84,7 +83,7 @@ def _process_identity_and_resource_options(parsed_args, return common.find_group( identity_client_manager, parsed_args.group, - parsed_args.group_domain + parsed_args.group_domain, ).id except exceptions.CommandError: if not validate_actor_existence: @@ -129,8 +128,10 @@ def _process_identity_and_resource_options(parsed_args, class AddRole(command.Command): - _description = _("Adds a role assignment to a user or group on the " - "system, a domain, or a project") + _description = _( + "Adds a role assignment to a user or group on the " + "system, a domain, or a project" + ) def get_parser(self, prog_name): parser = super(AddRole, self).get_parser(prog_name) @@ -146,24 +147,30 @@ class AddRole(command.Command): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - if (not parsed_args.user and not parsed_args.domain and - not parsed_args.group and not parsed_args.project): - msg = _("Role not added, incorrect set of arguments " - "provided. See openstack --help for more details") + if ( + not parsed_args.user + and not parsed_args.domain + and not parsed_args.group + and not parsed_args.project + ): + msg = _( + "Role not added, incorrect set of arguments " + "provided. See openstack --help for more details" + ) raise exceptions.CommandError(msg) domain_id = None if parsed_args.role_domain: - domain_id = common.find_domain(identity_client, - parsed_args.role_domain).id + domain_id = common.find_domain( + identity_client, parsed_args.role_domain + ).id role = utils.find_resource( - identity_client.roles, - parsed_args.role, - domain_id=domain_id + identity_client.roles, parsed_args.role, domain_id=domain_id ) kwargs = _process_identity_and_resource_options( - parsed_args, self.app.client_manager.identity) + parsed_args, self.app.client_manager.identity + ) identity_client.roles.grant(role.id, **kwargs) @@ -201,21 +208,27 @@ class CreateRole(command.ShowOne): domain_id = None if parsed_args.domain: - domain_id = common.find_domain(identity_client, - parsed_args.domain).id + domain_id = common.find_domain( + identity_client, parsed_args.domain + ).id options = common.get_immutable_options(parsed_args) try: role = identity_client.roles.create( - name=parsed_args.name, domain=domain_id, - description=parsed_args.description, options=options) + name=parsed_args.name, + domain=domain_id, + description=parsed_args.description, + options=options, + ) except ks_exc.Conflict: if parsed_args.or_show: - role = utils.find_resource(identity_client.roles, - parsed_args.name, - domain_id=domain_id) + role = utils.find_resource( + identity_client.roles, + parsed_args.name, + domain_id=domain_id, + ) LOG.info(_('Returning existing role %s'), role.name) else: raise @@ -247,27 +260,32 @@ class DeleteRole(command.Command): domain_id = None if parsed_args.domain: - domain_id = common.find_domain(identity_client, - parsed_args.domain).id + domain_id = common.find_domain( + identity_client, parsed_args.domain + ).id errors = 0 for role in parsed_args.roles: try: role_obj = utils.find_resource( - identity_client.roles, - role, - domain_id=domain_id + identity_client.roles, role, domain_id=domain_id ) identity_client.roles.delete(role_obj.id) except Exception as e: errors += 1 - LOG.error(_("Failed to delete role with " - "name or ID '%(role)s': %(e)s"), - {'role': role, 'e': e}) + LOG.error( + _( + "Failed to delete role with " + "name or ID '%(role)s': %(e)s" + ), + {'role': role, 'e': e}, + ) if errors > 0: total = len(parsed_args.roles) - msg = (_("%(errors)s of %(total)s roles failed " - "to delete.") % {'errors': errors, 'total': total}) + msg = _("%(errors)s of %(total)s roles failed " "to delete.") % { + 'errors': errors, + 'total': total, + } raise exceptions.CommandError(msg) @@ -299,16 +317,23 @@ class ListRole(command.Lister): columns = ('ID', 'Name') data = identity_client.roles.list() - return (columns, - (utils.get_item_properties( - s, columns, + return ( + columns, + ( + utils.get_item_properties( + s, + columns, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) class RemoveRole(command.Command): - _description = _("Removes a role assignment from system/domain/project : " - "user/group") + _description = _( + "Removes a role assignment from system/domain/project : " "user/group" + ) def get_parser(self, prog_name): parser = super(RemoveRole, self).get_parser(prog_name) @@ -325,25 +350,31 @@ class RemoveRole(command.Command): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - if (not parsed_args.user and not parsed_args.domain and - not parsed_args.group and not parsed_args.project): - msg = _("Incorrect set of arguments provided. " - "See openstack --help for more details") + if ( + not parsed_args.user + and not parsed_args.domain + and not parsed_args.group + and not parsed_args.project + ): + msg = _( + "Incorrect set of arguments provided. " + "See openstack --help for more details" + ) raise exceptions.CommandError(msg) domain_id = None if parsed_args.role_domain: - domain_id = common.find_domain(identity_client, - parsed_args.role_domain).id + domain_id = common.find_domain( + identity_client, parsed_args.role_domain + ).id role = utils.find_resource( - identity_client.roles, - parsed_args.role, - domain_id=domain_id + identity_client.roles, parsed_args.role, domain_id=domain_id ) kwargs = _process_identity_and_resource_options( - parsed_args, self.app.client_manager.identity, - validate_actor_existence=False + parsed_args, + self.app.client_manager.identity, + validate_actor_existence=False, ) identity_client.roles.revoke(role.id, **kwargs) @@ -381,17 +412,21 @@ class SetRole(command.Command): domain_id = None if parsed_args.domain: - domain_id = common.find_domain(identity_client, - parsed_args.domain).id + domain_id = common.find_domain( + identity_client, parsed_args.domain + ).id options = common.get_immutable_options(parsed_args) - role = utils.find_resource(identity_client.roles, - parsed_args.role, - domain_id=domain_id) + role = utils.find_resource( + identity_client.roles, parsed_args.role, domain_id=domain_id + ) - identity_client.roles.update(role.id, name=parsed_args.name, - description=parsed_args.description, - options=options) + identity_client.roles.update( + role.id, + name=parsed_args.name, + description=parsed_args.description, + options=options, + ) class ShowRole(command.ShowOne): @@ -416,12 +451,13 @@ class ShowRole(command.ShowOne): domain_id = None if parsed_args.domain: - domain_id = common.find_domain(identity_client, - parsed_args.domain).id + domain_id = common.find_domain( + identity_client, parsed_args.domain + ).id - role = utils.find_resource(identity_client.roles, - parsed_args.role, - domain_id=domain_id) + role = utils.find_resource( + identity_client.roles, parsed_args.role, domain_id=domain_id + ) role._info.pop('links') return zip(*sorted(role._info.items())) diff --git a/openstackclient/identity/v3/role_assignment.py b/openstackclient/identity/v3/role_assignment.py index 9c2f3d24..0be6aafb 100644 --- a/openstackclient/identity/v3/role_assignment.py +++ b/openstackclient/identity/v3/role_assignment.py @@ -84,14 +84,20 @@ class ListRoleAssignment(command.Lister): action="store_true", dest='authproject', help='Only list assignments for the project to which the ' - 'authenticated user\'s token is scoped', + 'authenticated user\'s token is scoped', ) return parser def _as_tuple(self, assignment): - return (assignment.role, assignment.user, assignment.group, - assignment.project, assignment.domain, assignment.system, - assignment.inherited) + return ( + assignment.role, + assignment.user, + assignment.group, + assignment.project, + assignment.domain, + assignment.system, + assignment.inherited, + ) def take_action(self, parsed_args): identity_client = self.app.client_manager.identity @@ -100,13 +106,14 @@ class ListRoleAssignment(command.Lister): role = None role_domain_id = None if parsed_args.role_domain: - role_domain_id = common.find_domain(identity_client, - parsed_args.role_domain).id + role_domain_id = common.find_domain( + identity_client, parsed_args.role_domain + ).id if parsed_args.role: role = utils.find_resource( identity_client.roles, parsed_args.role, - domain_id=role_domain_id + domain_id=role_domain_id, ) user = None @@ -118,10 +125,7 @@ class ListRoleAssignment(command.Lister): ) elif parsed_args.authuser: if auth_ref: - user = common.find_user( - identity_client, - auth_ref.user_id - ) + user = common.find_user(identity_client, auth_ref.user_id) system = None if parsed_args.system: @@ -138,15 +142,15 @@ class ListRoleAssignment(command.Lister): if parsed_args.project: project = common.find_project( identity_client, - common._get_token_resource(identity_client, 'project', - parsed_args.project), + common._get_token_resource( + identity_client, 'project', parsed_args.project + ), parsed_args.project_domain, ) elif parsed_args.authproject: if auth_ref: project = common.find_project( - identity_client, - auth_ref.project_id + identity_client, auth_ref.project_id ) group = None @@ -160,7 +164,13 @@ class ListRoleAssignment(command.Lister): include_names = True if parsed_args.names else False effective = True if parsed_args.effective else False columns = ( - 'Role', 'User', 'Group', 'Project', 'Domain', 'System', 'Inherited' + 'Role', + 'User', + 'Group', + 'Project', + 'Domain', + 'System', + 'Inherited', ) inherited_to = 'projects' if parsed_args.inherited else None @@ -173,7 +183,8 @@ class ListRoleAssignment(command.Lister): role=role, effective=effective, os_inherit_extension_inherited_to=inherited_to, - include_names=include_names) + include_names=include_names, + ) data_parsed = [] for assignment in data: @@ -181,8 +192,12 @@ class ListRoleAssignment(command.Lister): scope = assignment.scope if 'project' in scope: if include_names: - prj = '@'.join([scope['project']['name'], - scope['project']['domain']['name']]) + prj = '@'.join( + [ + scope['project']['name'], + scope['project']['domain']['name'], + ] + ) setattr(assignment, 'project', prj) else: setattr(assignment, 'project', scope['project']['id']) @@ -215,16 +230,24 @@ class ListRoleAssignment(command.Lister): if hasattr(assignment, 'user'): if include_names: - usr = '@'.join([assignment.user['name'], - assignment.user['domain']['name']]) + usr = '@'.join( + [ + assignment.user['name'], + assignment.user['domain']['name'], + ] + ) setattr(assignment, 'user', usr) else: setattr(assignment, 'user', assignment.user['id']) assignment.group = '' elif hasattr(assignment, 'group'): if include_names: - grp = '@'.join([assignment.group['name'], - assignment.group['domain']['name']]) + grp = '@'.join( + [ + assignment.group['name'], + assignment.group['domain']['name'], + ] + ) setattr(assignment, 'group', grp) else: setattr(assignment, 'group', assignment.group['id']) diff --git a/openstackclient/identity/v3/service.py b/openstackclient/identity/v3/service.py index 9dc66962..fde1799c 100644 --- a/openstackclient/identity/v3/service.py +++ b/openstackclient/identity/v3/service.py @@ -101,14 +101,19 @@ class DeleteService(command.Command): identity_client.services.delete(service.id) except Exception as e: result += 1 - LOG.error(_("Failed to delete consumer with type, " - "name or ID '%(service)s': %(e)s"), - {'service': i, 'e': e}) + LOG.error( + _( + "Failed to delete consumer with type, " + "name or ID '%(service)s': %(e)s" + ), + {'service': i, 'e': e}, + ) if result > 0: total = len(parsed_args.service) - msg = (_("%(result)s of %(total)s services failed " - "to delete.") % {'result': result, 'total': total}) + msg = _( + "%(result)s of %(total)s services failed " "to delete." + ) % {'result': result, 'total': total} raise exceptions.CommandError(msg) @@ -126,7 +131,6 @@ class ListService(command.Lister): return parser def take_action(self, parsed_args): - if parsed_args.long: columns = ('ID', 'Name', 'Type', 'Description', 'Enabled') else: @@ -179,8 +183,7 @@ class SetService(command.Command): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - service = common.find_service(identity_client, - parsed_args.service) + service = common.find_service(identity_client, parsed_args.service) kwargs = {} if parsed_args.type: kwargs['type'] = parsed_args.type @@ -193,10 +196,7 @@ class SetService(command.Command): if parsed_args.disable: kwargs['enabled'] = False - identity_client.services.update( - service.id, - **kwargs - ) + identity_client.services.update(service.id, **kwargs) class ShowService(command.ShowOne): diff --git a/openstackclient/identity/v3/service_provider.py b/openstackclient/identity/v3/service_provider.py index e106c787..e5af7492 100644 --- a/openstackclient/identity/v3/service_provider.py +++ b/openstackclient/identity/v3/service_provider.py @@ -39,8 +39,10 @@ class CreateServiceProvider(command.ShowOne): '--auth-url', metavar='<auth-url>', required=True, - help=_('Authentication URL of remote federated service provider ' - '(required)'), + help=_( + 'Authentication URL of remote federated service provider ' + '(required)' + ), ) parser.add_argument( '--description', @@ -51,8 +53,10 @@ class CreateServiceProvider(command.ShowOne): '--service-provider-url', metavar='<sp-url>', required=True, - help=_('A service URL where SAML assertions are being sent ' - '(required)'), + help=_( + 'A service URL where SAML assertions are being sent ' + '(required)' + ), ) enable_service_provider = parser.add_mutually_exclusive_group() @@ -79,7 +83,8 @@ class CreateServiceProvider(command.ShowOne): auth_url=parsed_args.auth_url, description=parsed_args.description, enabled=parsed_args.enabled, - sp_url=parsed_args.service_provider_url) + sp_url=parsed_args.service_provider_url, + ) sp._info.pop('links', None) return zip(*sorted(sp._info.items())) @@ -106,14 +111,20 @@ class DeleteServiceProvider(command.Command): service_client.federation.service_providers.delete(i) except Exception as e: result += 1 - LOG.error(_("Failed to delete service provider with " - "name or ID '%(provider)s': %(e)s"), - {'provider': i, 'e': e}) + LOG.error( + _( + "Failed to delete service provider with " + "name or ID '%(provider)s': %(e)s" + ), + {'provider': i, 'e': e}, + ) if result > 0: total = len(parsed_args.service_provider) - msg = (_("%(result)s of %(total)s service providers failed" - " to delete.") % {'result': result, 'total': total}) + msg = _( + "%(result)s of %(total)s service providers failed" + " to delete." + ) % {'result': result, 'total': total} raise exceptions.CommandError(msg) @@ -125,11 +136,17 @@ class ListServiceProvider(command.Lister): data = service_client.federation.service_providers.list() column_headers = ('ID', 'Enabled', 'Description', 'Auth URL') - return (column_headers, - (utils.get_item_properties( - s, column_headers, + return ( + column_headers, + ( + utils.get_item_properties( + s, + column_headers, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) class SetServiceProvider(command.Command): @@ -145,8 +162,10 @@ class SetServiceProvider(command.Command): parser.add_argument( '--auth-url', metavar='<auth-url>', - help=_('New Authentication URL of remote ' - 'federated service provider'), + help=_( + 'New Authentication URL of remote ' + 'federated service provider' + ), ) parser.add_argument( @@ -207,7 +226,8 @@ class ShowServiceProvider(command.ShowOne): service_provider = utils.find_resource( service_client.federation.service_providers, parsed_args.service_provider, - id=parsed_args.service_provider) + id=parsed_args.service_provider, + ) service_provider._info.pop('links', None) return zip(*sorted(service_provider._info.items())) diff --git a/openstackclient/identity/v3/tag.py b/openstackclient/identity/v3/tag.py index abf022d4..60cfb4be 100644 --- a/openstackclient/identity/v3/tag.py +++ b/openstackclient/identity/v3/tag.py @@ -16,7 +16,6 @@ from openstackclient.i18n import _ class _CommaListAction(argparse.Action): - def __call__(self, parser, namespace, values, option_string=None): setattr(namespace, self.dest, values.split(',')) @@ -26,29 +25,41 @@ def add_tag_filtering_option_to_parser(parser, collection_name): '--tags', metavar='<tag>[,<tag>,...]', action=_CommaListAction, - help=_('List %s which have all given tag(s) ' - '(Comma-separated list of tags)') % collection_name + help=_( + 'List %s which have all given tag(s) ' + '(Comma-separated list of tags)' + ) + % collection_name, ) parser.add_argument( '--tags-any', metavar='<tag>[,<tag>,...]', action=_CommaListAction, - help=_('List %s which have any given tag(s) ' - '(Comma-separated list of tags)') % collection_name + help=_( + 'List %s which have any given tag(s) ' + '(Comma-separated list of tags)' + ) + % collection_name, ) parser.add_argument( '--not-tags', metavar='<tag>[,<tag>,...]', action=_CommaListAction, - help=_('Exclude %s which have all given tag(s) ' - '(Comma-separated list of tags)') % collection_name + help=_( + 'Exclude %s which have all given tag(s) ' + '(Comma-separated list of tags)' + ) + % collection_name, ) parser.add_argument( '--not-tags-any', metavar='<tag>[,<tag>,...]', action=_CommaListAction, - help=_('Exclude %s which have any given tag(s) ' - '(Comma-separated list of tags)') % collection_name + help=_( + 'Exclude %s which have any given tag(s) ' + '(Comma-separated list of tags)' + ) + % collection_name, ) @@ -71,8 +82,10 @@ def add_tag_option_to_parser_for_create(parser, resource_name): dest='tags', metavar='<tag>', default=[], - help=_('Tag to be added to the %s ' - '(repeat option to set multiple tags)') % resource_name + help=_( + 'Tag to be added to the %s ' '(repeat option to set multiple tags)' + ) + % resource_name, ) @@ -83,22 +96,30 @@ def add_tag_option_to_parser_for_set(parser, resource_name): dest='tags', metavar='<tag>', default=[], - help=_('Tag to be added to the %s ' - '(repeat option to set multiple tags)') % resource_name + help=_( + 'Tag to be added to the %s ' '(repeat option to set multiple tags)' + ) + % resource_name, ) parser.add_argument( '--clear-tags', action='store_true', - help=_('Clear tags associated with the %s. Specify ' - 'both --tag and --clear-tags to overwrite ' - 'current tags') % resource_name + help=_( + 'Clear tags associated with the %s. Specify ' + 'both --tag and --clear-tags to overwrite ' + 'current tags' + ) + % resource_name, ) parser.add_argument( '--remove-tag', metavar='<tag>', default=[], - help=_('Tag to be deleted from the %s ' - '(repeat option to delete multiple tags)') % resource_name + help=_( + 'Tag to be deleted from the %s ' + '(repeat option to delete multiple tags)' + ) + % resource_name, ) @@ -112,5 +133,4 @@ def update_tags_in_args(parsed_args, obj, args): args['tags'] = list(set(obj.tags)) return if parsed_args.tags: - args['tags'] = list(set(obj.tags).union( - set(parsed_args.tags))) + args['tags'] = list(set(obj.tags).union(set(parsed_args.tags))) diff --git a/openstackclient/identity/v3/token.py b/openstackclient/identity/v3/token.py index f14dd8bc..c11de358 100644 --- a/openstackclient/identity/v3/token.py +++ b/openstackclient/identity/v3/token.py @@ -40,8 +40,10 @@ class AuthorizeRequestToken(command.ShowOne): action='append', default=[], required=True, - help=_('Roles to authorize (name or ID) ' - '(repeat option to set multiple values) (required)'), + help=_( + 'Roles to authorize (name or ID) ' + '(repeat option to set multiple values) (required)' + ), ) return parser @@ -58,8 +60,8 @@ class AuthorizeRequestToken(command.ShowOne): roles.append(role_id) verifier_pin = identity_client.oauth1.request_tokens.authorize( - parsed_args.request_key, - roles) + parsed_args.request_key, roles + ) return zip(*sorted(verifier_pin._info.items())) @@ -73,40 +75,43 @@ class CreateAccessToken(command.ShowOne): '--consumer-key', metavar='<consumer-key>', help=_('Consumer key (required)'), - required=True + required=True, ) parser.add_argument( '--consumer-secret', metavar='<consumer-secret>', help=_('Consumer secret (required)'), - required=True + required=True, ) parser.add_argument( '--request-key', metavar='<request-key>', help=_('Request token to exchange for access token (required)'), - required=True + required=True, ) parser.add_argument( '--request-secret', metavar='<request-secret>', help=_('Secret associated with <request-key> (required)'), - required=True + required=True, ) parser.add_argument( '--verifier', metavar='<verifier>', help=_('Verifier associated with <request-key> (required)'), - required=True + required=True, ) return parser def take_action(self, parsed_args): token_client = self.app.client_manager.identity.oauth1.access_tokens access_token = token_client.create( - parsed_args.consumer_key, parsed_args.consumer_secret, - parsed_args.request_key, parsed_args.request_secret, - parsed_args.verifier) + parsed_args.consumer_key, + parsed_args.consumer_secret, + parsed_args.request_key, + parsed_args.request_secret, + parsed_args.verifier, + ) return zip(*sorted(access_token._info.items())) @@ -119,20 +124,22 @@ class CreateRequestToken(command.ShowOne): '--consumer-key', metavar='<consumer-key>', help=_('Consumer key (required)'), - required=True + required=True, ) parser.add_argument( '--consumer-secret', metavar='<consumer-secret>', help=_('Consumer secret (required)'), - required=True + required=True, ) parser.add_argument( '--project', metavar='<project>', - help=_('Project that consumer wants to access (name or ID)' - ' (required)'), - required=True + help=_( + 'Project that consumer wants to access (name or ID)' + ' (required)' + ), + required=True, ) parser.add_argument( '--domain', @@ -146,19 +153,21 @@ class CreateRequestToken(command.ShowOne): if parsed_args.domain: domain = common.find_domain(identity_client, parsed_args.domain) - project = utils.find_resource(identity_client.projects, - parsed_args.project, - domain_id=domain.id) + project = utils.find_resource( + identity_client.projects, + parsed_args.project, + domain_id=domain.id, + ) else: - project = utils.find_resource(identity_client.projects, - parsed_args.project) + project = utils.find_resource( + identity_client.projects, parsed_args.project + ) token_client = identity_client.oauth1.request_tokens request_token = token_client.create( - parsed_args.consumer_key, - parsed_args.consumer_secret, - project.id) + parsed_args.consumer_key, parsed_args.consumer_secret, project.id + ) return zip(*sorted(request_token._info.items())) @@ -176,7 +185,8 @@ class IssueToken(command.ShowOne): auth_ref = self.app.client_manager.auth_ref if not auth_ref: raise exceptions.AuthorizationFailure( - _("Only an authorized user may issue a new token.")) + _("Only an authorized user may issue a new token.") + ) data = {} if auth_ref.auth_token: diff --git a/openstackclient/identity/v3/trust.py b/openstackclient/identity/v3/trust.py index 61273f41..f2899d59 100644 --- a/openstackclient/identity/v3/trust.py +++ b/openstackclient/identity/v3/trust.py @@ -54,23 +54,29 @@ class CreateTrust(command.ShowOne): metavar='<role>', action='append', default=[], - help=_('Roles to authorize (name or ID) ' - '(repeat option to set multiple values, required)'), - required=True + help=_( + 'Roles to authorize (name or ID) ' + '(repeat option to set multiple values, required)' + ), + required=True, ) parser.add_argument( '--impersonate', dest='impersonate', action='store_true', default=False, - help=_('Tokens generated from the trust will represent <trustor>' - ' (defaults to False)'), + help=_( + 'Tokens generated from the trust will represent <trustor>' + ' (defaults to False)' + ), ) parser.add_argument( '--expiration', metavar='<expiration>', - help=_('Sets an expiration date for the trust' - ' (format of YYYY-mm-ddTHH:MM:SS)'), + help=_( + 'Sets an expiration date for the trust' + ' (format of YYYY-mm-ddTHH:MM:SS)' + ), ) common.add_project_domain_option_to_parser(parser) parser.add_argument( @@ -93,15 +99,15 @@ class CreateTrust(command.ShowOne): # trustee, project and role are optional, but that makes the trust # pointless, and trusts are immutable, so let's enforce it at the # client level. - trustor_id = common.find_user(identity_client, - parsed_args.trustor, - parsed_args.trustor_domain).id - trustee_id = common.find_user(identity_client, - parsed_args.trustee, - parsed_args.trustee_domain).id - project_id = common.find_project(identity_client, - parsed_args.project, - parsed_args.project_domain).id + trustor_id = common.find_user( + identity_client, parsed_args.trustor, parsed_args.trustor_domain + ).id + trustee_id = common.find_user( + identity_client, parsed_args.trustee, parsed_args.trustee_domain + ).id + project_id = common.find_project( + identity_client, parsed_args.project, parsed_args.project_domain + ).id role_ids = [] for role in parsed_args.role: @@ -116,11 +122,13 @@ class CreateTrust(command.ShowOne): expires_at = None if parsed_args.expiration: - expires_at = datetime.datetime.strptime(parsed_args.expiration, - '%Y-%m-%dT%H:%M:%S') + expires_at = datetime.datetime.strptime( + parsed_args.expiration, '%Y-%m-%dT%H:%M:%S' + ) trust = identity_client.trusts.create( - trustee_id, trustor_id, + trustee_id, + trustor_id, impersonation=parsed_args.impersonate, project=project_id, role_ids=role_ids, @@ -157,19 +165,24 @@ class DeleteTrust(command.Command): errors = 0 for trust in parsed_args.trust: try: - trust_obj = utils.find_resource(identity_client.trusts, - trust) + trust_obj = utils.find_resource(identity_client.trusts, trust) identity_client.trusts.delete(trust_obj.id) except Exception as e: errors += 1 - LOG.error(_("Failed to delete trust with " - "name or ID '%(trust)s': %(e)s"), - {'trust': trust, 'e': e}) + LOG.error( + _( + "Failed to delete trust with " + "name or ID '%(trust)s': %(e)s" + ), + {'trust': trust, 'e': e}, + ) if errors > 0: total = len(parsed_args.trust) - msg = (_("%(errors)s of %(total)s trusts failed " - "to delete.") % {'errors': errors, 'total': total}) + msg = _("%(errors)s of %(total)s trusts failed " "to delete.") % { + 'errors': errors, + 'total': total, + } raise exceptions.CommandError(msg) @@ -210,12 +223,14 @@ class ListTrust(command.Lister): identity_client = self.app.client_manager.identity auth_ref = self.app.client_manager.auth_ref - if parsed_args.authuser and any([ - parsed_args.trustor, - parsed_args.trustor_domain, - parsed_args.trustee, - parsed_args.trustee_domain, - ]): + if parsed_args.authuser and any( + [ + parsed_args.trustor, + parsed_args.trustor_domain, + parsed_args.trustee, + parsed_args.trustee_domain, + ] + ): msg = _("--authuser cannot be used with --trustee or --trustor") raise exceptions.CommandError(msg) @@ -229,10 +244,7 @@ class ListTrust(command.Lister): if parsed_args.authuser: if auth_ref: - user = common.find_user( - identity_client, - auth_ref.user_id - ) + user = common.find_user(identity_client, auth_ref.user_id) # We need two calls here as we want trusts with # either the trustor or the trustee set to current user # using a single call would give us trusts with both @@ -262,14 +274,26 @@ class ListTrust(command.Lister): trustee_user=trustee, ) - columns = ('ID', 'Expires At', 'Impersonation', 'Project ID', - 'Trustee User ID', 'Trustor User ID') + columns = ( + 'ID', + 'Expires At', + 'Impersonation', + 'Project ID', + 'Trustee User ID', + 'Trustor User ID', + ) - return (columns, - (utils.get_item_properties( - s, columns, + return ( + columns, + ( + utils.get_item_properties( + s, + columns, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) class ShowTrust(command.ShowOne): @@ -286,8 +310,7 @@ class ShowTrust(command.ShowOne): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - trust = utils.find_resource(identity_client.trusts, - parsed_args.trust) + trust = utils.find_resource(identity_client.trusts, parsed_args.trust) trust._info.pop('roles_links', None) trust._info.pop('links', None) diff --git a/openstackclient/identity/v3/unscoped_saml.py b/openstackclient/identity/v3/unscoped_saml.py index f7598f17..d26035d3 100644 --- a/openstackclient/identity/v3/unscoped_saml.py +++ b/openstackclient/identity/v3/unscoped_saml.py @@ -30,11 +30,17 @@ class ListAccessibleDomains(command.Lister): columns = ('ID', 'Enabled', 'Name', 'Description') identity_client = self.app.client_manager.identity data = identity_client.federation.domains.list() - return (columns, - (utils.get_item_properties( - s, columns, + return ( + columns, + ( + utils.get_item_properties( + s, + columns, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) class ListAccessibleProjects(command.Lister): @@ -44,8 +50,14 @@ class ListAccessibleProjects(command.Lister): columns = ('ID', 'Domain ID', 'Enabled', 'Name') identity_client = self.app.client_manager.identity data = identity_client.federation.projects.list() - return (columns, - (utils.get_item_properties( - s, columns, + return ( + columns, + ( + utils.get_item_properties( + s, + columns, formatters={}, - ) for s in data)) + ) + for s in data + ), + ) diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py index cbc112a0..dfc66b3d 100644 --- a/openstackclient/identity/v3/user.py +++ b/openstackclient/identity/v3/user.py @@ -53,8 +53,9 @@ def _get_options_for_user(identity_client, parsed_args): if parsed_args.disable_multi_factor_auth: options['multi_factor_auth_enabled'] = False if parsed_args.multi_factor_auth_rule: - auth_rules = [rule.split(",") for rule in - parsed_args.multi_factor_auth_rule] + auth_rules = [ + rule.split(",") for rule in parsed_args.multi_factor_auth_rule + ] if auth_rules: options['multi_factor_auth_rules'] = auth_rules return options @@ -66,54 +67,70 @@ def _add_user_options(parser): parser.add_argument( '--ignore-lockout-failure-attempts', action="store_true", - help=_('Opt into ignoring the number of times a user has ' - 'authenticated and locking out the user as a result'), + help=_( + 'Opt into ignoring the number of times a user has ' + 'authenticated and locking out the user as a result' + ), ) parser.add_argument( '--no-ignore-lockout-failure-attempts', action="store_true", - help=_('Opt out of ignoring the number of times a user has ' - 'authenticated and locking out the user as a result'), + help=_( + 'Opt out of ignoring the number of times a user has ' + 'authenticated and locking out the user as a result' + ), ) parser.add_argument( '--ignore-password-expiry', action="store_true", - help=_('Opt into allowing user to continue using passwords that ' - 'may be expired'), + help=_( + 'Opt into allowing user to continue using passwords that ' + 'may be expired' + ), ) parser.add_argument( '--no-ignore-password-expiry', action="store_true", - help=_('Opt out of allowing user to continue using passwords ' - 'that may be expired'), + help=_( + 'Opt out of allowing user to continue using passwords ' + 'that may be expired' + ), ) parser.add_argument( '--ignore-change-password-upon-first-use', action="store_true", - help=_('Control if a user should be forced to change their password ' - 'immediately after they log into keystone for the first time. ' - 'Opt into ignoring the user to change their password during ' - 'first time login in keystone'), + help=_( + 'Control if a user should be forced to change their password ' + 'immediately after they log into keystone for the first time. ' + 'Opt into ignoring the user to change their password during ' + 'first time login in keystone' + ), ) parser.add_argument( '--no-ignore-change-password-upon-first-use', action="store_true", - help=_('Control if a user should be forced to change their password ' - 'immediately after they log into keystone for the first time. ' - 'Opt out of ignoring the user to change their password during ' - 'first time login in keystone'), + help=_( + 'Control if a user should be forced to change their password ' + 'immediately after they log into keystone for the first time. ' + 'Opt out of ignoring the user to change their password during ' + 'first time login in keystone' + ), ) parser.add_argument( '--enable-lock-password', action="store_true", - help=_('Disables the ability for a user to change its password ' - 'through self-service APIs'), + help=_( + 'Disables the ability for a user to change its password ' + 'through self-service APIs' + ), ) parser.add_argument( '--disable-lock-password', action="store_true", - help=_('Enables the ability for a user to change its password ' - 'through self-service APIs'), + help=_( + 'Enables the ability for a user to change its password ' + 'through self-service APIs' + ), ) parser.add_argument( '--enable-multi-factor-auth', @@ -130,11 +147,13 @@ def _add_user_options(parser): metavar='<rule>', action="append", default=[], - help=_('Set multi-factor auth rules. For example, to set a rule ' - 'requiring the "password" and "totp" auth methods to be ' - 'provided, use: "--multi-factor-auth-rule password,totp". ' - 'May be provided multiple times to set different rule ' - 'combinations.') + help=_( + 'Set multi-factor auth rules. For example, to set a rule ' + 'requiring the "password" and "totp" auth methods to be ' + 'provided, use: "--multi-factor-auth-rule password,totp". ' + 'May be provided multiple times to set different rule ' + 'combinations.' + ), ) @@ -205,14 +224,17 @@ class CreateUser(command.ShowOne): project_id = None if parsed_args.project: - project_id = common.find_project(identity_client, - parsed_args.project, - parsed_args.project_domain).id + project_id = common.find_project( + identity_client, + parsed_args.project, + parsed_args.project_domain, + ).id domain_id = None if parsed_args.domain: - domain_id = common.find_domain(identity_client, - parsed_args.domain).id + domain_id = common.find_domain( + identity_client, parsed_args.domain + ).id enabled = True if parsed_args.disable: @@ -221,8 +243,12 @@ class CreateUser(command.ShowOne): parsed_args.password = utils.get_password(self.app.stdin) if not parsed_args.password: - LOG.warning(_("No password was supplied, authentication will fail " - "when a user does not have a password.")) + LOG.warning( + _( + "No password was supplied, authentication will fail " + "when a user does not have a password." + ) + ) options = _get_options_for_user(identity_client, parsed_args) try: @@ -238,9 +264,11 @@ class CreateUser(command.ShowOne): ) except ks_exc.Conflict: if parsed_args.or_show: - user = utils.find_resource(identity_client.users, - parsed_args.name, - domain_id=domain_id) + user = utils.find_resource( + identity_client.users, + parsed_args.name, + domain_id=domain_id, + ) LOG.info(_('Returning existing user %s'), user.name) else: raise @@ -277,23 +305,28 @@ class DeleteUser(command.Command): for user in parsed_args.users: try: if domain is not None: - user_obj = utils.find_resource(identity_client.users, - user, - domain_id=domain.id) + user_obj = utils.find_resource( + identity_client.users, user, domain_id=domain.id + ) else: - user_obj = utils.find_resource(identity_client.users, - user) + user_obj = utils.find_resource(identity_client.users, user) identity_client.users.delete(user_obj.id) except Exception as e: errors += 1 - LOG.error(_("Failed to delete user with " - "name or ID '%(user)s': %(e)s"), - {'user': user, 'e': e}) + LOG.error( + _( + "Failed to delete user with " + "name or ID '%(user)s': %(e)s" + ), + {'user': user, 'e': e}, + ) if errors > 0: total = len(parsed_args.users) - msg = (_("%(errors)s of %(total)s users failed " - "to delete.") % {'errors': errors, 'total': total}) + msg = _("%(errors)s of %(total)s users failed " "to delete.") % { + 'errors': errors, + 'total': total, + } raise exceptions.CommandError(msg) @@ -331,21 +364,20 @@ class ListUser(command.Lister): domain = None if parsed_args.domain: - domain = common.find_domain(identity_client, - parsed_args.domain).id + domain = common.find_domain(identity_client, parsed_args.domain).id group = None if parsed_args.group: - group = common.find_group(identity_client, - parsed_args.group, - parsed_args.domain).id + group = common.find_group( + identity_client, parsed_args.group, parsed_args.domain + ).id if parsed_args.project: if domain is not None: project = utils.find_resource( identity_client.projects, parsed_args.project, - domain_id=domain + domain_id=domain, ).id else: project = utils.find_resource( @@ -354,7 +386,8 @@ class ListUser(command.Lister): ).id assignments = identity_client.role_assignments.list( - project=project) + project=project + ) # NOTE(stevemar): If a user has more than one role on a project # then they will have two entries in the returned data. Since we @@ -379,8 +412,15 @@ class ListUser(command.Lister): # Column handling if parsed_args.long: - columns = ['ID', 'Name', 'Default Project Id', 'Domain Id', - 'Description', 'Email', 'Enabled'] + columns = [ + 'ID', + 'Name', + 'Default Project Id', + 'Domain Id', + 'Description', + 'Email', + 'Enabled', + ] column_headers = copy.deepcopy(columns) column_headers[2] = 'Project' column_headers[3] = 'Domain' @@ -390,10 +430,14 @@ class ListUser(command.Lister): return ( column_headers, - (utils.get_item_properties( - s, columns, - formatters={}, - ) for s in data) + ( + utils.get_item_properties( + s, + columns, + formatters={}, + ) + for s in data + ), ) @@ -415,8 +459,10 @@ class SetUser(command.Command): parser.add_argument( '--domain', metavar='<domain>', - help=_('Domain the user belongs to (name or ID). This can be ' - 'used in case collisions between user names exist.'), + help=_( + 'Domain the user belongs to (name or ID). This can be ' + 'used in case collisions between user names exist.' + ), ) parser.add_argument( '--project', @@ -467,17 +513,21 @@ class SetUser(command.Command): parsed_args.password = utils.get_password(self.app.stdin) if '' == parsed_args.password: - LOG.warning(_("No password was supplied, authentication will fail " - "when a user does not have a password.")) + LOG.warning( + _( + "No password was supplied, authentication will fail " + "when a user does not have a password." + ) + ) - user_str = common._get_token_resource(identity_client, 'user', - parsed_args.user, - parsed_args.domain) + user_str = common._get_token_resource( + identity_client, 'user', parsed_args.user, parsed_args.domain + ) if parsed_args.domain: domain = common.find_domain(identity_client, parsed_args.domain) - user = utils.find_resource(identity_client.users, - user_str, - domain_id=domain.id) + user = utils.find_resource( + identity_client.users, user_str, domain_id=domain.id + ) else: user = utils.find_resource( identity_client.users, @@ -494,9 +544,11 @@ class SetUser(command.Command): if parsed_args.description: kwargs['description'] = parsed_args.description if parsed_args.project: - project_id = common.find_project(identity_client, - parsed_args.project, - parsed_args.project_domain).id + project_id = common.find_project( + identity_client, + parsed_args.project, + parsed_args.project_domain, + ).id kwargs['default_project'] = project_id kwargs['enabled'] = user.enabled if parsed_args.enable: @@ -556,16 +608,22 @@ class SetPasswordUser(command.Command): current_password = parsed_args.original_password if current_password is None: current_password = utils.get_password( - self.app.stdin, prompt="Current Password:", confirm=False) + self.app.stdin, prompt="Current Password:", confirm=False + ) password = parsed_args.password if password is None: password = utils.get_password( - self.app.stdin, prompt="New Password:") + self.app.stdin, prompt="New Password:" + ) if '' == password: - LOG.warning(_("No password was supplied, authentication will fail " - "when a user does not have a password.")) + LOG.warning( + _( + "No password was supplied, authentication will fail " + "when a user does not have a password." + ) + ) identity_client.users.update_password(current_password, password) @@ -590,17 +648,16 @@ class ShowUser(command.ShowOne): def take_action(self, parsed_args): identity_client = self.app.client_manager.identity - user_str = common._get_token_resource(identity_client, 'user', - parsed_args.user, - parsed_args.domain) + user_str = common._get_token_resource( + identity_client, 'user', parsed_args.user, parsed_args.domain + ) if parsed_args.domain: domain = common.find_domain(identity_client, parsed_args.domain) - user = utils.find_resource(identity_client.users, - user_str, - domain_id=domain.id) + user = utils.find_resource( + identity_client.users, user_str, domain_id=domain.id + ) else: - user = utils.find_resource(identity_client.users, - user_str) + user = utils.find_resource(identity_client.users, user_str) user._info.pop('links') return zip(*sorted(user._info.items())) 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) diff --git a/openstackclient/tests/unit/identity/v2_0/fakes.py b/openstackclient/tests/unit/identity/v2_0/fakes.py index bd76a784..708f9a83 100644 --- a/openstackclient/tests/unit/identity/v2_0/fakes.py +++ b/openstackclient/tests/unit/identity/v2_0/fakes.py @@ -155,7 +155,6 @@ def fake_auth_ref(fake_token, fake_service=None): class FakeIdentityv2Client(object): - def __init__(self, **kwargs): self.roles = mock.Mock() self.roles.resource_class = fakes.FakeResource(None, {}) @@ -185,7 +184,6 @@ class FakeIdentityv2Client(object): class TestIdentityv2(utils.TestCommand): - def setUp(self): super(TestIdentityv2, self).setUp() @@ -212,22 +210,25 @@ class FakeExtension(object): # Set default attributes. extension_info = { 'name': 'name-' + uuid.uuid4().hex, - 'namespace': ('http://docs.openstack.org/identity/' - 'api/ext/OS-KSCRUD/v1.0'), + 'namespace': ( + 'http://docs.openstack.org/identity/' 'api/ext/OS-KSCRUD/v1.0' + ), 'description': 'description-' + uuid.uuid4().hex, 'updated': '2013-07-07T12:00:0-00:00', 'alias': 'OS-KSCRUD', - 'links': ('[{"href":' - '"https://github.com/openstack/identity-api", "type":' - ' "text/html", "rel": "describedby"}]') + 'links': ( + '[{"href":' + '"https://github.com/openstack/identity-api", "type":' + ' "text/html", "rel": "describedby"}]' + ), } # Overwrite default attributes. extension_info.update(attrs) extension = fakes.FakeResource( - info=copy.deepcopy(extension_info), - loaded=True) + info=copy.deepcopy(extension_info), loaded=True + ) return extension @@ -275,8 +276,8 @@ class FakeCatalog(object): catalog_info.update(attrs) catalog = fakes.FakeResource( - info=copy.deepcopy(catalog_info), - loaded=True) + info=copy.deepcopy(catalog_info), loaded=True + ) return catalog @@ -305,8 +306,9 @@ class FakeProject(object): } project_info.update(attrs) - project = fakes.FakeResource(info=copy.deepcopy(project_info), - loaded=True) + project = fakes.FakeResource( + info=copy.deepcopy(project_info), loaded=True + ) return project @staticmethod @@ -352,12 +354,12 @@ class FakeEndpoint(object): 'id': 'endpoint-id-' + uuid.uuid4().hex, 'publicurl': 'http://endpoint_publicurl', 'service_id': 'service-name-' + uuid.uuid4().hex, - } endpoint_info.update(attrs) - endpoint = fakes.FakeResource(info=copy.deepcopy(endpoint_info), - loaded=True) + endpoint = fakes.FakeResource( + info=copy.deepcopy(endpoint_info), loaded=True + ) return endpoint @staticmethod @@ -399,12 +401,12 @@ class FakeService(object): 'name': 'service-name-' + uuid.uuid4().hex, 'description': 'service_description', 'type': 'service_type', - } service_info.update(attrs) - service = fakes.FakeResource(info=copy.deepcopy(service_info), - loaded=True) + service = fakes.FakeResource( + info=copy.deepcopy(service_info), loaded=True + ) return service @staticmethod @@ -447,8 +449,7 @@ class FakeRole(object): } role_info.update(attrs) - role = fakes.FakeResource(info=copy.deepcopy(role_info), - loaded=True) + role = fakes.FakeResource(info=copy.deepcopy(role_info), loaded=True) return role @staticmethod @@ -493,8 +494,7 @@ class FakeUser(object): } user_info.update(attrs) - user = fakes.FakeResource(info=copy.deepcopy(user_info), - loaded=True) + user = fakes.FakeResource(info=copy.deepcopy(user_info), loaded=True) return user @staticmethod diff --git a/openstackclient/tests/unit/identity/v2_0/test_catalog.py b/openstackclient/tests/unit/identity/v2_0/test_catalog.py index bfb28f69..c420d33c 100644 --- a/openstackclient/tests/unit/identity/v2_0/test_catalog.py +++ b/openstackclient/tests/unit/identity/v2_0/test_catalog.py @@ -19,7 +19,6 @@ from openstackclient.tests.unit import utils class TestCatalog(utils.TestCommand): - service_catalog = identity_fakes.FakeCatalog.create_catalog() def setUp(self): @@ -37,7 +36,6 @@ class TestCatalog(utils.TestCommand): class TestCatalogList(TestCatalog): - columns = ( 'Name', 'Type', @@ -68,12 +66,15 @@ class TestCatalogList(TestCatalog): columns, data = self.cmd.take_action(parsed_args) self.assertEqual(self.columns, columns) - datalist = (( - 'supernova', - 'compute', - catalog.EndpointsColumn( - auth_ref.service_catalog.catalog[0]['endpoints']), - ), ) + datalist = ( + ( + 'supernova', + 'compute', + catalog.EndpointsColumn( + auth_ref.service_catalog.catalog[0]['endpoints'] + ), + ), + ) self.assertCountEqual(datalist, tuple(data)) def test_catalog_list_with_endpoint_url(self): @@ -111,17 +112,19 @@ class TestCatalogList(TestCatalog): columns, data = self.cmd.take_action(parsed_args) self.assertEqual(self.columns, columns) - datalist = (( - 'supernova', - 'compute', - catalog.EndpointsColumn( - auth_ref.service_catalog.catalog[0]['endpoints']), - ), ) + datalist = ( + ( + 'supernova', + 'compute', + catalog.EndpointsColumn( + auth_ref.service_catalog.catalog[0]['endpoints'] + ), + ), + ) self.assertCountEqual(datalist, tuple(data)) class TestCatalogShow(TestCatalog): - def setUp(self): super(TestCatalogShow, self).setUp() @@ -153,7 +156,8 @@ class TestCatalogShow(TestCatalog): self.assertEqual(collist, columns) datalist = ( catalog.EndpointsColumn( - auth_ref.service_catalog.catalog[0]['endpoints']), + auth_ref.service_catalog.catalog[0]['endpoints'] + ), self.service_catalog.id, 'supernova', 'compute', @@ -174,7 +178,8 @@ class TestFormatColumns(TestCatalog): '<none>\n publicURL: https://public.none.example.com\n ' 'internalURL: https://internal.none.example.com\n ' 'adminURL: https://admin.none.example.com\n', - col.human_readable()) + col.human_readable(), + ) def test_endpoints_column_human_readable_with_partial_endpoint_urls(self): endpoints = [ @@ -193,4 +198,5 @@ class TestFormatColumns(TestCatalog): 'one\n publicURL: https://public.one.example.com\n' 'two\n publicURL: https://public.two.example.com\n ' 'internalURL: https://internal.two.example.com\n', - col.human_readable()) + col.human_readable(), + ) diff --git a/openstackclient/tests/unit/identity/v2_0/test_endpoint.py b/openstackclient/tests/unit/identity/v2_0/test_endpoint.py index 915e04a5..5de396c4 100644 --- a/openstackclient/tests/unit/identity/v2_0/test_endpoint.py +++ b/openstackclient/tests/unit/identity/v2_0/test_endpoint.py @@ -16,7 +16,6 @@ from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes class TestEndpoint(identity_fakes.TestIdentityv2): - fake_service = identity_fakes.FakeService.create_one_service() attr = { 'service_name': fake_service.name, @@ -37,7 +36,6 @@ class TestEndpoint(identity_fakes.TestIdentityv2): class TestEndpointCreate(TestEndpoint): - def setUp(self): super(TestEndpointCreate, self).setUp() @@ -50,10 +48,14 @@ class TestEndpointCreate(TestEndpoint): def test_endpoint_create(self): arglist = [ - '--publicurl', self.fake_endpoint.publicurl, - '--internalurl', self.fake_endpoint.internalurl, - '--adminurl', self.fake_endpoint.adminurl, - '--region', self.fake_endpoint.region, + '--publicurl', + self.fake_endpoint.publicurl, + '--internalurl', + self.fake_endpoint.internalurl, + '--adminurl', + self.fake_endpoint.adminurl, + '--region', + self.fake_endpoint.region, self.fake_service.id, ] verifylist = [ @@ -80,8 +82,16 @@ class TestEndpointCreate(TestEndpoint): self.fake_endpoint.internalurl, ) - collist = ('adminurl', 'id', 'internalurl', 'publicurl', - 'region', 'service_id', 'service_name', 'service_type') + collist = ( + 'adminurl', + 'id', + 'internalurl', + 'publicurl', + 'region', + 'service_id', + 'service_name', + 'service_type', + ) self.assertEqual(collist, columns) datalist = ( self.fake_endpoint.adminurl, @@ -98,7 +108,6 @@ class TestEndpointCreate(TestEndpoint): class TestEndpointDelete(TestEndpoint): - def setUp(self): super(TestEndpointDelete, self).setUp() @@ -126,7 +135,6 @@ class TestEndpointDelete(TestEndpoint): class TestEndpointList(TestEndpoint): - def setUp(self): super(TestEndpointList, self).setUp() @@ -151,12 +159,14 @@ class TestEndpointList(TestEndpoint): collist = ('ID', 'Region', 'Service Name', 'Service Type') self.assertEqual(collist, columns) - datalist = (( - self.fake_endpoint.id, - self.fake_endpoint.region, - self.fake_endpoint.service_name, - self.fake_endpoint.service_type, - ), ) + datalist = ( + ( + self.fake_endpoint.id, + self.fake_endpoint.region, + self.fake_endpoint.service_name, + self.fake_endpoint.service_type, + ), + ) self.assertEqual(datalist, tuple(data)) def test_endpoint_list_long(self): @@ -175,23 +185,31 @@ class TestEndpointList(TestEndpoint): self.endpoints_mock.list.assert_called_with() - collist = ('ID', 'Region', 'Service Name', 'Service Type', - 'PublicURL', 'AdminURL', 'InternalURL') + collist = ( + 'ID', + 'Region', + 'Service Name', + 'Service Type', + 'PublicURL', + 'AdminURL', + 'InternalURL', + ) self.assertEqual(collist, columns) - datalist = (( - self.fake_endpoint.id, - self.fake_endpoint.region, - self.fake_endpoint.service_name, - self.fake_endpoint.service_type, - self.fake_endpoint.publicurl, - self.fake_endpoint.adminurl, - self.fake_endpoint.internalurl, - ), ) + datalist = ( + ( + self.fake_endpoint.id, + self.fake_endpoint.region, + self.fake_endpoint.service_name, + self.fake_endpoint.service_type, + self.fake_endpoint.publicurl, + self.fake_endpoint.adminurl, + self.fake_endpoint.internalurl, + ), + ) self.assertEqual(datalist, tuple(data)) class TestEndpointShow(TestEndpoint): - def setUp(self): super(TestEndpointShow, self).setUp() @@ -223,8 +241,16 @@ class TestEndpointShow(TestEndpoint): self.fake_endpoint.service_id, ) - collist = ('adminurl', 'id', 'internalurl', 'publicurl', - 'region', 'service_id', 'service_name', 'service_type') + collist = ( + 'adminurl', + 'id', + 'internalurl', + 'publicurl', + 'region', + 'service_id', + 'service_name', + 'service_type', + ) self.assertEqual(collist, columns) datalist = ( self.fake_endpoint.adminurl, diff --git a/openstackclient/tests/unit/identity/v2_0/test_project.py b/openstackclient/tests/unit/identity/v2_0/test_project.py index 496214aa..68ec9f02 100644 --- a/openstackclient/tests/unit/identity/v2_0/test_project.py +++ b/openstackclient/tests/unit/identity/v2_0/test_project.py @@ -25,7 +25,6 @@ from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes class TestProject(identity_fakes.TestIdentityv2): - fake_project = identity_fakes.FakeProject.create_one_project() fake_projects = identity_fakes.FakeProject.create_projects() @@ -42,10 +41,18 @@ class TestProject(identity_fakes.TestIdentityv2): fake_project.name, ) datalists = ( - (fake_projects[0].description, True, - fake_projects[0].id, fake_projects[0].name,), - (fake_projects[1].description, True, - fake_projects[1].id, fake_projects[1].name,), + ( + fake_projects[0].description, + True, + fake_projects[0].id, + fake_projects[0].name, + ), + ( + fake_projects[1].description, + True, + fake_projects[1].id, + fake_projects[1].name, + ), ) def setUp(self): @@ -57,7 +64,6 @@ class TestProject(identity_fakes.TestIdentityv2): class TestProjectCreate(TestProject): - def setUp(self): super(TestProjectCreate, self).setUp() @@ -88,15 +94,15 @@ class TestProjectCreate(TestProject): 'enabled': True, } self.projects_mock.create.assert_called_with( - self.fake_project.name, - **kwargs + self.fake_project.name, **kwargs ) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) def test_project_create_description(self): arglist = [ - '--description', 'new desc', + '--description', + 'new desc', self.fake_project.name, ] verifylist = [ @@ -116,8 +122,7 @@ class TestProjectCreate(TestProject): 'enabled': True, } self.projects_mock.create.assert_called_with( - self.fake_project.name, - **kwargs + self.fake_project.name, **kwargs ) self.assertEqual(self.columns, columns) @@ -146,8 +151,7 @@ class TestProjectCreate(TestProject): 'enabled': True, } self.projects_mock.create.assert_called_with( - self.fake_project.name, - **kwargs + self.fake_project.name, **kwargs ) self.assertEqual(self.columns, columns) @@ -176,8 +180,7 @@ class TestProjectCreate(TestProject): 'enabled': False, } self.projects_mock.create.assert_called_with( - self.fake_project.name, - **kwargs + self.fake_project.name, **kwargs ) self.assertEqual(self.columns, columns) @@ -185,8 +188,10 @@ class TestProjectCreate(TestProject): def test_project_create_property(self): arglist = [ - '--property', 'fee=fi', - '--property', 'fo=fum', + '--property', + 'fee=fi', + '--property', + 'fo=fum', self.fake_project.name, ] verifylist = [ @@ -208,8 +213,7 @@ class TestProjectCreate(TestProject): 'fo': 'fum', } self.projects_mock.create.assert_called_with( - self.fake_project.name, - **kwargs + self.fake_project.name, **kwargs ) self.assertEqual(self.columns, columns) @@ -248,8 +252,7 @@ class TestProjectCreate(TestProject): 'enabled': True, } self.projects_mock.create.assert_called_with( - self.fake_project.name, - **kwargs + self.fake_project.name, **kwargs ) self.assertEqual(self.columns, columns) @@ -277,8 +280,7 @@ class TestProjectCreate(TestProject): 'enabled': True, } self.projects_mock.create.assert_called_with( - self.fake_project.name, - **kwargs + self.fake_project.name, **kwargs ) self.assertEqual(self.columns, columns) @@ -286,7 +288,6 @@ class TestProjectCreate(TestProject): class TestProjectDelete(TestProject): - def setUp(self): super(TestProjectDelete, self).setUp() @@ -315,8 +316,7 @@ class TestProjectDelete(TestProject): @mock.patch.object(utils, 'find_resource') def test_delete_multi_projects_with_exception(self, find_mock): - find_mock.side_effect = [self.fake_project, - exceptions.CommandError] + find_mock.side_effect = [self.fake_project, exceptions.CommandError] arglist = [ self.fake_project.id, 'unexist_project', @@ -330,8 +330,7 @@ class TestProjectDelete(TestProject): self.cmd.take_action(parsed_args) self.fail('CommandError should be raised.') except exceptions.CommandError as e: - self.assertEqual('1 of 2 projects failed to delete.', - str(e)) + self.assertEqual('1 of 2 projects failed to delete.', str(e)) find_mock.assert_any_call(self.projects_mock, self.fake_project.id) find_mock.assert_any_call(self.projects_mock, 'unexist_project') @@ -341,7 +340,6 @@ class TestProjectDelete(TestProject): class TestProjectList(TestProject): - def setUp(self): super(TestProjectList, self).setUp() @@ -363,10 +361,12 @@ class TestProjectList(TestProject): collist = ('ID', 'Name') self.assertEqual(collist, columns) - datalist = (( - self.fake_project.id, - self.fake_project.name, - ), ) + datalist = ( + ( + self.fake_project.id, + self.fake_project.name, + ), + ) self.assertEqual(datalist, tuple(data)) def test_project_list_long(self): @@ -386,18 +386,23 @@ class TestProjectList(TestProject): collist = ('ID', 'Name', 'Description', 'Enabled') self.assertEqual(collist, columns) - datalist = (( - self.fake_project.id, - self.fake_project.name, - self.fake_project.description, - True, - ), ) + datalist = ( + ( + self.fake_project.id, + self.fake_project.name, + self.fake_project.description, + True, + ), + ) self.assertEqual(datalist, tuple(data)) def test_project_list_sort(self): self.projects_mock.list.return_value = self.fake_projects - arglist = ['--sort', 'name:asc', ] + arglist = [ + '--sort', + 'name:asc', + ] verifylist = [] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -425,7 +430,6 @@ class TestProjectList(TestProject): class TestProjectSet(TestProject): - def setUp(self): super(TestProjectSet, self).setUp() @@ -468,11 +472,13 @@ class TestProjectSet(TestProject): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.assertRaises( - exceptions.CommandError, self.cmd.take_action, parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) def test_project_set_name(self): arglist = [ - '--name', self.fake_project.name, + '--name', + self.fake_project.name, self.fake_project.name, ] verifylist = [ @@ -492,14 +498,14 @@ class TestProjectSet(TestProject): 'tenant_name': self.fake_project.name, } self.projects_mock.update.assert_called_with( - self.fake_project.id, - **kwargs + self.fake_project.id, **kwargs ) self.assertIsNone(result) def test_project_set_description(self): arglist = [ - '--description', self.fake_project.description, + '--description', + self.fake_project.description, self.fake_project.name, ] verifylist = [ @@ -519,8 +525,7 @@ class TestProjectSet(TestProject): 'tenant_name': self.fake_project.name, } self.projects_mock.update.assert_called_with( - self.fake_project.id, - **kwargs + self.fake_project.id, **kwargs ) self.assertIsNone(result) @@ -545,8 +550,7 @@ class TestProjectSet(TestProject): 'tenant_name': self.fake_project.name, } self.projects_mock.update.assert_called_with( - self.fake_project.id, - **kwargs + self.fake_project.id, **kwargs ) self.assertIsNone(result) @@ -571,15 +575,16 @@ class TestProjectSet(TestProject): 'tenant_name': self.fake_project.name, } self.projects_mock.update.assert_called_with( - self.fake_project.id, - **kwargs + self.fake_project.id, **kwargs ) self.assertIsNone(result) def test_project_set_property(self): arglist = [ - '--property', 'fee=fi', - '--property', 'fo=fum', + '--property', + 'fee=fi', + '--property', + 'fo=fum', self.fake_project.name, ] verifylist = [ @@ -599,14 +604,12 @@ class TestProjectSet(TestProject): 'fo': 'fum', } self.projects_mock.update.assert_called_with( - self.fake_project.id, - **kwargs + self.fake_project.id, **kwargs ) self.assertIsNone(result) class TestProjectShow(TestProject): - fake_proj_show = identity_fakes.FakeProject.create_one_project() def setUp(self): @@ -647,7 +650,6 @@ class TestProjectShow(TestProject): class TestProjectUnset(TestProject): - attr = {'fee': 'fi', 'fo': 'fum'} fake_proj = identity_fakes.FakeProject.create_one_project(attr) @@ -674,8 +676,10 @@ class TestProjectUnset(TestProject): def test_project_unset_key(self): arglist = [ - '--property', 'fee', - '--property', 'fo', + '--property', + 'fee', + '--property', + 'fo', self.fake_proj.name, ] verifylist = [ @@ -695,7 +699,6 @@ class TestProjectUnset(TestProject): } self.projects_mock.update.assert_called_with( - self.fake_proj.id, - **kwargs + self.fake_proj.id, **kwargs ) self.assertIsNone(result) diff --git a/openstackclient/tests/unit/identity/v2_0/test_role.py b/openstackclient/tests/unit/identity/v2_0/test_role.py index 423884d9..738982db 100644 --- a/openstackclient/tests/unit/identity/v2_0/test_role.py +++ b/openstackclient/tests/unit/identity/v2_0/test_role.py @@ -24,7 +24,6 @@ from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes class TestRole(identity_fakes.TestIdentityv2): - attr = {} attr['endpoints'] = [ { @@ -64,7 +63,6 @@ class TestRole(identity_fakes.TestIdentityv2): class TestRoleAdd(TestRole): - def setUp(self): super(TestRoleAdd, self).setUp() @@ -80,8 +78,10 @@ class TestRoleAdd(TestRole): def test_role_add(self): arglist = [ - '--project', self.fake_project.name, - '--user', self.fake_user.name, + '--project', + self.fake_project.name, + '--user', + self.fake_user.name, self.fake_role.name, ] verifylist = [ @@ -113,12 +113,8 @@ class TestRoleAdd(TestRole): class TestRoleCreate(TestRole): - fake_role_c = identity_fakes.FakeRole.create_one_role() - columns = ( - 'id', - 'name' - ) + columns = ('id', 'name') datalist = ( fake_role_c.id, fake_role_c.name, @@ -215,7 +211,6 @@ class TestRoleCreate(TestRole): class TestRoleDelete(TestRole): - def setUp(self): super(TestRoleDelete, self).setUp() @@ -243,8 +238,7 @@ class TestRoleDelete(TestRole): @mock.patch.object(utils, 'find_resource') def test_delete_multi_roles_with_exception(self, find_mock): - find_mock.side_effect = [self.fake_role, - exceptions.CommandError] + find_mock.side_effect = [self.fake_role, exceptions.CommandError] arglist = [ self.fake_role.id, 'unexist_role', @@ -258,8 +252,7 @@ class TestRoleDelete(TestRole): self.cmd.take_action(parsed_args) self.fail('CommandError should be raised.') except exceptions.CommandError as e: - self.assertEqual('1 of 2 roles failed to delete.', - str(e)) + self.assertEqual('1 of 2 roles failed to delete.', str(e)) find_mock.assert_any_call(self.roles_mock, self.fake_role.id) find_mock.assert_any_call(self.roles_mock, 'unexist_role') @@ -269,7 +262,6 @@ class TestRoleDelete(TestRole): class TestRoleList(TestRole): - def setUp(self): super(TestRoleList, self).setUp() @@ -292,15 +284,16 @@ class TestRoleList(TestRole): collist = ('ID', 'Name') self.assertEqual(collist, columns) - datalist = (( - self.fake_role.id, - self.fake_role.name, - ), ) + datalist = ( + ( + self.fake_role.id, + self.fake_role.name, + ), + ) self.assertEqual(datalist, tuple(data)) class TestRoleRemove(TestRole): - def setUp(self): super(TestRoleRemove, self).setUp() @@ -316,8 +309,10 @@ class TestRoleRemove(TestRole): def test_role_remove(self): arglist = [ - '--project', self.fake_project.name, - '--user', self.fake_user.name, + '--project', + self.fake_project.name, + '--user', + self.fake_user.name, self.fake_role.name, ] verifylist = [ @@ -339,7 +334,6 @@ class TestRoleRemove(TestRole): class TestRoleShow(TestRole): - def setUp(self): super(TestRoleShow, self).setUp() diff --git a/openstackclient/tests/unit/identity/v2_0/test_role_assignment.py b/openstackclient/tests/unit/identity/v2_0/test_role_assignment.py index 3e1231aa..248f689e 100644 --- a/openstackclient/tests/unit/identity/v2_0/test_role_assignment.py +++ b/openstackclient/tests/unit/identity/v2_0/test_role_assignment.py @@ -22,13 +22,11 @@ from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes class TestRoleAssignment(identity_fakes.TestIdentityv2): - def setUp(self): super(TestRoleAssignment, self).setUp() class TestRoleAssignmentList(TestRoleAssignment): - columns = ( 'Role', 'User', @@ -74,7 +72,6 @@ class TestRoleAssignmentList(TestRoleAssignment): self.cmd = role_assignment.ListRoleAssignment(self.app, None) def test_role_assignment_list_no_filters(self): - arglist = [] verifylist = [] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -87,9 +84,9 @@ class TestRoleAssignmentList(TestRoleAssignment): ) def test_role_assignment_list_only_project_filter(self): - arglist = [ - '--project', identity_fakes.project_name, + '--project', + identity_fakes.project_name, ] verifylist = [ ('project', identity_fakes.project_name), @@ -104,9 +101,9 @@ class TestRoleAssignmentList(TestRoleAssignment): ) def test_role_assignment_list_only_user_filter(self): - arglist = [ - '--user', identity_fakes.user_name, + '--user', + identity_fakes.user_name, ] verifylist = [ ('user', identity_fakes.user_name), @@ -121,25 +118,24 @@ class TestRoleAssignmentList(TestRoleAssignment): ) def test_role_assignment_list_project_and_user(self): - self.roles_mock.roles_for_user.return_value = [ fakes.FakeResource( None, - copy.deepcopy( - identity_fakes.ROLE), + copy.deepcopy(identity_fakes.ROLE), loaded=True, ), fakes.FakeResource( None, - copy.deepcopy( - identity_fakes.ROLE_2), + copy.deepcopy(identity_fakes.ROLE_2), loaded=True, ), ] arglist = [ - '--project', identity_fakes.project_name, - '--user', identity_fakes.user_name, + '--project', + identity_fakes.project_name, + '--user', + identity_fakes.user_name, ] verifylist = [ ('user', identity_fakes.user_name), @@ -158,18 +154,21 @@ class TestRoleAssignmentList(TestRoleAssignment): ) self.assertEqual(self.columns, columns) - datalist = (( - identity_fakes.role_id, - identity_fakes.user_id, - identity_fakes.project_id, - ), (identity_fakes.ROLE_2['id'], - identity_fakes.user_id, - identity_fakes.project_id, - ),) + datalist = ( + ( + identity_fakes.role_id, + identity_fakes.user_id, + identity_fakes.project_id, + ), + ( + identity_fakes.ROLE_2['id'], + identity_fakes.user_id, + identity_fakes.project_id, + ), + ) self.assertEqual(datalist, tuple(data)) def test_role_assignment_list_def_creds(self): - auth_ref = self.app.client_manager.auth_ref = mock.Mock() auth_ref.project_id.return_value = identity_fakes.project_id auth_ref.user_id.return_value = identity_fakes.user_id @@ -177,14 +176,12 @@ class TestRoleAssignmentList(TestRoleAssignment): self.roles_mock.roles_for_user.return_value = [ fakes.FakeResource( None, - copy.deepcopy( - identity_fakes.ROLE), + copy.deepcopy(identity_fakes.ROLE), loaded=True, ), fakes.FakeResource( None, - copy.deepcopy( - identity_fakes.ROLE_2), + copy.deepcopy(identity_fakes.ROLE_2), loaded=True, ), ] @@ -210,37 +207,40 @@ class TestRoleAssignmentList(TestRoleAssignment): ) self.assertEqual(self.columns, columns) - datalist = (( - identity_fakes.role_id, - identity_fakes.user_id, - identity_fakes.project_id, - ), (identity_fakes.ROLE_2['id'], - identity_fakes.user_id, - identity_fakes.project_id, - ),) + datalist = ( + ( + identity_fakes.role_id, + identity_fakes.user_id, + identity_fakes.project_id, + ), + ( + identity_fakes.ROLE_2['id'], + identity_fakes.user_id, + identity_fakes.project_id, + ), + ) self.assertEqual(datalist, tuple(data)) def test_role_assignment_list_by_name_project_and_user(self): - self.roles_mock.roles_for_user.return_value = [ fakes.FakeResource( None, - copy.deepcopy( - identity_fakes.ROLE), + copy.deepcopy(identity_fakes.ROLE), loaded=True, ), fakes.FakeResource( None, - copy.deepcopy( - identity_fakes.ROLE_2), + copy.deepcopy(identity_fakes.ROLE_2), loaded=True, ), ] arglist = [ - '--project', identity_fakes.project_name, - '--user', identity_fakes.user_name, - '--names' + '--project', + identity_fakes.project_name, + '--user', + identity_fakes.user_name, + '--names', ] verifylist = [ ('user', identity_fakes.user_name), @@ -260,12 +260,16 @@ class TestRoleAssignmentList(TestRoleAssignment): ) self.assertEqual(self.columns, columns) - datalist = (( - identity_fakes.role_name, - identity_fakes.user_name, - identity_fakes.project_name, - ), (identity_fakes.ROLE_2['name'], - identity_fakes.user_name, - identity_fakes.project_name, - ),) + datalist = ( + ( + identity_fakes.role_name, + identity_fakes.user_name, + identity_fakes.project_name, + ), + ( + identity_fakes.ROLE_2['name'], + identity_fakes.user_name, + identity_fakes.project_name, + ), + ) self.assertEqual(datalist, tuple(data)) diff --git a/openstackclient/tests/unit/identity/v2_0/test_service.py b/openstackclient/tests/unit/identity/v2_0/test_service.py index 6c4374ef..844f395b 100644 --- a/openstackclient/tests/unit/identity/v2_0/test_service.py +++ b/openstackclient/tests/unit/identity/v2_0/test_service.py @@ -32,7 +32,6 @@ class TestService(identity_fakes.TestIdentityv2): class TestServiceCreate(TestService): - fake_service_c = identity_fakes.FakeService.create_one_service() columns = ( 'description', @@ -83,7 +82,8 @@ class TestServiceCreate(TestService): def test_service_create_with_name_option(self): arglist = [ - '--name', self.fake_service_c.name, + '--name', + self.fake_service_c.name, self.fake_service_c.type, ] verifylist = [ @@ -110,8 +110,10 @@ class TestServiceCreate(TestService): def test_service_create_description(self): arglist = [ - '--name', self.fake_service_c.name, - '--description', self.fake_service_c.description, + '--name', + self.fake_service_c.name, + '--description', + self.fake_service_c.description, self.fake_service_c.type, ] verifylist = [ @@ -138,7 +140,6 @@ class TestServiceCreate(TestService): class TestServiceDelete(TestService): - def setUp(self): super(TestServiceDelete, self).setUp() @@ -167,7 +168,6 @@ class TestServiceDelete(TestService): class TestServiceList(TestService): - def setUp(self): super(TestServiceList, self).setUp() @@ -190,11 +190,13 @@ class TestServiceList(TestService): collist = ('ID', 'Name', 'Type') self.assertEqual(collist, columns) - datalist = (( - self.fake_service.id, - self.fake_service.name, - self.fake_service.type, - ), ) + datalist = ( + ( + self.fake_service.id, + self.fake_service.name, + self.fake_service.type, + ), + ) self.assertEqual(datalist, tuple(data)) def test_service_list_long(self): @@ -215,17 +217,18 @@ class TestServiceList(TestService): collist = ('ID', 'Name', 'Type', 'Description') self.assertEqual(collist, columns) - datalist = (( - self.fake_service.id, - self.fake_service.name, - self.fake_service.type, - self.fake_service.description, - ), ) + datalist = ( + ( + self.fake_service.id, + self.fake_service.name, + self.fake_service.type, + self.fake_service.description, + ), + ) self.assertEqual(datalist, tuple(data)) class TestServiceShow(TestService): - fake_service_s = identity_fakes.FakeService.create_one_service() def setUp(self): @@ -282,4 +285,6 @@ class TestServiceShow(TestService): except exceptions.CommandError as e: self.assertEqual( "Multiple service matches found for 'nounique_service'," - " use an ID to be more specific.", str(e)) + " use an ID to be more specific.", + str(e), + ) diff --git a/openstackclient/tests/unit/identity/v2_0/test_token.py b/openstackclient/tests/unit/identity/v2_0/test_token.py index c079ce67..33cb0d9c 100644 --- a/openstackclient/tests/unit/identity/v2_0/test_token.py +++ b/openstackclient/tests/unit/identity/v2_0/test_token.py @@ -20,7 +20,6 @@ from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes class TestToken(identity_fakes.TestIdentityv2): - fake_user = identity_fakes.FakeUser.create_one_user() fake_project = identity_fakes.FakeProject.create_one_project() @@ -33,7 +32,6 @@ class TestToken(identity_fakes.TestIdentityv2): class TestTokenIssue(TestToken): - def setUp(self): super(TestTokenIssue, self).setUp() @@ -94,7 +92,6 @@ class TestTokenIssue(TestToken): class TestTokenRevoke(TestToken): - TOKEN = 'fob' def setUp(self): diff --git a/openstackclient/tests/unit/identity/v2_0/test_user.py b/openstackclient/tests/unit/identity/v2_0/test_user.py index c3f5f1d7..a8baf61a 100644 --- a/openstackclient/tests/unit/identity/v2_0/test_user.py +++ b/openstackclient/tests/unit/identity/v2_0/test_user.py @@ -24,7 +24,6 @@ from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes class TestUser(identity_fakes.TestIdentityv2): - fake_project = identity_fakes.FakeProject.create_one_project() attr = { 'tenantId': fake_project.id, @@ -44,7 +43,6 @@ class TestUser(identity_fakes.TestIdentityv2): class TestUserCreate(TestUser): - fake_project_c = identity_fakes.FakeProject.create_one_project() attr = { 'tenantId': fake_project_c.id, @@ -99,10 +97,7 @@ class TestUserCreate(TestUser): } # UserManager.create(name, password, email, tenant_id=, enabled=) self.users_mock.create.assert_called_with( - self.fake_user_c.name, - None, - None, - **kwargs + self.fake_user_c.name, None, None, **kwargs ) self.assertEqual(self.columns, columns) @@ -110,13 +105,14 @@ class TestUserCreate(TestUser): def test_user_create_password(self): arglist = [ - '--password', 'secret', + '--password', + 'secret', self.fake_user_c.name, ] verifylist = [ ('name', self.fake_user_c.name), ('password_prompt', False), - ('password', 'secret') + ('password', 'secret'), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -132,10 +128,7 @@ class TestUserCreate(TestUser): } # UserManager.create(name, password, email, tenant_id=, enabled=) self.users_mock.create.assert_called_with( - self.fake_user_c.name, - 'secret', - None, - **kwargs + self.fake_user_c.name, 'secret', None, **kwargs ) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -147,7 +140,7 @@ class TestUserCreate(TestUser): ] verifylist = [ ('name', self.fake_user_c.name), - ('password_prompt', True) + ('password_prompt', True), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -166,10 +159,7 @@ class TestUserCreate(TestUser): } # UserManager.create(name, password, email, tenant_id=, enabled=) self.users_mock.create.assert_called_with( - self.fake_user_c.name, - 'abc123', - None, - **kwargs + self.fake_user_c.name, 'abc123', None, **kwargs ) self.assertEqual(self.columns, columns) @@ -177,7 +167,8 @@ class TestUserCreate(TestUser): def test_user_create_email(self): arglist = [ - '--email', 'barney@example.com', + '--email', + 'barney@example.com', self.fake_user_c.name, ] verifylist = [ @@ -198,10 +189,7 @@ class TestUserCreate(TestUser): } # UserManager.create(name, password, email, tenant_id=, enabled=) self.users_mock.create.assert_called_with( - self.fake_user_c.name, - None, - 'barney@example.com', - **kwargs + self.fake_user_c.name, None, 'barney@example.com', **kwargs ) self.assertEqual(self.columns, columns) @@ -219,7 +207,8 @@ class TestUserCreate(TestUser): self.users_mock.create.return_value = user_2 arglist = [ - '--project', self.fake_project_c.name, + '--project', + self.fake_project_c.name, user_2.name, ] verifylist = [ @@ -240,10 +229,7 @@ class TestUserCreate(TestUser): } # UserManager.create(name, password, email, tenant_id=, enabled=) self.users_mock.create.assert_called_with( - user_2.name, - None, - None, - **kwargs + user_2.name, None, None, **kwargs ) self.assertEqual(self.columns, columns) @@ -280,10 +266,7 @@ class TestUserCreate(TestUser): } # UserManager.create(name, password, email, tenant_id=, enabled=) self.users_mock.create.assert_called_with( - self.fake_user_c.name, - None, - None, - **kwargs + self.fake_user_c.name, None, None, **kwargs ) self.assertEqual(self.columns, columns) @@ -313,10 +296,7 @@ class TestUserCreate(TestUser): } # UserManager.create(name, password, email, tenant_id=, enabled=) self.users_mock.create.assert_called_with( - self.fake_user_c.name, - None, - None, - **kwargs + self.fake_user_c.name, None, None, **kwargs ) self.assertEqual(self.columns, columns) @@ -375,17 +355,13 @@ class TestUserCreate(TestUser): } # UserManager.create(name, password, email, tenant_id=, enabled=) self.users_mock.create.assert_called_with( - self.fake_user_c.name, - None, - None, - **kwargs + self.fake_user_c.name, None, None, **kwargs ) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) class TestUserDelete(TestUser): - def setUp(self): super(TestUserDelete, self).setUp() @@ -414,8 +390,7 @@ class TestUserDelete(TestUser): @mock.patch.object(utils, 'find_resource') def test_delete_multi_users_with_exception(self, find_mock): - find_mock.side_effect = [self.fake_user, - exceptions.CommandError] + find_mock.side_effect = [self.fake_user, exceptions.CommandError] arglist = [ self.fake_user.id, 'unexist_user', @@ -429,8 +404,7 @@ class TestUserDelete(TestUser): self.cmd.take_action(parsed_args) self.fail('CommandError should be raised.') except exceptions.CommandError as e: - self.assertEqual('1 of 2 users failed to delete.', - str(e)) + self.assertEqual('1 of 2 users failed to delete.', str(e)) find_mock.assert_any_call(self.users_mock, self.fake_user.id) find_mock.assert_any_call(self.users_mock, 'unexist_user') @@ -440,7 +414,6 @@ class TestUserDelete(TestUser): class TestUserList(TestUser): - fake_project_l = identity_fakes.FakeProject.create_one_project() attr = { 'tenantId': fake_project_l.id, @@ -486,7 +459,8 @@ class TestUserList(TestUser): def test_user_list_project(self): arglist = [ - '--project', self.fake_project_l.id, + '--project', + self.fake_project_l.id, ] verifylist = [ ('project', self.fake_project_l.id), @@ -522,20 +496,22 @@ class TestUserList(TestUser): collist = ('ID', 'Name', 'Project', 'Email', 'Enabled') self.assertEqual(collist, columns) - datalist = (( - self.fake_user_l.id, - self.fake_user_l.name, - user.ProjectColumn( - self.fake_project_l.id, - {self.fake_project_l.id: self.fake_project_l}), - self.fake_user_l.email, - True, - ), ) + datalist = ( + ( + self.fake_user_l.id, + self.fake_user_l.name, + user.ProjectColumn( + self.fake_project_l.id, + {self.fake_project_l.id: self.fake_project_l}, + ), + self.fake_user_l.email, + True, + ), + ) self.assertCountEqual(datalist, tuple(data)) class TestUserSet(TestUser): - def setUp(self): super(TestUserSet, self).setUp() @@ -583,11 +559,13 @@ class TestUserSet(TestUser): parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.assertRaises( - exceptions.CommandError, self.cmd.take_action, parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) def test_user_set_name(self): arglist = [ - '--name', 'qwerty', + '--name', + 'qwerty', self.fake_user.name, ] verifylist = [ @@ -609,15 +587,13 @@ class TestUserSet(TestUser): 'name': 'qwerty', } # UserManager.update(user, **kwargs) - self.users_mock.update.assert_called_with( - self.fake_user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.fake_user.id, **kwargs) self.assertIsNone(result) def test_user_set_password(self): arglist = [ - '--password', 'secret', + '--password', + 'secret', self.fake_user.name, ] verifylist = [ @@ -672,7 +648,8 @@ class TestUserSet(TestUser): def test_user_set_email(self): arglist = [ - '--email', 'barney@example.com', + '--email', + 'barney@example.com', self.fake_user.name, ] verifylist = [ @@ -694,15 +671,13 @@ class TestUserSet(TestUser): 'enabled': True, } # UserManager.update(user, **kwargs) - self.users_mock.update.assert_called_with( - self.fake_user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.fake_user.id, **kwargs) self.assertIsNone(result) def test_user_set_project(self): arglist = [ - '--project', self.fake_project.id, + '--project', + self.fake_project.id, self.fake_user.name, ] verifylist = [ @@ -748,10 +723,7 @@ class TestUserSet(TestUser): 'enabled': True, } # UserManager.update(user, **kwargs) - self.users_mock.update.assert_called_with( - self.fake_user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.fake_user.id, **kwargs) self.assertIsNone(result) def test_user_set_disable(self): @@ -777,15 +749,11 @@ class TestUserSet(TestUser): 'enabled': False, } # UserManager.update(user, **kwargs) - self.users_mock.update.assert_called_with( - self.fake_user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.fake_user.id, **kwargs) self.assertIsNone(result) class TestUserShow(TestUser): - def setUp(self): super(TestUserShow, self).setUp() diff --git a/openstackclient/tests/unit/identity/v3/fakes.py b/openstackclient/tests/unit/identity/v3/fakes.py index 58d5d14d..0626df87 100644 --- a/openstackclient/tests/unit/identity/v3/fakes.py +++ b/openstackclient/tests/unit/identity/v3/fakes.py @@ -58,55 +58,24 @@ EMPLOYEE_GROUP_ID = "0cd5e9" DEVELOPER_GROUP_ID = "xyz" MAPPING_RULES = [ { - "local": [ - { - "group": { - "id": EMPLOYEE_GROUP_ID - } - } - ], + "local": [{"group": {"id": EMPLOYEE_GROUP_ID}}], "remote": [ - { - "type": "orgPersonType", - "not_any_of": [ - "Contractor", - "Guest" - ] - } - ] + {"type": "orgPersonType", "not_any_of": ["Contractor", "Guest"]} + ], } ] MAPPING_RULES_2 = [ { - "local": [ - { - "group": { - "id": DEVELOPER_GROUP_ID - } - } - ], - "remote": [ - { - "type": "orgPersonType", - "any_one_of": [ - "Contractor" - ] - } - ] + "local": [{"group": {"id": DEVELOPER_GROUP_ID}}], + "remote": [{"type": "orgPersonType", "any_one_of": ["Contractor"]}], } ] -MAPPING_RESPONSE = { - "id": mapping_id, - "rules": MAPPING_RULES -} +MAPPING_RESPONSE = {"id": mapping_id, "rules": MAPPING_RULES} -MAPPING_RESPONSE_2 = { - "id": mapping_id, - "rules": MAPPING_RULES_2 -} +MAPPING_RESPONSE_2 = {"id": mapping_id, "rules": MAPPING_RULES_2} mfa_opt1 = 'password,totp' mfa_opt2 = 'password' @@ -270,7 +239,7 @@ USER = { trust_id = 't-456' trust_expires = None trust_impersonation = False -trust_roles = {"id": role_id, "name": role_name}, +trust_roles = ({"id": role_id, "name": role_name},) TRUST = { 'expires_at': trust_expires, @@ -327,32 +296,31 @@ mapping_id_updated = 'prod_mapping' sp_id = 'BETA' sp_description = 'Service Provider to burst into' service_provider_url = 'https://beta.example.com/Shibboleth.sso/POST/SAML' -sp_auth_url = ('https://beta.example.com/v3/OS-FEDERATION/identity_providers/' - 'idp/protocol/saml2/auth') +sp_auth_url = ( + 'https://beta.example.com/v3/OS-FEDERATION/identity_providers/' + 'idp/protocol/saml2/auth' +) SERVICE_PROVIDER = { 'id': sp_id, 'enabled': True, 'description': sp_description, 'sp_url': service_provider_url, - 'auth_url': sp_auth_url + 'auth_url': sp_auth_url, } -PROTOCOL_ID_MAPPING = { - 'id': protocol_id, - 'mapping': mapping_id -} +PROTOCOL_ID_MAPPING = {'id': protocol_id, 'mapping': mapping_id} PROTOCOL_OUTPUT = { 'id': protocol_id, 'mapping_id': mapping_id, - 'identity_provider': idp_id + 'identity_provider': idp_id, } PROTOCOL_OUTPUT_UPDATED = { 'id': protocol_id, 'mapping_id': mapping_id_updated, - 'identity_provider': idp_id + 'identity_provider': idp_id, } # Assignments @@ -366,22 +334,24 @@ ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID = { ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID_INCLUDE_NAMES = { 'scope': { 'project': { - 'domain': {'id': domain_id, - 'name': domain_name}, + 'domain': {'id': domain_id, 'name': domain_name}, 'id': project_id, - 'name': project_name}}, + 'name': project_name, + } + }, 'user': { - 'domain': {'id': domain_id, - 'name': domain_name}, + 'domain': {'id': domain_id, 'name': domain_name}, 'id': user_id, - 'name': user_name}, - 'role': {'id': role_id, - 'name': role_name}, + 'name': user_name, + }, + 'role': {'id': role_id, 'name': role_name}, } ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID_INHERITED = { - 'scope': {'project': {'id': project_id}, - 'OS-INHERIT:inherited_to': 'projects'}, + 'scope': { + 'project': {'id': project_id}, + 'OS-INHERIT:inherited_to': 'projects', + }, 'user': {'id': user_id}, 'role': {'id': role_id}, } @@ -405,21 +375,20 @@ ASSIGNMENT_WITH_DOMAIN_ROLE = { } ASSIGNMENT_WITH_DOMAIN_ID_AND_USER_ID_INCLUDE_NAMES = { - 'scope': { - 'domain': {'id': domain_id, - 'name': domain_name}}, + 'scope': {'domain': {'id': domain_id, 'name': domain_name}}, 'user': { - 'domain': {'id': domain_id, - 'name': domain_name}, + 'domain': {'id': domain_id, 'name': domain_name}, 'id': user_id, - 'name': user_name}, - 'role': {'id': role_id, - 'name': role_name}, + 'name': user_name, + }, + 'role': {'id': role_id, 'name': role_name}, } ASSIGNMENT_WITH_DOMAIN_ID_AND_USER_ID_INHERITED = { - 'scope': {'domain': {'id': domain_id}, - 'OS-INHERIT:inherited_to': 'projects'}, + 'scope': { + 'domain': {'id': domain_id}, + 'OS-INHERIT:inherited_to': 'projects', + }, 'user': {'id': user_id}, 'role': {'id': role_id}, } @@ -437,7 +406,7 @@ consumer_secret = 'test consumer secret' OAUTH_CONSUMER = { 'id': consumer_id, 'secret': consumer_secret, - 'description': consumer_description + 'description': consumer_description, } access_token_id = 'test access token id' @@ -448,7 +417,7 @@ OAUTH_ACCESS_TOKEN = { 'id': access_token_id, 'expires': access_token_expires, 'key': access_token_id, - 'secret': access_token_secret + 'secret': access_token_secret, } request_token_id = 'test request token id' @@ -459,17 +428,15 @@ OAUTH_REQUEST_TOKEN = { 'id': request_token_id, 'expires': request_token_expires, 'key': request_token_id, - 'secret': request_token_secret + 'secret': request_token_secret, } oauth_verifier_pin = '6d74XaDS' -OAUTH_VERIFIER = { - 'oauth_verifier': oauth_verifier_pin -} +OAUTH_VERIFIER = {'oauth_verifier': oauth_verifier_pin} app_cred_id = 'app-cred-id' app_cred_name = 'testing_app_cred' -app_cred_role = {"id": role_id, "name": role_name, "domain": None}, +app_cred_role = ({"id": role_id, "name": role_name, "domain": None},) app_cred_description = 'app credential for testing' app_cred_expires = datetime.datetime(2022, 1, 1, 0, 0) app_cred_expires_str = app_cred_expires.strftime('%Y-%m-%dT%H:%M:%S%z') @@ -491,7 +458,7 @@ APP_CRED_BASIC = { 'expires_at': None, 'unrestricted': False, 'secret': app_cred_secret, - 'access_rules': None + 'access_rules': None, } APP_CRED_OPTIONS = { 'id': app_cred_id, @@ -519,7 +486,7 @@ APP_CRED_ACCESS_RULES = { 'expires_at': None, 'unrestricted': False, 'secret': app_cred_secret, - 'access_rules': app_cred_access_rules + 'access_rules': app_cred_access_rules, } registered_limit_id = 'registered-limit-id' @@ -532,7 +499,7 @@ REGISTERED_LIMIT = { 'resource_name': registered_limit_resource_name, 'service_id': service_id, 'description': None, - 'region_id': None + 'region_id': None, } REGISTERED_LIMIT_OPTIONS = { 'id': registered_limit_id, @@ -540,7 +507,7 @@ REGISTERED_LIMIT_OPTIONS = { 'resource_name': registered_limit_resource_name, 'service_id': service_id, 'description': registered_limit_description, - 'region_id': region_id + 'region_id': region_id, } limit_id = 'limit-id' @@ -554,7 +521,7 @@ LIMIT = { 'resource_name': limit_resource_name, 'service_id': service_id, 'description': None, - 'region_id': None + 'region_id': None, } LIMIT_OPTIONS = { 'id': limit_id, @@ -563,7 +530,7 @@ LIMIT_OPTIONS = { 'resource_name': limit_resource_name, 'service_id': service_id, 'description': limit_description, - 'region_id': region_id + 'region_id': region_id, } @@ -598,7 +565,6 @@ def fake_auth_ref(fake_token, fake_service=None): class FakeAuth(object): - def __init__(self, auth_method_class=None): self._auth_method_class = auth_method_class @@ -607,13 +573,11 @@ class FakeAuth(object): class FakeSession(object): - def __init__(self, **kwargs): self.auth = FakeAuth() class FakeIdentityv3Client(object): - def __init__(self, **kwargs): self.domains = mock.Mock() self.domains.resource_class = fakes.FakeResource(None, {}) @@ -638,8 +602,9 @@ class FakeIdentityv3Client(object): self.services = mock.Mock() self.services.resource_class = fakes.FakeResource(None, {}) self.session = mock.Mock() - self.session.auth.auth_ref.service_catalog.resource_class = \ + self.session.auth.auth_ref.service_catalog.resource_class = ( fakes.FakeResource(None, {}) + ) self.tokens = mock.Mock() self.tokens.resource_class = fakes.FakeResource(None, {}) self.trusts = mock.Mock() @@ -654,8 +619,9 @@ class FakeIdentityv3Client(object): self.auth.client = mock.Mock() self.auth.client.resource_class = fakes.FakeResource(None, {}) self.application_credentials = mock.Mock() - self.application_credentials.resource_class = fakes.FakeResource(None, - {}) + self.application_credentials.resource_class = fakes.FakeResource( + None, {} + ) self.access_rules = mock.Mock() self.access_rules.resource_class = fakes.FakeResource(None, {}) self.inference_rules = mock.Mock() @@ -667,7 +633,6 @@ class FakeIdentityv3Client(object): class FakeFederationManager(object): - def __init__(self, **kwargs): self.identity_providers = mock.Mock() self.identity_providers.resource_class = fakes.FakeResource(None, {}) @@ -684,14 +649,12 @@ class FakeFederationManager(object): class FakeFederatedClient(FakeIdentityv3Client): - def __init__(self, **kwargs): super(FakeFederatedClient, self).__init__(**kwargs) self.federation = FakeFederationManager() class FakeOAuth1Client(FakeIdentityv3Client): - def __init__(self, **kwargs): super(FakeOAuth1Client, self).__init__(**kwargs) @@ -704,7 +667,6 @@ class FakeOAuth1Client(FakeIdentityv3Client): class TestIdentityv3(utils.TestCommand): - def setUp(self): super(TestIdentityv3, self).setUp() @@ -715,24 +677,20 @@ class TestIdentityv3(utils.TestCommand): class TestFederatedIdentity(utils.TestCommand): - def setUp(self): super(TestFederatedIdentity, self).setUp() self.app.client_manager.identity = FakeFederatedClient( - endpoint=fakes.AUTH_URL, - token=fakes.AUTH_TOKEN + endpoint=fakes.AUTH_URL, token=fakes.AUTH_TOKEN ) class TestOAuth1(utils.TestCommand): - def setUp(self): super(TestOAuth1, self).setUp() self.app.client_manager.identity = FakeOAuth1Client( - endpoint=fakes.AUTH_URL, - token=fakes.AUTH_TOKEN + endpoint=fakes.AUTH_URL, token=fakes.AUTH_TOKEN ) @@ -765,8 +723,9 @@ class FakeProject(object): } project_info.update(attrs) - project = fakes.FakeResource(info=copy.deepcopy(project_info), - loaded=True) + project = fakes.FakeResource( + info=copy.deepcopy(project_info), loaded=True + ) return project @staticmethod @@ -813,8 +772,9 @@ class FakeDomain(object): } domain_info.update(attrs) - domain = fakes.FakeResource(info=copy.deepcopy(domain_info), - loaded=True) + domain = fakes.FakeResource( + info=copy.deepcopy(domain_info), loaded=True + ) return domain @@ -845,7 +805,8 @@ class FakeCredential(object): credential_info.update(attrs) credential = fakes.FakeResource( - info=copy.deepcopy(credential_info), loaded=True) + info=copy.deepcopy(credential_info), loaded=True + ) return credential @staticmethod @@ -914,8 +875,7 @@ class FakeUser(object): } user_info.update(attrs) - user = fakes.FakeResource(info=copy.deepcopy(user_info), - loaded=True) + user = fakes.FakeResource(info=copy.deepcopy(user_info), loaded=True) return user @staticmethod @@ -982,8 +942,7 @@ class FakeGroup(object): } group_info.update(attrs) - group = fakes.FakeResource(info=copy.deepcopy(group_info), - loaded=True) + group = fakes.FakeResource(info=copy.deepcopy(group_info), loaded=True) return group @staticmethod @@ -1052,8 +1011,9 @@ class FakeEndpoint(object): } endpoint_info.update(attrs) - endpoint = fakes.FakeResource(info=copy.deepcopy(endpoint_info), - loaded=True) + endpoint = fakes.FakeResource( + info=copy.deepcopy(endpoint_info), loaded=True + ) return endpoint @staticmethod @@ -1076,8 +1036,7 @@ class FakeEndpoint(object): # Overwrite default attributes if there are some attributes set endpoint_filter_info.update(attrs) - endpoint_filter = fakes.FakeModel( - copy.deepcopy(endpoint_filter_info)) + endpoint_filter = fakes.FakeModel(copy.deepcopy(endpoint_filter_info)) return endpoint_filter @@ -1110,8 +1069,9 @@ class FakeEndpointGroup(object): } endpointgroup_info.update(attrs) - endpoint = fakes.FakeResource(info=copy.deepcopy(endpointgroup_info), - loaded=True) + endpoint = fakes.FakeResource( + info=copy.deepcopy(endpointgroup_info), loaded=True + ) return endpoint @staticmethod @@ -1135,7 +1095,8 @@ class FakeEndpointGroup(object): endpointgroup_filter_info.update(attrs) endpointgroup_filter = fakes.FakeModel( - copy.deepcopy(endpointgroup_filter_info)) + copy.deepcopy(endpointgroup_filter_info) + ) return endpointgroup_filter @@ -1166,8 +1127,9 @@ class FakeService(object): } service_info.update(attrs) - service = fakes.FakeResource(info=copy.deepcopy(service_info), - loaded=True) + service = fakes.FakeResource( + info=copy.deepcopy(service_info), loaded=True + ) return service @@ -1195,13 +1157,15 @@ class FakeRoleAssignment(object): role_assignment_info.update(attrs) role_assignment = fakes.FakeResource( - info=copy.deepcopy(role_assignment_info), loaded=True) + info=copy.deepcopy(role_assignment_info), loaded=True + ) return role_assignment class FakeImpliedRoleResponse(object): """Fake one or more role assignment.""" + def __init__(self, prior_role, implied_roles): self.prior_role = prior_role self.implies = [role for role in implied_roles] @@ -1215,8 +1179,6 @@ class FakeImpliedRoleResponse(object): """ # set default attributes. - implied_roles = [ - FakeImpliedRoleResponse(ROLES[0], [ROLES[1]]) - ] + implied_roles = [FakeImpliedRoleResponse(ROLES[0], [ROLES[1]])] return implied_roles diff --git a/openstackclient/tests/unit/identity/v3/test_access_rule.py b/openstackclient/tests/unit/identity/v3/test_access_rule.py index 904fe323..3727dcfe 100644 --- a/openstackclient/tests/unit/identity/v3/test_access_rule.py +++ b/openstackclient/tests/unit/identity/v3/test_access_rule.py @@ -25,7 +25,6 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes class TestAccessRule(identity_fakes.TestIdentityv3): - def setUp(self): super(TestAccessRule, self).setUp() @@ -37,7 +36,6 @@ class TestAccessRule(identity_fakes.TestIdentityv3): class TestAccessRuleDelete(TestAccessRule): - def setUp(self): super(TestAccessRuleDelete, self).setUp() @@ -50,16 +48,13 @@ class TestAccessRuleDelete(TestAccessRule): self.access_rules_mock.delete.return_value = None # Get the command object to test - self.cmd = access_rule.DeleteAccessRule( - self.app, None) + self.cmd = access_rule.DeleteAccessRule(self.app, None) def test_access_rule_delete(self): arglist = [ identity_fakes.access_rule_id, ] - verifylist = [ - ('access_rule', [identity_fakes.access_rule_id]) - ] + verifylist = [('access_rule', [identity_fakes.access_rule_id])] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) @@ -71,8 +66,10 @@ class TestAccessRuleDelete(TestAccessRule): @mock.patch.object(utils, 'find_resource') def test_delete_multi_access_rules_with_exception(self, find_mock): - find_mock.side_effect = [self.access_rules_mock.get.return_value, - exceptions.CommandError] + find_mock.side_effect = [ + self.access_rules_mock.get.return_value, + exceptions.CommandError, + ] arglist = [ identity_fakes.access_rule_id, 'nonexistent_access_rule', @@ -86,21 +83,24 @@ class TestAccessRuleDelete(TestAccessRule): self.cmd.take_action(parsed_args) self.fail('CommandError should be raised.') except exceptions.CommandError as e: - self.assertEqual('1 of 2 access rules failed to' - ' delete.', str(e)) + self.assertEqual( + '1 of 2 access rules failed to' ' delete.', str(e) + ) - find_mock.assert_any_call(self.access_rules_mock, - identity_fakes.access_rule_id) - find_mock.assert_any_call(self.access_rules_mock, - 'nonexistent_access_rule') + find_mock.assert_any_call( + self.access_rules_mock, identity_fakes.access_rule_id + ) + find_mock.assert_any_call( + self.access_rules_mock, 'nonexistent_access_rule' + ) self.assertEqual(2, find_mock.call_count) self.access_rules_mock.delete.assert_called_once_with( - identity_fakes.access_rule_id) + identity_fakes.access_rule_id + ) class TestAccessRuleList(TestAccessRule): - def setUp(self): super(TestAccessRuleList, self).setUp() @@ -126,17 +126,18 @@ class TestAccessRuleList(TestAccessRule): collist = ('ID', 'Service', 'Method', 'Path') self.assertEqual(collist, columns) - datalist = (( - identity_fakes.access_rule_id, - identity_fakes.access_rule_service, - identity_fakes.access_rule_method, - identity_fakes.access_rule_path, - ), ) + datalist = ( + ( + identity_fakes.access_rule_id, + identity_fakes.access_rule_service, + identity_fakes.access_rule_method, + identity_fakes.access_rule_path, + ), + ) self.assertEqual(datalist, tuple(data)) class TestAccessRuleShow(TestAccessRule): - def setUp(self): super(TestAccessRuleShow, self).setUp() @@ -161,7 +162,8 @@ class TestAccessRuleShow(TestAccessRule): columns, data = self.cmd.take_action(parsed_args) self.access_rules_mock.get.assert_called_with( - identity_fakes.access_rule_id) + identity_fakes.access_rule_id + ) collist = ('id', 'method', 'path', 'service') self.assertEqual(collist, columns) diff --git a/openstackclient/tests/unit/identity/v3/test_application_credential.py b/openstackclient/tests/unit/identity/v3/test_application_credential.py index 24bafc9f..68ed750d 100644 --- a/openstackclient/tests/unit/identity/v3/test_application_credential.py +++ b/openstackclient/tests/unit/identity/v3/test_application_credential.py @@ -26,7 +26,6 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes class TestApplicationCredential(identity_fakes.TestIdentityv3): - def setUp(self): super(TestApplicationCredential, self).setUp() @@ -38,7 +37,6 @@ class TestApplicationCredential(identity_fakes.TestIdentityv3): class TestApplicationCredentialCreate(TestApplicationCredential): - def setUp(self): super(TestApplicationCredentialCreate, self).setUp() @@ -50,7 +48,8 @@ class TestApplicationCredentialCreate(TestApplicationCredential): # Get the command object to test self.cmd = application_credential.CreateApplicationCredential( - self.app, None) + self.app, None + ) def test_application_credential_create_basic(self): self.app_creds_mock.create.return_value = fakes.FakeResource( @@ -60,12 +59,8 @@ class TestApplicationCredentialCreate(TestApplicationCredential): ) name = identity_fakes.app_cred_name - arglist = [ - name - ] - verifylist = [ - ('name', identity_fakes.app_cred_name) - ] + arglist = [name] + verifylist = [('name', identity_fakes.app_cred_name)] parsed_args = self.check_parser(self.cmd, arglist, verifylist) # In base command class ShowOne in cliff, abstract method take_action() @@ -82,13 +77,19 @@ class TestApplicationCredentialCreate(TestApplicationCredential): 'unrestricted': False, 'access_rules': None, } - self.app_creds_mock.create.assert_called_with( - name, - **kwargs + self.app_creds_mock.create.assert_called_with(name, **kwargs) + + collist = ( + 'access_rules', + 'description', + 'expires_at', + 'id', + 'name', + 'project_id', + 'roles', + 'secret', + 'unrestricted', ) - - collist = ('access_rules', 'description', 'expires_at', 'id', 'name', - 'project_id', 'roles', 'secret', 'unrestricted') self.assertEqual(collist, columns) datalist = ( None, @@ -113,17 +114,21 @@ class TestApplicationCredentialCreate(TestApplicationCredential): arglist = [ name, - '--secret', 'moresecuresecret', - '--role', identity_fakes.role_id, - '--expiration', identity_fakes.app_cred_expires_str, - '--description', 'credential for testing' + '--secret', + 'moresecuresecret', + '--role', + identity_fakes.role_id, + '--expiration', + identity_fakes.app_cred_expires_str, + '--description', + 'credential for testing', ] verifylist = [ ('name', identity_fakes.app_cred_name), ('secret', 'moresecuresecret'), ('role', [identity_fakes.role_id]), ('expiration', identity_fakes.app_cred_expires_str), - ('description', 'credential for testing') + ('description', 'credential for testing'), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -141,13 +146,19 @@ class TestApplicationCredentialCreate(TestApplicationCredential): 'unrestricted': False, 'access_rules': None, } - self.app_creds_mock.create.assert_called_with( - name, - **kwargs + self.app_creds_mock.create.assert_called_with(name, **kwargs) + + collist = ( + 'access_rules', + 'description', + 'expires_at', + 'id', + 'name', + 'project_id', + 'roles', + 'secret', + 'unrestricted', ) - - collist = ('access_rules', 'description', 'expires_at', 'id', 'name', - 'project_id', 'roles', 'secret', 'unrestricted') self.assertEqual(collist, columns) datalist = ( None, @@ -172,7 +183,8 @@ class TestApplicationCredentialCreate(TestApplicationCredential): arglist = [ name, - '--access-rules', identity_fakes.app_cred_access_rules, + '--access-rules', + identity_fakes.app_cred_access_rules, ] verifylist = [ ('name', identity_fakes.app_cred_name), @@ -189,15 +201,21 @@ class TestApplicationCredentialCreate(TestApplicationCredential): 'expires_at': None, 'description': None, 'unrestricted': False, - 'access_rules': json.loads(identity_fakes.app_cred_access_rules) + 'access_rules': json.loads(identity_fakes.app_cred_access_rules), } - self.app_creds_mock.create.assert_called_with( - name, - **kwargs + self.app_creds_mock.create.assert_called_with(name, **kwargs) + + collist = ( + 'access_rules', + 'description', + 'expires_at', + 'id', + 'name', + 'project_id', + 'roles', + 'secret', + 'unrestricted', ) - - collist = ('access_rules', 'description', 'expires_at', 'id', 'name', - 'project_id', 'roles', 'secret', 'unrestricted') self.assertEqual(collist, columns) datalist = ( identity_fakes.app_cred_access_rules, @@ -215,7 +233,8 @@ class TestApplicationCredentialCreate(TestApplicationCredential): @mock.patch('openstackclient.identity.v3.application_credential.json.load') @mock.patch('openstackclient.identity.v3.application_credential.open') def test_application_credential_create_with_access_rules_file( - self, _, mock_json_load): + self, _, mock_json_load + ): mock_json_load.return_value = identity_fakes.app_cred_access_rules name = identity_fakes.app_cred_name @@ -227,7 +246,8 @@ class TestApplicationCredentialCreate(TestApplicationCredential): arglist = [ name, - '--access-rules', identity_fakes.app_cred_access_rules_path, + '--access-rules', + identity_fakes.app_cred_access_rules_path, ] verifylist = [ ('name', identity_fakes.app_cred_name), @@ -244,15 +264,21 @@ class TestApplicationCredentialCreate(TestApplicationCredential): 'expires_at': None, 'description': None, 'unrestricted': False, - 'access_rules': identity_fakes.app_cred_access_rules + 'access_rules': identity_fakes.app_cred_access_rules, } - self.app_creds_mock.create.assert_called_with( - name, - **kwargs + self.app_creds_mock.create.assert_called_with(name, **kwargs) + + collist = ( + 'access_rules', + 'description', + 'expires_at', + 'id', + 'name', + 'project_id', + 'roles', + 'secret', + 'unrestricted', ) - - collist = ('access_rules', 'description', 'expires_at', 'id', 'name', - 'project_id', 'roles', 'secret', 'unrestricted') self.assertEqual(collist, columns) datalist = ( identity_fakes.app_cred_access_rules, @@ -269,7 +295,6 @@ class TestApplicationCredentialCreate(TestApplicationCredential): class TestApplicationCredentialDelete(TestApplicationCredential): - def setUp(self): super(TestApplicationCredentialDelete, self).setUp() @@ -283,15 +308,14 @@ class TestApplicationCredentialDelete(TestApplicationCredential): # Get the command object to test self.cmd = application_credential.DeleteApplicationCredential( - self.app, None) + self.app, None + ) def test_application_credential_delete(self): arglist = [ identity_fakes.app_cred_id, ] - verifylist = [ - ('application_credential', [identity_fakes.app_cred_id]) - ] + verifylist = [('application_credential', [identity_fakes.app_cred_id])] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) @@ -303,8 +327,10 @@ class TestApplicationCredentialDelete(TestApplicationCredential): @mock.patch.object(utils, 'find_resource') def test_delete_multi_app_creds_with_exception(self, find_mock): - find_mock.side_effect = [self.app_creds_mock.get.return_value, - exceptions.CommandError] + find_mock.side_effect = [ + self.app_creds_mock.get.return_value, + exceptions.CommandError, + ] arglist = [ identity_fakes.app_cred_id, 'nonexistent_app_cred', @@ -318,21 +344,22 @@ class TestApplicationCredentialDelete(TestApplicationCredential): self.cmd.take_action(parsed_args) self.fail('CommandError should be raised.') except exceptions.CommandError as e: - self.assertEqual('1 of 2 application credentials failed to' - ' delete.', str(e)) + self.assertEqual( + '1 of 2 application credentials failed to' ' delete.', str(e) + ) - find_mock.assert_any_call(self.app_creds_mock, - identity_fakes.app_cred_id) - find_mock.assert_any_call(self.app_creds_mock, - 'nonexistent_app_cred') + find_mock.assert_any_call( + self.app_creds_mock, identity_fakes.app_cred_id + ) + find_mock.assert_any_call(self.app_creds_mock, 'nonexistent_app_cred') self.assertEqual(2, find_mock.call_count) self.app_creds_mock.delete.assert_called_once_with( - identity_fakes.app_cred_id) + identity_fakes.app_cred_id + ) class TestApplicationCredentialList(TestApplicationCredential): - def setUp(self): super(TestApplicationCredentialList, self).setUp() @@ -345,8 +372,9 @@ class TestApplicationCredentialList(TestApplicationCredential): ] # Get the command object to test - self.cmd = application_credential.ListApplicationCredential(self.app, - None) + self.cmd = application_credential.ListApplicationCredential( + self.app, None + ) def test_application_credential_list(self): arglist = [] @@ -362,18 +390,19 @@ class TestApplicationCredentialList(TestApplicationCredential): collist = ('ID', 'Name', 'Project ID', 'Description', 'Expires At') self.assertEqual(collist, columns) - datalist = (( - identity_fakes.app_cred_id, - identity_fakes.app_cred_name, - identity_fakes.project_id, - None, - None - ), ) + datalist = ( + ( + identity_fakes.app_cred_id, + identity_fakes.app_cred_name, + identity_fakes.project_id, + None, + None, + ), + ) self.assertEqual(datalist, tuple(data)) class TestApplicationCredentialShow(TestApplicationCredential): - def setUp(self): super(TestApplicationCredentialShow, self).setUp() @@ -384,8 +413,9 @@ class TestApplicationCredentialShow(TestApplicationCredential): ) # Get the command object to test - self.cmd = application_credential.ShowApplicationCredential(self.app, - None) + self.cmd = application_credential.ShowApplicationCredential( + self.app, None + ) def test_application_credential_show(self): arglist = [ @@ -403,8 +433,17 @@ class TestApplicationCredentialShow(TestApplicationCredential): self.app_creds_mock.get.assert_called_with(identity_fakes.app_cred_id) - collist = ('access_rules', 'description', 'expires_at', 'id', 'name', - 'project_id', 'roles', 'secret', 'unrestricted') + collist = ( + 'access_rules', + 'description', + 'expires_at', + 'id', + 'name', + 'project_id', + 'roles', + 'secret', + 'unrestricted', + ) self.assertEqual(collist, columns) datalist = ( None, diff --git a/openstackclient/tests/unit/identity/v3/test_catalog.py b/openstackclient/tests/unit/identity/v3/test_catalog.py index 802a9017..a157859e 100644 --- a/openstackclient/tests/unit/identity/v3/test_catalog.py +++ b/openstackclient/tests/unit/identity/v3/test_catalog.py @@ -19,7 +19,6 @@ from openstackclient.tests.unit import utils class TestCatalog(utils.TestCommand): - fake_service = { 'id': 'qwertyuiop', 'type': 'compute', @@ -62,7 +61,6 @@ class TestCatalog(utils.TestCommand): class TestCatalogList(TestCatalog): - def setUp(self): super(TestCatalogList, self).setUp() @@ -88,17 +86,19 @@ class TestCatalogList(TestCatalog): collist = ('Name', 'Type', 'Endpoints') self.assertEqual(collist, columns) - datalist = (( - 'supernova', - 'compute', - catalog.EndpointsColumn( - auth_ref.service_catalog.catalog[0]['endpoints']), - ), ) + datalist = ( + ( + 'supernova', + 'compute', + catalog.EndpointsColumn( + auth_ref.service_catalog.catalog[0]['endpoints'] + ), + ), + ) self.assertCountEqual(datalist, tuple(data)) class TestCatalogShow(TestCatalog): - def setUp(self): super(TestCatalogShow, self).setUp() @@ -130,7 +130,8 @@ class TestCatalogShow(TestCatalog): self.assertEqual(collist, columns) datalist = ( catalog.EndpointsColumn( - auth_ref.service_catalog.catalog[0]['endpoints']), + auth_ref.service_catalog.catalog[0]['endpoints'] + ), 'qwertyuiop', 'supernova', 'compute', @@ -146,4 +147,5 @@ class TestFormatColumns(TestCatalog): 'onlyone\n admin: https://admin.example.com\n' '<none>\n internal: https://internal.example.com\n' '<none>\n none: https://none.example.com\n', - col.human_readable()) + col.human_readable(), + ) diff --git a/openstackclient/tests/unit/identity/v3/test_consumer.py b/openstackclient/tests/unit/identity/v3/test_consumer.py index 403250ef..fd13ef4a 100644 --- a/openstackclient/tests/unit/identity/v3/test_consumer.py +++ b/openstackclient/tests/unit/identity/v3/test_consumer.py @@ -18,7 +18,6 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes class TestOAuth1(identity_fakes.TestOAuth1): - def setUp(self): super(TestOAuth1, self).setUp() identity_client = self.app.client_manager.identity @@ -27,7 +26,6 @@ class TestOAuth1(identity_fakes.TestOAuth1): class TestConsumerCreate(TestOAuth1): - def setUp(self): super(TestConsumerCreate, self).setUp() @@ -41,7 +39,8 @@ class TestConsumerCreate(TestOAuth1): def test_create_consumer(self): arglist = [ - '--description', identity_fakes.consumer_description, + '--description', + identity_fakes.consumer_description, ] verifylist = [ ('description', identity_fakes.consumer_description), @@ -64,7 +63,6 @@ class TestConsumerCreate(TestOAuth1): class TestConsumerDelete(TestOAuth1): - def setUp(self): super(TestConsumerDelete, self).setUp() @@ -96,7 +94,6 @@ class TestConsumerDelete(TestOAuth1): class TestConsumerList(TestOAuth1): - def setUp(self): super(TestConsumerList, self).setUp() @@ -129,15 +126,16 @@ class TestConsumerList(TestOAuth1): collist = ('ID', 'Description') self.assertEqual(collist, columns) - datalist = (( - identity_fakes.consumer_id, - identity_fakes.consumer_description, - ), ) + datalist = ( + ( + identity_fakes.consumer_id, + identity_fakes.consumer_description, + ), + ) self.assertEqual(datalist, tuple(data)) class TestConsumerSet(TestOAuth1): - def setUp(self): super(TestConsumerSet, self).setUp() @@ -161,7 +159,8 @@ class TestConsumerSet(TestOAuth1): new_description = "consumer new description" arglist = [ - '--description', new_description, + '--description', + new_description, identity_fakes.consumer_id, ] verifylist = [ @@ -174,14 +173,12 @@ class TestConsumerSet(TestOAuth1): kwargs = {'description': new_description} self.consumers_mock.update.assert_called_with( - identity_fakes.consumer_id, - **kwargs + identity_fakes.consumer_id, **kwargs ) self.assertIsNone(result) class TestConsumerShow(TestOAuth1): - def setUp(self): super(TestConsumerShow, self).setUp() diff --git a/openstackclient/tests/unit/identity/v3/test_credential.py b/openstackclient/tests/unit/identity/v3/test_credential.py index 40596d58..e6c2be67 100644 --- a/openstackclient/tests/unit/identity/v3/test_credential.py +++ b/openstackclient/tests/unit/identity/v3/test_credential.py @@ -21,7 +21,6 @@ from openstackclient.tests.unit import utils class TestCredential(identity_fakes.TestIdentityv3): - def setUp(self): super(TestCredential, self).setUp() @@ -39,7 +38,6 @@ class TestCredential(identity_fakes.TestIdentityv3): class TestCredentialCreate(TestCredential): - user = identity_fakes.FakeUser.create_one_user() project = identity_fakes.FakeProject.create_one_project() columns = ( @@ -54,7 +52,8 @@ class TestCredentialCreate(TestCredential): super(TestCredentialCreate, self).setUp() self.credential = identity_fakes.FakeCredential.create_one_credential( - attrs={'user_id': self.user.id, 'project_id': self.project.id}) + attrs={'user_id': self.user.id, 'project_id': self.project.id} + ) self.credentials_mock.create.return_value = self.credential self.users_mock.get.return_value = self.user self.projects_mock.get.return_value = self.project @@ -87,9 +86,7 @@ class TestCredentialCreate(TestCredential): 'blob': self.credential.blob, 'project': None, } - self.credentials_mock.create.assert_called_once_with( - **kwargs - ) + self.credentials_mock.create.assert_called_once_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.data, data) @@ -98,8 +95,10 @@ class TestCredentialCreate(TestCredential): arglist = [ self.credential.user_id, self.credential.blob, - '--type', self.credential.type, - '--project', self.credential.project_id, + '--type', + self.credential.type, + '--project', + self.credential.project_id, ] verifylist = [ ('user', self.credential.user_id), @@ -117,16 +116,13 @@ class TestCredentialCreate(TestCredential): 'blob': self.credential.blob, 'project': self.credential.project_id, } - self.credentials_mock.create.assert_called_once_with( - **kwargs - ) + self.credentials_mock.create.assert_called_once_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.data, data) class TestCredentialDelete(TestCredential): - credentials = identity_fakes.FakeCredential.create_credentials(count=2) def setUp(self): @@ -181,8 +177,8 @@ class TestCredentialDelete(TestCredential): parsed_args = self.check_parser(self.cmd, arglist, verifylist) delete_mock_result = [None, exceptions.CommandError] - self.credentials_mock.delete = ( - mock.Mock(side_effect=delete_mock_result) + self.credentials_mock.delete = mock.Mock( + side_effect=delete_mock_result ) try: @@ -196,17 +192,18 @@ class TestCredentialDelete(TestCredential): class TestCredentialList(TestCredential): - credential = identity_fakes.FakeCredential.create_one_credential() columns = ('ID', 'Type', 'User ID', 'Data', 'Project ID') - data = (( - credential.id, - credential.type, - credential.user_id, - credential.blob, - credential.project_id, - ), ) + data = ( + ( + credential.id, + credential.type, + credential.user_id, + credential.blob, + credential.project_id, + ), + ) def setUp(self): super(TestCredentialList, self).setUp() @@ -232,8 +229,10 @@ class TestCredentialList(TestCredential): def test_credential_list_with_options(self): arglist = [ - '--user', self.credential.user_id, - '--type', self.credential.type, + '--user', + self.credential.user_id, + '--type', + self.credential.type, ] verifylist = [ ('user', self.credential.user_id), @@ -248,16 +247,13 @@ class TestCredentialList(TestCredential): 'type': self.credential.type, } self.users_mock.get.assert_called_with(self.credential.user_id) - self.credentials_mock.list.assert_called_with( - **kwargs - ) + self.credentials_mock.list.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.data, tuple(data)) class TestCredentialSet(TestCredential): - credential = identity_fakes.FakeCredential.create_one_credential() def setUp(self): @@ -269,44 +265,57 @@ class TestCredentialSet(TestCredential): self.credential.id, ] - self.assertRaises(utils.ParserException, - self.check_parser, self.cmd, arglist, []) + self.assertRaises( + utils.ParserException, self.check_parser, self.cmd, arglist, [] + ) def test_credential_set_missing_user(self): arglist = [ - '--type', 'ec2', - '--data', self.credential.blob, + '--type', + 'ec2', + '--data', + self.credential.blob, self.credential.id, ] - self.assertRaises(utils.ParserException, - self.check_parser, self.cmd, arglist, []) + self.assertRaises( + utils.ParserException, self.check_parser, self.cmd, arglist, [] + ) def test_credential_set_missing_type(self): arglist = [ - '--user', self.credential.user_id, - '--data', self.credential.blob, + '--user', + self.credential.user_id, + '--data', + self.credential.blob, self.credential.id, ] - self.assertRaises(utils.ParserException, - self.check_parser, self.cmd, arglist, []) + self.assertRaises( + utils.ParserException, self.check_parser, self.cmd, arglist, [] + ) def test_credential_set_missing_data(self): arglist = [ - '--user', self.credential.user_id, - '--type', 'ec2', + '--user', + self.credential.user_id, + '--type', + 'ec2', self.credential.id, ] - self.assertRaises(utils.ParserException, - self.check_parser, self.cmd, arglist, []) + self.assertRaises( + utils.ParserException, self.check_parser, self.cmd, arglist, [] + ) def test_credential_set_valid(self): arglist = [ - '--user', self.credential.user_id, - '--type', 'ec2', - '--data', self.credential.blob, + '--user', + self.credential.user_id, + '--type', + 'ec2', + '--data', + self.credential.blob, self.credential.id, ] parsed_args = self.check_parser(self.cmd, arglist, []) @@ -317,10 +326,14 @@ class TestCredentialSet(TestCredential): def test_credential_set_valid_with_project(self): arglist = [ - '--user', self.credential.user_id, - '--type', 'ec2', - '--data', self.credential.blob, - '--project', self.credential.project_id, + '--user', + self.credential.user_id, + '--type', + 'ec2', + '--data', + self.credential.blob, + '--project', + self.credential.project_id, self.credential.id, ] parsed_args = self.check_parser(self.cmd, arglist, []) @@ -331,7 +344,6 @@ class TestCredentialSet(TestCredential): class TestCredentialShow(TestCredential): - columns = ( 'blob', 'id', diff --git a/openstackclient/tests/unit/identity/v3/test_domain.py b/openstackclient/tests/unit/identity/v3/test_domain.py index c39f1bd3..08fbbaac 100644 --- a/openstackclient/tests/unit/identity/v3/test_domain.py +++ b/openstackclient/tests/unit/identity/v3/test_domain.py @@ -15,7 +15,6 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes class TestDomain(identity_fakes.TestIdentityv3): - def setUp(self): super(TestDomain, self).setUp() @@ -25,14 +24,7 @@ class TestDomain(identity_fakes.TestIdentityv3): class TestDomainCreate(TestDomain): - - columns = ( - 'description', - 'enabled', - 'id', - 'name', - 'tags' - ) + columns = ('description', 'enabled', 'id', 'name', 'tags') def setUp(self): super(TestDomainCreate, self).setUp() @@ -44,7 +36,7 @@ class TestDomainCreate(TestDomain): True, self.domain.id, self.domain.name, - self.domain.tags + self.domain.tags, ) # Get the command object to test @@ -71,16 +63,15 @@ class TestDomainCreate(TestDomain): 'options': {}, 'enabled': True, } - self.domains_mock.create.assert_called_with( - **kwargs - ) + self.domains_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) def test_domain_create_description(self): arglist = [ - '--description', 'new desc', + '--description', + 'new desc', self.domain.name, ] verifylist = [ @@ -101,9 +92,7 @@ class TestDomainCreate(TestDomain): 'options': {}, 'enabled': True, } - self.domains_mock.create.assert_called_with( - **kwargs - ) + self.domains_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -131,9 +120,7 @@ class TestDomainCreate(TestDomain): 'options': {}, 'enabled': True, } - self.domains_mock.create.assert_called_with( - **kwargs - ) + self.domains_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -161,9 +148,7 @@ class TestDomainCreate(TestDomain): 'options': {}, 'enabled': False, } - self.domains_mock.create.assert_called_with( - **kwargs - ) + self.domains_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -191,9 +176,7 @@ class TestDomainCreate(TestDomain): 'options': {'immutable': True}, 'enabled': True, } - self.domains_mock.create.assert_called_with( - **kwargs - ) + self.domains_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -221,16 +204,13 @@ class TestDomainCreate(TestDomain): 'options': {'immutable': False}, 'enabled': True, } - self.domains_mock.create.assert_called_with( - **kwargs - ) + self.domains_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) class TestDomainDelete(TestDomain): - domain = identity_fakes.FakeDomain.create_one_domain() def setUp(self): @@ -261,7 +241,6 @@ class TestDomainDelete(TestDomain): class TestDomainList(TestDomain): - domain = identity_fakes.FakeDomain.create_one_domain() def setUp(self): @@ -285,20 +264,19 @@ class TestDomainList(TestDomain): collist = ('ID', 'Name', 'Enabled', 'Description') self.assertEqual(collist, columns) - datalist = (( - self.domain.id, - self.domain.name, - True, - self.domain.description, - ), ) + datalist = ( + ( + self.domain.id, + self.domain.name, + True, + self.domain.description, + ), + ) self.assertEqual(datalist, tuple(data)) def test_domain_list_with_option_name(self): - arglist = ['--name', - self.domain.name] - verifylist = [ - ('name', self.domain.name) - ] + arglist = ['--name', self.domain.name] + verifylist = [('name', self.domain.name)] parsed_args = self.check_parser(self.cmd, arglist, verifylist) # In base command class Lister in cliff, abstract method take_action() @@ -306,26 +284,24 @@ class TestDomainList(TestDomain): # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - kwargs = { - 'name': self.domain.name - } + kwargs = {'name': self.domain.name} self.domains_mock.list.assert_called_with(**kwargs) collist = ('ID', 'Name', 'Enabled', 'Description') self.assertEqual(collist, columns) - datalist = (( - self.domain.id, - self.domain.name, - True, - self.domain.description, - ), ) + datalist = ( + ( + self.domain.id, + self.domain.name, + True, + self.domain.description, + ), + ) self.assertEqual(datalist, tuple(data)) def test_domain_list_with_option_enabled(self): arglist = ['--enabled'] - verifylist = [ - ('enabled', True) - ] + verifylist = [('enabled', True)] parsed_args = self.check_parser(self.cmd, arglist, verifylist) # In base command class Lister in cliff, abstract method take_action() @@ -333,24 +309,23 @@ class TestDomainList(TestDomain): # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - kwargs = { - 'enabled': True - } + kwargs = {'enabled': True} self.domains_mock.list.assert_called_with(**kwargs) collist = ('ID', 'Name', 'Enabled', 'Description') self.assertEqual(collist, columns) - datalist = (( - self.domain.id, - self.domain.name, - True, - self.domain.description, - ), ) + datalist = ( + ( + self.domain.id, + self.domain.name, + True, + self.domain.description, + ), + ) self.assertEqual(datalist, tuple(data)) class TestDomainSet(TestDomain): - domain = identity_fakes.FakeDomain.create_one_domain() def setUp(self): @@ -375,15 +350,13 @@ class TestDomainSet(TestDomain): result = self.cmd.take_action(parsed_args) kwargs = {} - self.domains_mock.update.assert_called_with( - self.domain.id, - **kwargs - ) + self.domains_mock.update.assert_called_with(self.domain.id, **kwargs) self.assertIsNone(result) def test_domain_set_name(self): arglist = [ - '--name', 'qwerty', + '--name', + 'qwerty', self.domain.id, ] verifylist = [ @@ -398,15 +371,13 @@ class TestDomainSet(TestDomain): kwargs = { 'name': 'qwerty', } - self.domains_mock.update.assert_called_with( - self.domain.id, - **kwargs - ) + self.domains_mock.update.assert_called_with(self.domain.id, **kwargs) self.assertIsNone(result) def test_domain_set_description(self): arglist = [ - '--description', 'new desc', + '--description', + 'new desc', self.domain.id, ] verifylist = [ @@ -421,10 +392,7 @@ class TestDomainSet(TestDomain): kwargs = { 'description': 'new desc', } - self.domains_mock.update.assert_called_with( - self.domain.id, - **kwargs - ) + self.domains_mock.update.assert_called_with(self.domain.id, **kwargs) self.assertIsNone(result) def test_domain_set_enable(self): @@ -444,10 +412,7 @@ class TestDomainSet(TestDomain): kwargs = { 'enabled': True, } - self.domains_mock.update.assert_called_with( - self.domain.id, - **kwargs - ) + self.domains_mock.update.assert_called_with(self.domain.id, **kwargs) self.assertIsNone(result) def test_domain_set_disable(self): @@ -467,10 +432,7 @@ class TestDomainSet(TestDomain): kwargs = { 'enabled': False, } - self.domains_mock.update.assert_called_with( - self.domain.id, - **kwargs - ) + self.domains_mock.update.assert_called_with(self.domain.id, **kwargs) self.assertIsNone(result) def test_domain_set_immutable_option(self): @@ -490,10 +452,7 @@ class TestDomainSet(TestDomain): kwargs = { 'options': {'immutable': True}, } - self.domains_mock.update.assert_called_with( - self.domain.id, - **kwargs - ) + self.domains_mock.update.assert_called_with(self.domain.id, **kwargs) self.assertIsNone(result) def test_domain_set_no_immutable_option(self): @@ -513,15 +472,11 @@ class TestDomainSet(TestDomain): kwargs = { 'options': {'immutable': False}, } - self.domains_mock.update.assert_called_with( - self.domain.id, - **kwargs - ) + self.domains_mock.update.assert_called_with(self.domain.id, **kwargs) self.assertIsNone(result) class TestDomainShow(TestDomain): - def setUp(self): super(TestDomainShow, self).setUp() @@ -538,16 +493,9 @@ class TestDomainShow(TestDomain): ('domain', self.domain.id), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.app.client_manager.identity.tokens.get_token_data.return_value = \ - {'token': - {'project': - {'domain': - {'id': 'd1', - 'name': 'd1' - } - } - } - } + self.app.client_manager.identity.tokens.get_token_data.return_value = { + 'token': {'project': {'domain': {'id': 'd1', 'name': 'd1'}}} + } # In base command class ShowOne in cliff, abstract method take_action() # returns a two-part tuple with a tuple of column names and a tuple of @@ -564,6 +512,6 @@ class TestDomainShow(TestDomain): True, self.domain.id, self.domain.name, - self.domain.tags + self.domain.tags, ) self.assertEqual(datalist, data) diff --git a/openstackclient/tests/unit/identity/v3/test_endpoint.py b/openstackclient/tests/unit/identity/v3/test_endpoint.py index 62dcf58d..39159432 100644 --- a/openstackclient/tests/unit/identity/v3/test_endpoint.py +++ b/openstackclient/tests/unit/identity/v3/test_endpoint.py @@ -15,16 +15,13 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes class TestEndpoint(identity_fakes.TestIdentityv3): - def setUp(self): super(TestEndpoint, self).setUp() # Get a shortcut to the EndpointManager Mock self.endpoints_mock = self.app.client_manager.identity.endpoints self.endpoints_mock.reset_mock() - self.ep_filter_mock = ( - self.app.client_manager.identity.endpoint_filter - ) + self.ep_filter_mock = self.app.client_manager.identity.endpoint_filter self.ep_filter_mock.reset_mock() # Get a shortcut to the ServiceManager Mock @@ -41,7 +38,6 @@ class TestEndpoint(identity_fakes.TestIdentityv3): class TestEndpointCreate(TestEndpoint): - service = identity_fakes.FakeService.create_one_service() columns = ( @@ -59,7 +55,8 @@ class TestEndpointCreate(TestEndpoint): super(TestEndpointCreate, self).setUp() self.endpoint = identity_fakes.FakeEndpoint.create_one_endpoint( - attrs={'service_id': self.service.id}) + attrs={'service_id': self.service.id} + ) self.endpoints_mock.create.return_value = self.endpoint # This is the return value for common.find_resource(service) @@ -96,9 +93,7 @@ class TestEndpointCreate(TestEndpoint): 'region': None, } - self.endpoints_mock.create.assert_called_with( - **kwargs - ) + self.endpoints_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) datalist = ( @@ -118,7 +113,8 @@ class TestEndpointCreate(TestEndpoint): self.service.id, self.endpoint.interface, self.endpoint.url, - '--region', self.endpoint.region, + '--region', + self.endpoint.region, ] verifylist = [ ('enabled', True), @@ -143,9 +139,7 @@ class TestEndpointCreate(TestEndpoint): 'region': self.endpoint.region, } - self.endpoints_mock.create.assert_called_with( - **kwargs - ) + self.endpoints_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) datalist = ( @@ -165,7 +159,7 @@ class TestEndpointCreate(TestEndpoint): self.service.id, self.endpoint.interface, self.endpoint.url, - '--enable' + '--enable', ] verifylist = [ ('enabled', True), @@ -189,9 +183,7 @@ class TestEndpointCreate(TestEndpoint): 'region': None, } - self.endpoints_mock.create.assert_called_with( - **kwargs - ) + self.endpoints_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) datalist = ( @@ -235,9 +227,7 @@ class TestEndpointCreate(TestEndpoint): 'region': None, } - self.endpoints_mock.create.assert_called_with( - **kwargs - ) + self.endpoints_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) datalist = ( @@ -254,7 +244,6 @@ class TestEndpointCreate(TestEndpoint): class TestEndpointDelete(TestEndpoint): - endpoint = identity_fakes.FakeEndpoint.create_one_endpoint() def setUp(self): @@ -285,10 +274,10 @@ class TestEndpointDelete(TestEndpoint): class TestEndpointList(TestEndpoint): - service = identity_fakes.FakeService.create_one_service() endpoint = identity_fakes.FakeEndpoint.create_one_endpoint( - attrs={'service_id': service.id}) + attrs={'service_id': service.id} + ) columns = ( 'ID', @@ -339,7 +328,8 @@ class TestEndpointList(TestEndpoint): def test_endpoint_list_service(self): arglist = [ - '--service', self.service.id, + '--service', + self.service.id, ] verifylist = [ ('service', self.service.id), @@ -373,7 +363,8 @@ class TestEndpointList(TestEndpoint): def test_endpoint_list_interface(self): arglist = [ - '--interface', self.endpoint.interface, + '--interface', + self.endpoint.interface, ] verifylist = [ ('interface', self.endpoint.interface), @@ -407,7 +398,8 @@ class TestEndpointList(TestEndpoint): def test_endpoint_list_region(self): arglist = [ - '--region', self.endpoint.region, + '--region', + self.endpoint.region, ] verifylist = [ ('region', self.endpoint.region), @@ -448,10 +440,7 @@ class TestEndpointList(TestEndpoint): ] self.projects_mock.get.return_value = project - arglist = [ - '--project', project.name, - '--project-domain', domain.name - ] + arglist = ['--project', project.name, '--project-domain', domain.name] verifylist = [ ('project', project.name), ('project_domain', domain.name), @@ -482,10 +471,10 @@ class TestEndpointList(TestEndpoint): class TestEndpointSet(TestEndpoint): - service = identity_fakes.FakeService.create_one_service() endpoint = identity_fakes.FakeEndpoint.create_one_endpoint( - attrs={'service_id': service.id}) + attrs={'service_id': service.id} + ) def setUp(self): super(TestEndpointSet, self).setUp() @@ -520,16 +509,12 @@ class TestEndpointSet(TestEndpoint): 'url': None, } self.endpoints_mock.update.assert_called_with( - self.endpoint.id, - **kwargs + self.endpoint.id, **kwargs ) self.assertIsNone(result) def test_endpoint_set_interface(self): - arglist = [ - '--interface', 'public', - self.endpoint.id - ] + arglist = ['--interface', 'public', self.endpoint.id] verifylist = [ ('interface', 'public'), ('endpoint', self.endpoint.id), @@ -547,16 +532,12 @@ class TestEndpointSet(TestEndpoint): 'service': None, } self.endpoints_mock.update.assert_called_with( - self.endpoint.id, - **kwargs + self.endpoint.id, **kwargs ) self.assertIsNone(result) def test_endpoint_set_url(self): - arglist = [ - '--url', 'http://localhost:5000', - self.endpoint.id - ] + arglist = ['--url', 'http://localhost:5000', self.endpoint.id] verifylist = [ ('url', 'http://localhost:5000'), ('endpoint', self.endpoint.id), @@ -574,16 +555,12 @@ class TestEndpointSet(TestEndpoint): 'service': None, } self.endpoints_mock.update.assert_called_with( - self.endpoint.id, - **kwargs + self.endpoint.id, **kwargs ) self.assertIsNone(result) def test_endpoint_set_service(self): - arglist = [ - '--service', self.service.id, - self.endpoint.id - ] + arglist = ['--service', self.service.id, self.endpoint.id] verifylist = [ ('service', self.service.id), ('endpoint', self.endpoint.id), @@ -601,16 +578,12 @@ class TestEndpointSet(TestEndpoint): 'service': self.service.id, } self.endpoints_mock.update.assert_called_with( - self.endpoint.id, - **kwargs + self.endpoint.id, **kwargs ) self.assertIsNone(result) def test_endpoint_set_region(self): - arglist = [ - '--region', 'e-rzzz', - self.endpoint.id - ] + arglist = ['--region', 'e-rzzz', self.endpoint.id] verifylist = [ ('region', 'e-rzzz'), ('endpoint', self.endpoint.id), @@ -628,16 +601,12 @@ class TestEndpointSet(TestEndpoint): 'service': None, } self.endpoints_mock.update.assert_called_with( - self.endpoint.id, - **kwargs + self.endpoint.id, **kwargs ) self.assertIsNone(result) def test_endpoint_set_enable(self): - arglist = [ - '--enable', - self.endpoint.id - ] + arglist = ['--enable', self.endpoint.id] verifylist = [ ('enabled', True), ('endpoint', self.endpoint.id), @@ -655,16 +624,12 @@ class TestEndpointSet(TestEndpoint): 'service': None, } self.endpoints_mock.update.assert_called_with( - self.endpoint.id, - **kwargs + self.endpoint.id, **kwargs ) self.assertIsNone(result) def test_endpoint_set_disable(self): - arglist = [ - '--disable', - self.endpoint.id - ] + arglist = ['--disable', self.endpoint.id] verifylist = [ ('disabled', True), ('endpoint', self.endpoint.id), @@ -682,17 +647,16 @@ class TestEndpointSet(TestEndpoint): 'service': None, } self.endpoints_mock.update.assert_called_with( - self.endpoint.id, - **kwargs + self.endpoint.id, **kwargs ) self.assertIsNone(result) class TestEndpointShow(TestEndpoint): - service = identity_fakes.FakeService.create_one_service() endpoint = identity_fakes.FakeEndpoint.create_one_endpoint( - attrs={'service_id': service.id}) + attrs={'service_id': service.id} + ) def setUp(self): super(TestEndpointShow, self).setUp() @@ -747,15 +711,16 @@ class TestEndpointShow(TestEndpoint): class TestEndpointCreateServiceWithoutName(TestEndpointCreate): - service = identity_fakes.FakeService.create_one_service( - attrs={'service_name': ''}) + attrs={'service_name': ''} + ) def setUp(self): super(TestEndpointCreate, self).setUp() self.endpoint = identity_fakes.FakeEndpoint.create_one_endpoint( - attrs={'service_id': self.service.id}) + attrs={'service_id': self.service.id} + ) self.endpoints_mock.create.return_value = self.endpoint @@ -767,11 +732,12 @@ class TestEndpointCreateServiceWithoutName(TestEndpointCreate): class TestEndpointListServiceWithoutName(TestEndpointList): - service = identity_fakes.FakeService.create_one_service( - attrs={'service_name': ''}) + attrs={'service_name': ''} + ) endpoint = identity_fakes.FakeEndpoint.create_one_endpoint( - attrs={'service_id': service.id}) + attrs={'service_id': service.id} + ) def setUp(self): super(TestEndpointList, self).setUp() @@ -787,11 +753,12 @@ class TestEndpointListServiceWithoutName(TestEndpointList): class TestEndpointShowServiceWithoutName(TestEndpointShow): - service = identity_fakes.FakeService.create_one_service( - attrs={'service_name': ''}) + attrs={'service_name': ''} + ) endpoint = identity_fakes.FakeEndpoint.create_one_endpoint( - attrs={'service_id': service.id}) + attrs={'service_id': service.id} + ) def setUp(self): super(TestEndpointShow, self).setUp() @@ -806,16 +773,15 @@ class TestEndpointShowServiceWithoutName(TestEndpointShow): class TestAddProjectToEndpoint(TestEndpoint): - project = identity_fakes.FakeProject.create_one_project() domain = identity_fakes.FakeDomain.create_one_domain() service = identity_fakes.FakeService.create_one_service() endpoint = identity_fakes.FakeEndpoint.create_one_endpoint( - attrs={'service_id': service.id}) + attrs={'service_id': service.id} + ) new_ep_filter = identity_fakes.FakeEndpoint.create_one_endpoint_filter( - attrs={'endpoint': endpoint.id, - 'project': project.id} + attrs={'endpoint': endpoint.id, 'project': project.id} ) def setUp(self): @@ -844,8 +810,7 @@ class TestAddProjectToEndpoint(TestEndpoint): result = self.cmd.take_action(parsed_args) self.ep_filter_mock.add_endpoint_to_project.assert_called_with( - project=self.project.id, - endpoint=self.endpoint.id + project=self.project.id, endpoint=self.endpoint.id ) self.assertIsNone(result) @@ -853,7 +818,8 @@ class TestAddProjectToEndpoint(TestEndpoint): arglist = [ self.endpoint.id, self.project.id, - '--project-domain', self.domain.id, + '--project-domain', + self.domain.id, ] verifylist = [ ('endpoint', self.endpoint.id), @@ -864,19 +830,18 @@ class TestAddProjectToEndpoint(TestEndpoint): result = self.cmd.take_action(parsed_args) self.ep_filter_mock.add_endpoint_to_project.assert_called_with( - project=self.project.id, - endpoint=self.endpoint.id + project=self.project.id, endpoint=self.endpoint.id ) self.assertIsNone(result) class TestRemoveProjectEndpoint(TestEndpoint): - project = identity_fakes.FakeProject.create_one_project() domain = identity_fakes.FakeDomain.create_one_domain() service = identity_fakes.FakeService.create_one_service() endpoint = identity_fakes.FakeEndpoint.create_one_endpoint( - attrs={'service_id': service.id}) + attrs={'service_id': service.id} + ) def setUp(self): super(TestRemoveProjectEndpoint, self).setUp() @@ -914,7 +879,8 @@ class TestRemoveProjectEndpoint(TestEndpoint): arglist = [ self.endpoint.id, self.project.id, - '--project-domain', self.domain.id, + '--project-domain', + self.domain.id, ] verifylist = [ ('endpoint', self.endpoint.id), diff --git a/openstackclient/tests/unit/identity/v3/test_endpoint_group.py b/openstackclient/tests/unit/identity/v3/test_endpoint_group.py index c081fa1f..66d06dd9 100644 --- a/openstackclient/tests/unit/identity/v3/test_endpoint_group.py +++ b/openstackclient/tests/unit/identity/v3/test_endpoint_group.py @@ -18,7 +18,6 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes class TestEndpointGroup(identity_fakes.TestIdentityv3): - def setUp(self): super(TestEndpointGroup, self).setUp() @@ -27,9 +26,7 @@ class TestEndpointGroup(identity_fakes.TestIdentityv3): self.app.client_manager.identity.endpoint_groups ) self.endpoint_groups_mock.reset_mock() - self.epf_mock = ( - self.app.client_manager.identity.endpoint_filter - ) + self.epf_mock = self.app.client_manager.identity.endpoint_filter self.epf_mock.reset_mock() # Get a shortcut to the ServiceManager Mock @@ -46,7 +43,6 @@ class TestEndpointGroup(identity_fakes.TestIdentityv3): class TestEndpointGroupCreate(TestEndpointGroup): - columns = ( 'description', 'filters', @@ -59,7 +55,9 @@ class TestEndpointGroupCreate(TestEndpointGroup): self.endpoint_group = ( identity_fakes.FakeEndpointGroup.create_one_endpointgroup( - attrs={'filters': identity_fakes.endpoint_group_filters})) + attrs={'filters': identity_fakes.endpoint_group_filters} + ) + ) self.endpoint_groups_mock.create.return_value = self.endpoint_group @@ -68,7 +66,8 @@ class TestEndpointGroupCreate(TestEndpointGroup): def test_endpointgroup_create_no_options(self): arglist = [ - '--description', self.endpoint_group.description, + '--description', + self.endpoint_group.description, self.endpoint_group.name, identity_fakes.endpoint_group_file_path, ] @@ -81,8 +80,11 @@ class TestEndpointGroupCreate(TestEndpointGroup): mocker = mock.Mock() mocker.return_value = identity_fakes.endpoint_group_filters - with mock.patch("openstackclient.identity.v3.endpoint_group." - "CreateEndpointGroup._read_filters", mocker): + with mock.patch( + "openstackclient.identity.v3.endpoint_group." + "CreateEndpointGroup._read_filters", + mocker, + ): columns, data = self.cmd.take_action(parsed_args) # Set expected values @@ -92,9 +94,7 @@ class TestEndpointGroupCreate(TestEndpointGroup): 'description': self.endpoint_group.description, } - self.endpoint_groups_mock.create.assert_called_with( - **kwargs - ) + self.endpoint_groups_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) datalist = ( @@ -107,9 +107,9 @@ class TestEndpointGroupCreate(TestEndpointGroup): class TestEndpointGroupDelete(TestEndpointGroup): - endpoint_group = ( - identity_fakes.FakeEndpointGroup.create_one_endpointgroup()) + identity_fakes.FakeEndpointGroup.create_one_endpointgroup() + ) def setUp(self): super(TestEndpointGroupDelete, self).setUp() @@ -139,9 +139,9 @@ class TestEndpointGroupDelete(TestEndpointGroup): class TestEndpointGroupList(TestEndpointGroup): - endpoint_group = ( - identity_fakes.FakeEndpointGroup.create_one_endpointgroup()) + identity_fakes.FakeEndpointGroup.create_one_endpointgroup() + ) project = identity_fakes.FakeProject.create_one_project() domain = identity_fakes.FakeDomain.create_one_domain() @@ -157,9 +157,11 @@ class TestEndpointGroupList(TestEndpointGroup): self.endpoint_groups_mock.list.return_value = [self.endpoint_group] self.endpoint_groups_mock.get.return_value = self.endpoint_group self.epf_mock.list_projects_for_endpoint_group.return_value = [ - self.project] + self.project + ] self.epf_mock.list_endpoint_groups_for_project.return_value = [ - self.endpoint_group] + self.endpoint_group + ] # Get the command object to test self.cmd = endpoint_group.ListEndpointGroup(self.app, None) @@ -187,7 +189,8 @@ class TestEndpointGroupList(TestEndpointGroup): def test_endpoint_group_list_projects_by_endpoint_group(self): arglist = [ - '--endpointgroup', self.endpoint_group.id, + '--endpointgroup', + self.endpoint_group.id, ] verifylist = [ ('endpointgroup', self.endpoint_group.id), @@ -219,8 +222,10 @@ class TestEndpointGroupList(TestEndpointGroup): self.projects_mock.get.return_value = self.project arglist = [ - '--project', self.project.name, - '--domain', self.domain.name + '--project', + self.project.name, + '--domain', + self.domain.name, ] verifylist = [ ('project', self.project.name), @@ -248,9 +253,9 @@ class TestEndpointGroupList(TestEndpointGroup): class TestEndpointGroupSet(TestEndpointGroup): - endpoint_group = ( - identity_fakes.FakeEndpointGroup.create_one_endpointgroup()) + identity_fakes.FakeEndpointGroup.create_one_endpointgroup() + ) def setUp(self): super(TestEndpointGroupSet, self).setUp() @@ -274,22 +279,14 @@ class TestEndpointGroupSet(TestEndpointGroup): result = self.cmd.take_action(parsed_args) - kwargs = { - 'name': None, - 'filters': None, - 'description': '' - } + kwargs = {'name': None, 'filters': None, 'description': ''} self.endpoint_groups_mock.update.assert_called_with( - self.endpoint_group.id, - **kwargs + self.endpoint_group.id, **kwargs ) self.assertIsNone(result) def test_endpoint_group_set_name(self): - arglist = [ - '--name', 'qwerty', - self.endpoint_group.id - ] + arglist = ['--name', 'qwerty', self.endpoint_group.id] verifylist = [ ('name', 'qwerty'), ('endpointgroup', self.endpoint_group.id), @@ -299,20 +296,16 @@ class TestEndpointGroupSet(TestEndpointGroup): result = self.cmd.take_action(parsed_args) # Set expected values - kwargs = { - 'name': 'qwerty', - 'filters': None, - 'description': '' - } + kwargs = {'name': 'qwerty', 'filters': None, 'description': ''} self.endpoint_groups_mock.update.assert_called_with( - self.endpoint_group.id, - **kwargs + self.endpoint_group.id, **kwargs ) self.assertIsNone(result) def test_endpoint_group_set_filters(self): arglist = [ - '--filters', identity_fakes.endpoint_group_file_path, + '--filters', + identity_fakes.endpoint_group_file_path, self.endpoint_group.id, ] verifylist = [ @@ -324,8 +317,11 @@ class TestEndpointGroupSet(TestEndpointGroup): mocker = mock.Mock() mocker.return_value = identity_fakes.endpoint_group_filters_2 - with mock.patch("openstackclient.identity.v3.endpoint_group." - "SetEndpointGroup._read_filters", mocker): + with mock.patch( + "openstackclient.identity.v3.endpoint_group." + "SetEndpointGroup._read_filters", + mocker, + ): result = self.cmd.take_action(parsed_args) # Set expected values @@ -336,17 +332,13 @@ class TestEndpointGroupSet(TestEndpointGroup): } self.endpoint_groups_mock.update.assert_called_with( - self.endpoint_group.id, - **kwargs + self.endpoint_group.id, **kwargs ) self.assertIsNone(result) def test_endpoint_group_set_description(self): - arglist = [ - '--description', 'qwerty', - self.endpoint_group.id - ] + arglist = ['--description', 'qwerty', self.endpoint_group.id] verifylist = [ ('description', 'qwerty'), ('endpointgroup', self.endpoint_group.id), @@ -362,23 +354,23 @@ class TestEndpointGroupSet(TestEndpointGroup): 'description': 'qwerty', } self.endpoint_groups_mock.update.assert_called_with( - self.endpoint_group.id, - **kwargs + self.endpoint_group.id, **kwargs ) self.assertIsNone(result) class TestAddProjectToEndpointGroup(TestEndpointGroup): - project = identity_fakes.FakeProject.create_one_project() domain = identity_fakes.FakeDomain.create_one_domain() endpoint_group = ( - identity_fakes.FakeEndpointGroup.create_one_endpointgroup()) + identity_fakes.FakeEndpointGroup.create_one_endpointgroup() + ) new_ep_filter = ( identity_fakes.FakeEndpointGroup.create_one_endpointgroup_filter( - attrs={'endpointgroup': endpoint_group.id, - 'project': project.id})) + attrs={'endpointgroup': endpoint_group.id, 'project': project.id} + ) + ) def setUp(self): super(TestAddProjectToEndpointGroup, self).setUp() @@ -416,7 +408,8 @@ class TestAddProjectToEndpointGroup(TestEndpointGroup): arglist = [ self.endpoint_group.id, self.project.id, - '--project-domain', self.domain.id, + '--project-domain', + self.domain.id, ] verifylist = [ ('endpointgroup', self.endpoint_group.id), @@ -434,11 +427,11 @@ class TestAddProjectToEndpointGroup(TestEndpointGroup): class TestRemoveProjectEndpointGroup(TestEndpointGroup): - project = identity_fakes.FakeProject.create_one_project() domain = identity_fakes.FakeDomain.create_one_domain() endpoint_group = ( - identity_fakes.FakeEndpointGroup.create_one_endpointgroup()) + identity_fakes.FakeEndpointGroup.create_one_endpointgroup() + ) def setUp(self): super(TestRemoveProjectEndpointGroup, self).setUp() @@ -452,7 +445,8 @@ class TestRemoveProjectEndpointGroup(TestEndpointGroup): # Get the command object to test self.cmd = endpoint_group.RemoveProjectFromEndpointGroup( - self.app, None) + self.app, None + ) def test_remove_project_endpoint_no_options(self): arglist = [ @@ -477,7 +471,8 @@ class TestRemoveProjectEndpointGroup(TestEndpointGroup): arglist = [ self.endpoint_group.id, self.project.id, - '--project-domain', self.domain.id, + '--project-domain', + self.domain.id, ] verifylist = [ ('endpointgroup', self.endpoint_group.id), diff --git a/openstackclient/tests/unit/identity/v3/test_group.py b/openstackclient/tests/unit/identity/v3/test_group.py index 04ba0dbe..3c95931c 100644 --- a/openstackclient/tests/unit/identity/v3/test_group.py +++ b/openstackclient/tests/unit/identity/v3/test_group.py @@ -23,7 +23,6 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes class TestGroup(identity_fakes.TestIdentityv3): - def setUp(self): super(TestGroup, self).setUp() @@ -41,7 +40,6 @@ class TestGroup(identity_fakes.TestIdentityv3): class TestGroupAddUser(TestGroup): - _group = identity_fakes.FakeGroup.create_one_group() users = identity_fakes.FakeUser.create_users(count=2) @@ -49,8 +47,7 @@ class TestGroupAddUser(TestGroup): super(TestGroupAddUser, self).setUp() self.groups_mock.get.return_value = self._group - self.users_mock.get = ( - identity_fakes.FakeUser.get_users(self.users)) + self.users_mock.get = identity_fakes.FakeUser.get_users(self.users) self.users_mock.add_to_group.return_value = None self.cmd = group.AddUserToGroup(self.app, None) @@ -68,7 +65,8 @@ class TestGroupAddUser(TestGroup): result = self.cmd.take_action(parsed_args) self.users_mock.add_to_group.assert_called_once_with( - self.users[0].id, self._group.id) + self.users[0].id, self._group.id + ) self.assertIsNone(result) def test_group_add_multi_users(self): @@ -84,15 +82,19 @@ class TestGroupAddUser(TestGroup): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - calls = [call(self.users[0].id, self._group.id), - call(self.users[1].id, self._group.id)] + calls = [ + call(self.users[0].id, self._group.id), + call(self.users[1].id, self._group.id), + ] self.users_mock.add_to_group.assert_has_calls(calls) self.assertIsNone(result) @mock.patch.object(group.LOG, 'error') def test_group_add_user_with_error(self, mock_error): self.users_mock.add_to_group.side_effect = [ - exceptions.CommandError(), None] + exceptions.CommandError(), + None, + ] arglist = [ self._group.name, self.users[0].name, @@ -117,7 +119,6 @@ class TestGroupAddUser(TestGroup): class TestGroupCheckUser(TestGroup): - group = identity_fakes.FakeGroup.create_one_group() user = identity_fakes.FakeUser.create_one_user() @@ -143,12 +144,14 @@ class TestGroupCheckUser(TestGroup): result = self.cmd.take_action(parsed_args) self.users_mock.check_in_group.assert_called_once_with( - self.user.id, self.group.id) + self.user.id, self.group.id + ) self.assertIsNone(result) def test_group_check_user_server_error(self): def server_error(*args): raise ks_exc.http.InternalServerError + self.users_mock.check_in_group.side_effect = server_error arglist = [ self.group.name, @@ -160,12 +163,12 @@ class TestGroupCheckUser(TestGroup): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.assertRaises(ks_exc.http.InternalServerError, - self.cmd.take_action, parsed_args) + self.assertRaises( + ks_exc.http.InternalServerError, self.cmd.take_action, parsed_args + ) class TestGroupCreate(TestGroup): - domain = identity_fakes.FakeDomain.create_one_domain() columns = ( @@ -178,7 +181,8 @@ class TestGroupCreate(TestGroup): def setUp(self): super(TestGroupCreate, self).setUp() self.group = identity_fakes.FakeGroup.create_one_group( - attrs={'domain_id': self.domain.id}) + attrs={'domain_id': self.domain.id} + ) self.data = ( self.group.description, self.group.domain_id, @@ -212,8 +216,10 @@ class TestGroupCreate(TestGroup): def test_group_create_with_options(self): arglist = [ - '--domain', self.domain.name, - '--description', self.group.description, + '--domain', + self.domain.name, + '--description', + self.group.description, self.group.name, ] verifylist = [ @@ -251,16 +257,15 @@ class TestGroupCreate(TestGroup): class TestGroupDelete(TestGroup): - domain = identity_fakes.FakeDomain.create_one_domain() groups = identity_fakes.FakeGroup.create_groups( - attrs={'domain_id': domain.id}, count=2) + attrs={'domain_id': domain.id}, count=2 + ) def setUp(self): super(TestGroupDelete, self).setUp() - self.groups_mock.get = ( - identity_fakes.FakeGroup.get_groups(self.groups)) + self.groups_mock.get = identity_fakes.FakeGroup.get_groups(self.groups) self.groups_mock.delete.return_value = None self.domains_mock.get.return_value = self.domain @@ -301,11 +306,11 @@ class TestGroupDelete(TestGroup): def test_group_delete_with_domain(self): get_mock_result = [exceptions.CommandError, self.groups[0]] - self.groups_mock.get = ( - mock.Mock(side_effect=get_mock_result)) + self.groups_mock.get = mock.Mock(side_effect=get_mock_result) arglist = [ - '--domain', self.domain.id, + '--domain', + self.domain.id, self.groups[0].id, ] verifylist = [ @@ -316,14 +321,14 @@ class TestGroupDelete(TestGroup): result = self.cmd.take_action(parsed_args) self.groups_mock.get.assert_any_call( - self.groups[0].id, domain_id=self.domain.id) + self.groups[0].id, domain_id=self.domain.id + ) self.groups_mock.delete.assert_called_once_with(self.groups[0].id) self.assertIsNone(result) @mock.patch.object(utils, 'find_resource') def test_delete_multi_groups_with_exception(self, find_mock): - find_mock.side_effect = [self.groups[0], - exceptions.CommandError] + find_mock.side_effect = [self.groups[0], exceptions.CommandError] arglist = [ self.groups[0].id, 'unexist_group', @@ -337,8 +342,7 @@ class TestGroupDelete(TestGroup): self.cmd.take_action(parsed_args) self.fail('CommandError should be raised.') except exceptions.CommandError as e: - self.assertEqual('1 of 2 groups failed to delete.', - str(e)) + self.assertEqual('1 of 2 groups failed to delete.', str(e)) find_mock.assert_any_call(self.groups_mock, self.groups[0].id) find_mock.assert_any_call(self.groups_mock, 'unexist_group') @@ -348,7 +352,6 @@ class TestGroupDelete(TestGroup): class TestGroupList(TestGroup): - domain = identity_fakes.FakeDomain.create_one_domain() group = identity_fakes.FakeGroup.create_one_group() user = identity_fakes.FakeUser.create_one_user() @@ -393,16 +396,15 @@ class TestGroupList(TestGroup): 'user': None, } - self.groups_mock.list.assert_called_with( - **kwargs - ) + self.groups_mock.list.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, tuple(data)) def test_group_list_domain(self): arglist = [ - '--domain', self.domain.id, + '--domain', + self.domain.id, ] verifylist = [ ('domain', self.domain.id), @@ -420,16 +422,15 @@ class TestGroupList(TestGroup): 'user': None, } - self.groups_mock.list.assert_called_with( - **kwargs - ) + self.groups_mock.list.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, tuple(data)) def test_group_list_user(self): arglist = [ - '--user', self.user.name, + '--user', + self.user.name, ] verifylist = [ ('user', self.user.name), @@ -447,9 +448,7 @@ class TestGroupList(TestGroup): 'user': self.user.id, } - self.groups_mock.list.assert_called_with( - **kwargs - ) + self.groups_mock.list.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, tuple(data)) @@ -474,26 +473,25 @@ class TestGroupList(TestGroup): 'user': None, } - self.groups_mock.list.assert_called_with( - **kwargs - ) + self.groups_mock.list.assert_called_with(**kwargs) columns = self.columns + ( 'Domain ID', 'Description', ) - datalist = (( - self.group.id, - self.group.name, - self.group.domain_id, - self.group.description, - ), ) + datalist = ( + ( + self.group.id, + self.group.name, + self.group.domain_id, + self.group.description, + ), + ) self.assertEqual(columns, columns) self.assertEqual(datalist, tuple(data)) class TestGroupRemoveUser(TestGroup): - _group = identity_fakes.FakeGroup.create_one_group() users = identity_fakes.FakeUser.create_users(count=2) @@ -501,8 +499,7 @@ class TestGroupRemoveUser(TestGroup): super(TestGroupRemoveUser, self).setUp() self.groups_mock.get.return_value = self._group - self.users_mock.get = ( - identity_fakes.FakeUser.get_users(self.users)) + self.users_mock.get = identity_fakes.FakeUser.get_users(self.users) self.users_mock.remove_from_group.return_value = None self.cmd = group.RemoveUserFromGroup(self.app, None) @@ -520,7 +517,8 @@ class TestGroupRemoveUser(TestGroup): result = self.cmd.take_action(parsed_args) self.users_mock.remove_from_group.assert_called_once_with( - self.users[0].id, self._group.id) + self.users[0].id, self._group.id + ) self.assertIsNone(result) def test_group_remove_multi_users(self): @@ -536,15 +534,19 @@ class TestGroupRemoveUser(TestGroup): parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - calls = [call(self.users[0].id, self._group.id), - call(self.users[1].id, self._group.id)] + calls = [ + call(self.users[0].id, self._group.id), + call(self.users[1].id, self._group.id), + ] self.users_mock.remove_from_group.assert_has_calls(calls) self.assertIsNone(result) @mock.patch.object(group.LOG, 'error') def test_group_remove_user_with_error(self, mock_error): self.users_mock.remove_from_group.side_effect = [ - exceptions.CommandError(), None] + exceptions.CommandError(), + None, + ] arglist = [ self._group.id, self.users[0].id, @@ -569,10 +571,10 @@ class TestGroupRemoveUser(TestGroup): class TestGroupSet(TestGroup): - domain = identity_fakes.FakeDomain.create_one_domain() group = identity_fakes.FakeGroup.create_one_group( - attrs={'domain_id': domain.id}) + attrs={'domain_id': domain.id} + ) def setUp(self): super(TestGroupSet, self).setUp() @@ -598,8 +600,10 @@ class TestGroupSet(TestGroup): def test_group_set_name_and_description(self): arglist = [ - '--name', 'new_name', - '--description', 'new_description', + '--name', + 'new_name', + '--description', + 'new_description', self.group.id, ] verifylist = [ @@ -615,16 +619,17 @@ class TestGroupSet(TestGroup): 'description': 'new_description', } self.groups_mock.update.assert_called_once_with( - self.group.id, **kwargs) + self.group.id, **kwargs + ) self.assertIsNone(result) def test_group_set_with_domain(self): get_mock_result = [exceptions.CommandError, self.group] - self.groups_mock.get = ( - mock.Mock(side_effect=get_mock_result)) + self.groups_mock.get = mock.Mock(side_effect=get_mock_result) arglist = [ - '--domain', self.domain.id, + '--domain', + self.domain.id, self.group.id, ] verifylist = [ @@ -635,13 +640,13 @@ class TestGroupSet(TestGroup): result = self.cmd.take_action(parsed_args) self.groups_mock.get.assert_any_call( - self.group.id, domain_id=self.domain.id) + self.group.id, domain_id=self.domain.id + ) self.groups_mock.update.assert_called_once_with(self.group.id) self.assertIsNone(result) class TestGroupShow(TestGroup): - domain = identity_fakes.FakeDomain.create_one_domain() columns = ( @@ -654,7 +659,8 @@ class TestGroupShow(TestGroup): def setUp(self): super(TestGroupShow, self).setUp() self.group = identity_fakes.FakeGroup.create_one_group( - attrs={'domain_id': self.domain.id}) + attrs={'domain_id': self.domain.id} + ) self.data = ( self.group.description, self.group.domain_id, @@ -683,11 +689,11 @@ class TestGroupShow(TestGroup): def test_group_show_with_domain(self): get_mock_result = [exceptions.CommandError, self.group] - self.groups_mock.get = ( - mock.Mock(side_effect=get_mock_result)) + self.groups_mock.get = mock.Mock(side_effect=get_mock_result) arglist = [ - '--domain', self.domain.id, + '--domain', + self.domain.id, self.group.id, ] verifylist = [ @@ -698,6 +704,7 @@ class TestGroupShow(TestGroup): columns, data = self.cmd.take_action(parsed_args) self.groups_mock.get.assert_any_call( - self.group.id, domain_id=self.domain.id) + self.group.id, domain_id=self.domain.id + ) self.assertEqual(self.columns, columns) self.assertEqual(self.data, data) diff --git a/openstackclient/tests/unit/identity/v3/test_identity_provider.py b/openstackclient/tests/unit/identity/v3/test_identity_provider.py index 480bae59..f45f53a3 100644 --- a/openstackclient/tests/unit/identity/v3/test_identity_provider.py +++ b/openstackclient/tests/unit/identity/v3/test_identity_provider.py @@ -24,7 +24,6 @@ from openstackclient.tests.unit import utils as test_utils class TestIdentityProvider(identity_fakes.TestFederatedIdentity): - def setUp(self): super(TestIdentityProvider, self).setUp() @@ -44,7 +43,6 @@ class TestIdentityProvider(identity_fakes.TestFederatedIdentity): class TestIdentityProviderCreate(TestIdentityProvider): - columns = ( 'description', 'domain_id', @@ -87,8 +85,7 @@ class TestIdentityProviderCreate(TestIdentityProvider): } self.identity_providers_mock.create.assert_called_with( - id=identity_fakes.idp_id, - **kwargs + id=identity_fakes.idp_id, **kwargs ) self.assertEqual(self.columns, columns) @@ -96,7 +93,8 @@ class TestIdentityProviderCreate(TestIdentityProvider): def test_create_identity_provider_description(self): arglist = [ - '--description', identity_fakes.idp_description, + '--description', + identity_fakes.idp_description, identity_fakes.idp_id, ] verifylist = [ @@ -115,8 +113,7 @@ class TestIdentityProviderCreate(TestIdentityProvider): } self.identity_providers_mock.create.assert_called_with( - id=identity_fakes.idp_id, - **kwargs + id=identity_fakes.idp_id, **kwargs ) self.assertEqual(self.columns, columns) @@ -125,7 +122,8 @@ class TestIdentityProviderCreate(TestIdentityProvider): def test_create_identity_provider_remote_id(self): arglist = [ identity_fakes.idp_id, - '--remote-id', identity_fakes.idp_remote_ids[0] + '--remote-id', + identity_fakes.idp_remote_ids[0], ] verifylist = [ ('identity_provider_id', identity_fakes.idp_id), @@ -143,8 +141,7 @@ class TestIdentityProviderCreate(TestIdentityProvider): } self.identity_providers_mock.create.assert_called_with( - id=identity_fakes.idp_id, - **kwargs + id=identity_fakes.idp_id, **kwargs ) self.assertEqual(self.columns, columns) @@ -152,9 +149,11 @@ class TestIdentityProviderCreate(TestIdentityProvider): def test_create_identity_provider_remote_ids_multiple(self): arglist = [ - '--remote-id', identity_fakes.idp_remote_ids[0], - '--remote-id', identity_fakes.idp_remote_ids[1], - identity_fakes.idp_id + '--remote-id', + identity_fakes.idp_remote_ids[0], + '--remote-id', + identity_fakes.idp_remote_ids[1], + identity_fakes.idp_id, ] verifylist = [ ('identity_provider_id', identity_fakes.idp_id), @@ -172,8 +171,7 @@ class TestIdentityProviderCreate(TestIdentityProvider): } self.identity_providers_mock.create.assert_called_with( - id=identity_fakes.idp_id, - **kwargs + id=identity_fakes.idp_id, **kwargs ) self.assertEqual(self.columns, columns) @@ -181,7 +179,8 @@ class TestIdentityProviderCreate(TestIdentityProvider): def test_create_identity_provider_remote_ids_file(self): arglist = [ - '--remote-id-file', '/tmp/file_name', + '--remote-id-file', + '/tmp/file_name', identity_fakes.idp_id, ] verifylist = [ @@ -192,8 +191,11 @@ class TestIdentityProviderCreate(TestIdentityProvider): mocker = mock.Mock() mocker.return_value = "\n".join(identity_fakes.idp_remote_ids) - with mock.patch("openstackclient.identity.v3.identity_provider." - "utils.read_blob_file_contents", mocker): + with mock.patch( + "openstackclient.identity.v3.identity_provider." + "utils.read_blob_file_contents", + mocker, + ): columns, data = self.cmd.take_action(parsed_args) # Set expected values @@ -205,15 +207,13 @@ class TestIdentityProviderCreate(TestIdentityProvider): } self.identity_providers_mock.create.assert_called_with( - id=identity_fakes.idp_id, - **kwargs + id=identity_fakes.idp_id, **kwargs ) self.assertEqual(self.columns, columns) self.assertCountEqual(self.datalist, data) def test_create_identity_provider_disabled(self): - # Prepare FakeResource object IDENTITY_PROVIDER = copy.deepcopy(identity_fakes.IDENTITY_PROVIDER) IDENTITY_PROVIDER['enabled'] = False @@ -241,8 +241,7 @@ class TestIdentityProviderCreate(TestIdentityProvider): } self.identity_providers_mock.create.assert_called_with( - id=identity_fakes.idp_id, - **kwargs + id=identity_fakes.idp_id, **kwargs ) self.assertEqual(self.columns, columns) @@ -251,13 +250,14 @@ class TestIdentityProviderCreate(TestIdentityProvider): identity_fakes.domain_id, False, identity_fakes.idp_id, - identity_fakes.formatted_idp_remote_ids + identity_fakes.formatted_idp_remote_ids, ) self.assertCountEqual(datalist, data) def test_create_identity_provider_domain_name(self): arglist = [ - '--domain', identity_fakes.domain_name, + '--domain', + identity_fakes.domain_name, identity_fakes.idp_id, ] verifylist = [ @@ -276,8 +276,7 @@ class TestIdentityProviderCreate(TestIdentityProvider): } self.identity_providers_mock.create.assert_called_with( - id=identity_fakes.idp_id, - **kwargs + id=identity_fakes.idp_id, **kwargs ) self.assertEqual(self.columns, columns) @@ -285,7 +284,8 @@ class TestIdentityProviderCreate(TestIdentityProvider): def test_create_identity_provider_domain_id(self): arglist = [ - '--domain', identity_fakes.domain_id, + '--domain', + identity_fakes.domain_id, identity_fakes.idp_id, ] verifylist = [ @@ -304,8 +304,7 @@ class TestIdentityProviderCreate(TestIdentityProvider): } self.identity_providers_mock.create.assert_called_with( - id=identity_fakes.idp_id, - **kwargs + id=identity_fakes.idp_id, **kwargs ) self.assertEqual(self.columns, columns) @@ -313,7 +312,8 @@ class TestIdentityProviderCreate(TestIdentityProvider): def test_create_identity_provider_authttl_positive(self): arglist = [ - '--authorization-ttl', '60', + '--authorization-ttl', + '60', identity_fakes.idp_id, ] verifylist = [ @@ -333,8 +333,7 @@ class TestIdentityProviderCreate(TestIdentityProvider): } self.identity_providers_mock.create.assert_called_with( - id=identity_fakes.idp_id, - **kwargs + id=identity_fakes.idp_id, **kwargs ) self.assertEqual(self.columns, columns) @@ -342,7 +341,8 @@ class TestIdentityProviderCreate(TestIdentityProvider): def test_create_identity_provider_authttl_zero(self): arglist = [ - '--authorization-ttl', '0', + '--authorization-ttl', + '0', identity_fakes.idp_id, ] verifylist = [ @@ -362,8 +362,7 @@ class TestIdentityProviderCreate(TestIdentityProvider): } self.identity_providers_mock.create.assert_called_with( - id=identity_fakes.idp_id, - **kwargs + id=identity_fakes.idp_id, **kwargs ) self.assertEqual(self.columns, columns) @@ -371,7 +370,8 @@ class TestIdentityProviderCreate(TestIdentityProvider): def test_create_identity_provider_authttl_negative(self): arglist = [ - '--authorization-ttl', '-60', + '--authorization-ttl', + '-60', identity_fakes.idp_id, ] verifylist = [ @@ -379,21 +379,27 @@ class TestIdentityProviderCreate(TestIdentityProvider): ('authorization_ttl', -60), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.assertRaises(exceptions.CommandError, self.cmd.take_action, - parsed_args) + self.assertRaises( + exceptions.CommandError, self.cmd.take_action, parsed_args + ) def test_create_identity_provider_authttl_not_int(self): arglist = [ - '--authorization-ttl', 'spam', + '--authorization-ttl', + 'spam', identity_fakes.idp_id, ] verifylist = [] - self.assertRaises(test_utils.ParserException, self.check_parser, - self.cmd, arglist, verifylist) + self.assertRaises( + test_utils.ParserException, + self.check_parser, + self.cmd, + arglist, + verifylist, + ) class TestIdentityProviderDelete(TestIdentityProvider): - def setUp(self): super(TestIdentityProviderDelete, self).setUp() @@ -425,7 +431,6 @@ class TestIdentityProviderDelete(TestIdentityProvider): class TestIdentityProviderList(TestIdentityProvider): - def setUp(self): super(TestIdentityProviderList, self).setUp() @@ -459,20 +464,19 @@ class TestIdentityProviderList(TestIdentityProvider): collist = ('ID', 'Enabled', 'Domain ID', 'Description') self.assertEqual(collist, columns) - datalist = (( - identity_fakes.idp_id, - True, - identity_fakes.domain_id, - identity_fakes.idp_description, - ), ) + datalist = ( + ( + identity_fakes.idp_id, + True, + identity_fakes.domain_id, + identity_fakes.idp_description, + ), + ) self.assertCountEqual(datalist, tuple(data)) def test_identity_provider_list_ID_option(self): - arglist = ['--id', - identity_fakes.idp_id] - verifylist = [ - ('id', identity_fakes.idp_id) - ] + arglist = ['--id', identity_fakes.idp_id] + verifylist = [('id', identity_fakes.idp_id)] parsed_args = self.check_parser(self.cmd, arglist, verifylist) # In base command class Lister in cliff, abstract method take_action() @@ -480,26 +484,24 @@ class TestIdentityProviderList(TestIdentityProvider): # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - kwargs = { - 'id': identity_fakes.idp_id - } + kwargs = {'id': identity_fakes.idp_id} self.identity_providers_mock.list.assert_called_with(**kwargs) collist = ('ID', 'Enabled', 'Domain ID', 'Description') self.assertEqual(collist, columns) - datalist = (( - identity_fakes.idp_id, - True, - identity_fakes.domain_id, - identity_fakes.idp_description, - ), ) + datalist = ( + ( + identity_fakes.idp_id, + True, + identity_fakes.domain_id, + identity_fakes.idp_description, + ), + ) self.assertCountEqual(datalist, tuple(data)) def test_identity_provider_list_enabled_option(self): arglist = ['--enabled'] - verifylist = [ - ('enabled', True) - ] + verifylist = [('enabled', True)] parsed_args = self.check_parser(self.cmd, arglist, verifylist) # In base command class Lister in cliff, abstract method take_action() @@ -507,24 +509,23 @@ class TestIdentityProviderList(TestIdentityProvider): # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) - kwargs = { - 'enabled': True - } + kwargs = {'enabled': True} self.identity_providers_mock.list.assert_called_with(**kwargs) collist = ('ID', 'Enabled', 'Domain ID', 'Description') self.assertEqual(collist, columns) - datalist = (( - identity_fakes.idp_id, - True, - identity_fakes.domain_id, - identity_fakes.idp_description, - ), ) + datalist = ( + ( + identity_fakes.idp_id, + True, + identity_fakes.domain_id, + identity_fakes.idp_description, + ), + ) self.assertCountEqual(datalist, tuple(data)) class TestIdentityProviderSet(TestIdentityProvider): - columns = ( 'description', 'enabled', @@ -543,31 +544,24 @@ class TestIdentityProviderSet(TestIdentityProvider): self.cmd = identity_provider.SetIdentityProvider(self.app, None) def test_identity_provider_set_description(self): - """Set Identity Provider's description. """ + """Set Identity Provider's description.""" def prepare(self): """Prepare fake return objects before the test is executed""" updated_idp = copy.deepcopy(identity_fakes.IDENTITY_PROVIDER) updated_idp['enabled'] = False - resources = fakes.FakeResource( - None, - updated_idp, - loaded=True - ) + resources = fakes.FakeResource(None, updated_idp, loaded=True) self.identity_providers_mock.update.return_value = resources prepare(self) new_description = 'new desc' - arglist = [ - '--description', new_description, - identity_fakes.idp_id - ] + arglist = ['--description', new_description, identity_fakes.idp_id] verifylist = [ ('identity_provider', identity_fakes.idp_id), ('description', new_description), ('enable', False), ('disable', False), - ('remote_id', None) + ('remote_id', None), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) @@ -586,25 +580,24 @@ class TestIdentityProviderSet(TestIdentityProvider): """Prepare fake return objects before the test is executed""" updated_idp = copy.deepcopy(identity_fakes.IDENTITY_PROVIDER) updated_idp['enabled'] = False - resources = fakes.FakeResource( - None, - updated_idp, - loaded=True - ) + resources = fakes.FakeResource(None, updated_idp, loaded=True) self.identity_providers_mock.update.return_value = resources prepare(self) arglist = [ - '--disable', identity_fakes.idp_id, - '--remote-id', identity_fakes.idp_remote_ids[0], - '--remote-id', identity_fakes.idp_remote_ids[1] + '--disable', + identity_fakes.idp_id, + '--remote-id', + identity_fakes.idp_remote_ids[0], + '--remote-id', + identity_fakes.idp_remote_ids[1], ] verifylist = [ ('identity_provider', identity_fakes.idp_id), ('description', None), ('enable', False), ('disable', True), - ('remote_id', identity_fakes.idp_remote_ids) + ('remote_id', identity_fakes.idp_remote_ids), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -612,7 +605,7 @@ class TestIdentityProviderSet(TestIdentityProvider): self.identity_providers_mock.update.assert_called_with( identity_fakes.idp_id, enabled=False, - remote_ids=identity_fakes.idp_remote_ids + remote_ids=identity_fakes.idp_remote_ids, ) def test_identity_provider_enable(self): @@ -626,29 +619,34 @@ class TestIdentityProviderSet(TestIdentityProvider): resources = fakes.FakeResource( None, copy.deepcopy(identity_fakes.IDENTITY_PROVIDER), - loaded=True + loaded=True, ) self.identity_providers_mock.update.return_value = resources prepare(self) arglist = [ - '--enable', identity_fakes.idp_id, - '--remote-id', identity_fakes.idp_remote_ids[0], - '--remote-id', identity_fakes.idp_remote_ids[1] + '--enable', + identity_fakes.idp_id, + '--remote-id', + identity_fakes.idp_remote_ids[0], + '--remote-id', + identity_fakes.idp_remote_ids[1], ] verifylist = [ ('identity_provider', identity_fakes.idp_id), ('description', None), ('enable', True), ('disable', False), - ('remote_id', identity_fakes.idp_remote_ids) + ('remote_id', identity_fakes.idp_remote_ids), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) self.identity_providers_mock.update.assert_called_with( - identity_fakes.idp_id, enabled=True, - remote_ids=identity_fakes.idp_remote_ids) + identity_fakes.idp_id, + enabled=True, + remote_ids=identity_fakes.idp_remote_ids, + ) def test_identity_provider_replace_remote_ids(self): """Enable Identity Provider. @@ -662,31 +660,31 @@ class TestIdentityProviderSet(TestIdentityProvider): updated_idp = copy.deepcopy(identity_fakes.IDENTITY_PROVIDER) updated_idp['remote_ids'] = [self.new_remote_id] - resources = fakes.FakeResource( - None, - updated_idp, - loaded=True - ) + resources = fakes.FakeResource(None, updated_idp, loaded=True) self.identity_providers_mock.update.return_value = resources prepare(self) arglist = [ - '--enable', identity_fakes.idp_id, - '--remote-id', self.new_remote_id + '--enable', + identity_fakes.idp_id, + '--remote-id', + self.new_remote_id, ] verifylist = [ ('identity_provider', identity_fakes.idp_id), ('description', None), ('enable', True), ('disable', False), - ('remote_id', [self.new_remote_id]) + ('remote_id', [self.new_remote_id]), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.cmd.take_action(parsed_args) self.identity_providers_mock.update.assert_called_with( - identity_fakes.idp_id, enabled=True, - remote_ids=[self.new_remote_id]) + identity_fakes.idp_id, + enabled=True, + remote_ids=[self.new_remote_id], + ) def test_identity_provider_replace_remote_ids_file(self): """Enable Identity Provider. @@ -700,17 +698,15 @@ class TestIdentityProviderSet(TestIdentityProvider): updated_idp = copy.deepcopy(identity_fakes.IDENTITY_PROVIDER) updated_idp['remote_ids'] = [self.new_remote_id] - resources = fakes.FakeResource( - None, - updated_idp, - loaded=True - ) + resources = fakes.FakeResource(None, updated_idp, loaded=True) self.identity_providers_mock.update.return_value = resources prepare(self) arglist = [ - '--enable', identity_fakes.idp_id, - '--remote-id-file', self.new_remote_id, + '--enable', + identity_fakes.idp_id, + '--remote-id-file', + self.new_remote_id, ] verifylist = [ ('identity_provider', identity_fakes.idp_id), @@ -723,12 +719,17 @@ class TestIdentityProviderSet(TestIdentityProvider): mocker = mock.Mock() mocker.return_value = self.new_remote_id - with mock.patch("openstackclient.identity.v3.identity_provider." - "utils.read_blob_file_contents", mocker): + with mock.patch( + "openstackclient.identity.v3.identity_provider." + "utils.read_blob_file_contents", + mocker, + ): self.cmd.take_action(parsed_args) self.identity_providers_mock.update.assert_called_with( - identity_fakes.idp_id, enabled=True, - remote_ids=[self.new_remote_id]) + identity_fakes.idp_id, + enabled=True, + remote_ids=[self.new_remote_id], + ) def test_identity_provider_no_options(self): def prepare(self): @@ -736,7 +737,7 @@ class TestIdentityProviderSet(TestIdentityProvider): resources = fakes.FakeResource( None, copy.deepcopy(identity_fakes.IDENTITY_PROVIDER), - loaded=True + loaded=True, ) self.identity_providers_mock.get.return_value = resources @@ -755,7 +756,7 @@ class TestIdentityProviderSet(TestIdentityProvider): ('identity_provider', identity_fakes.idp_id), ('enable', False), ('disable', False), - ('remote_id', None) + ('remote_id', None), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -766,18 +767,11 @@ class TestIdentityProviderSet(TestIdentityProvider): """Prepare fake return objects before the test is executed""" updated_idp = copy.deepcopy(identity_fakes.IDENTITY_PROVIDER) updated_idp['authorization_ttl'] = 60 - resources = fakes.FakeResource( - None, - updated_idp, - loaded=True - ) + resources = fakes.FakeResource(None, updated_idp, loaded=True) self.identity_providers_mock.update.return_value = resources prepare(self) - arglist = [ - '--authorization-ttl', '60', - identity_fakes.idp_id - ] + arglist = ['--authorization-ttl', '60', identity_fakes.idp_id] verifylist = [ ('identity_provider', identity_fakes.idp_id), ('enable', False), @@ -797,18 +791,11 @@ class TestIdentityProviderSet(TestIdentityProvider): """Prepare fake return objects before the test is executed""" updated_idp = copy.deepcopy(identity_fakes.IDENTITY_PROVIDER) updated_idp['authorization_ttl'] = 0 - resources = fakes.FakeResource( - None, - updated_idp, - loaded=True - ) + resources = fakes.FakeResource(None, updated_idp, loaded=True) self.identity_providers_mock.update.return_value = resources prepare(self) - arglist = [ - '--authorization-ttl', '0', - identity_fakes.idp_id - ] + arglist = ['--authorization-ttl', '0', identity_fakes.idp_id] verifylist = [ ('identity_provider', identity_fakes.idp_id), ('enable', False), @@ -824,10 +811,7 @@ class TestIdentityProviderSet(TestIdentityProvider): ) def test_identity_provider_set_authttl_negative(self): - arglist = [ - '--authorization-ttl', '-1', - identity_fakes.idp_id - ] + arglist = ['--authorization-ttl', '-1', identity_fakes.idp_id] verifylist = [ ('identity_provider', identity_fakes.idp_id), ('enable', False), @@ -836,21 +820,23 @@ class TestIdentityProviderSet(TestIdentityProvider): ('authorization_ttl', -1), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.assertRaises(exceptions.CommandError, self.cmd.take_action, - parsed_args) + self.assertRaises( + exceptions.CommandError, self.cmd.take_action, parsed_args + ) def test_identity_provider_set_authttl_not_int(self): - arglist = [ - '--authorization-ttl', 'spam', - identity_fakes.idp_id - ] + arglist = ['--authorization-ttl', 'spam', identity_fakes.idp_id] verifylist = [] - self.assertRaises(test_utils.ParserException, self.check_parser, - self.cmd, arglist, verifylist) + self.assertRaises( + test_utils.ParserException, + self.check_parser, + self.cmd, + arglist, + verifylist, + ) class TestIdentityProviderShow(TestIdentityProvider): - def setUp(self): super(TestIdentityProviderShow, self).setUp() @@ -860,8 +846,10 @@ class TestIdentityProviderShow(TestIdentityProvider): loaded=True, ) - self.identity_providers_mock.get.side_effect = [Exception("Not found"), - ret] + self.identity_providers_mock.get.side_effect = [ + Exception("Not found"), + ret, + ] self.identity_providers_mock.get.return_value = ret # Get the command object to test @@ -879,8 +867,7 @@ class TestIdentityProviderShow(TestIdentityProvider): columns, data = self.cmd.take_action(parsed_args) self.identity_providers_mock.get.assert_called_with( - identity_fakes.idp_id, - id='test_idp' + identity_fakes.idp_id, id='test_idp' ) collist = ('description', 'domain_id', 'enabled', 'id', 'remote_ids') @@ -890,6 +877,6 @@ class TestIdentityProviderShow(TestIdentityProvider): identity_fakes.domain_id, True, identity_fakes.idp_id, - identity_fakes.formatted_idp_remote_ids + identity_fakes.formatted_idp_remote_ids, ) self.assertCountEqual(datalist, data) diff --git a/openstackclient/tests/unit/identity/v3/test_implied_role.py b/openstackclient/tests/unit/identity/v3/test_implied_role.py index 74968129..ea9c7596 100644 --- a/openstackclient/tests/unit/identity/v3/test_implied_role.py +++ b/openstackclient/tests/unit/identity/v3/test_implied_role.py @@ -21,7 +21,6 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes class TestRole(identity_fakes.TestIdentityv3): - def setUp(self): super(TestRole, self).setUp() @@ -56,7 +55,6 @@ class TestRole(identity_fakes.TestIdentityv3): class TestImpliedRoleCreate(TestRole): - def setUp(self): super(TestImpliedRoleCreate, self).setUp() @@ -75,8 +73,10 @@ class TestImpliedRoleCreate(TestRole): fake_resource = fakes.FakeResource( None, - {'prior_role': copy.deepcopy(identity_fakes.ROLES[0]), - 'implied': copy.deepcopy(identity_fakes.ROLES[1]), }, + { + 'prior_role': copy.deepcopy(identity_fakes.ROLES[0]), + 'implied': copy.deepcopy(identity_fakes.ROLES[1]), + }, loaded=True, ) self.inference_rules_mock.create.return_value = fake_resource @@ -84,10 +84,10 @@ class TestImpliedRoleCreate(TestRole): self.cmd = implied_role.CreateImpliedRole(self.app, None) def test_implied_role_create(self): - arglist = [ identity_fakes.ROLES[0]['id'], - '--implied-role', identity_fakes.ROLES[1]['id'], + '--implied-role', + identity_fakes.ROLES[1]['id'], ] verifylist = [ ('role', identity_fakes.ROLES[0]['id']), @@ -102,21 +102,19 @@ class TestImpliedRoleCreate(TestRole): # InferenceRuleManager.create(prior, implied) self.inference_rules_mock.create.assert_called_with( - identity_fakes.ROLES[0]['id'], - identity_fakes.ROLES[1]['id'] + identity_fakes.ROLES[0]['id'], identity_fakes.ROLES[1]['id'] ) collist = ('implied', 'prior_role') self.assertEqual(collist, columns) datalist = ( identity_fakes.ROLES[1]['id'], - identity_fakes.ROLES[0]['id'] + identity_fakes.ROLES[0]['id'], ) self.assertEqual(datalist, data) class TestImpliedRoleDelete(TestRole): - def setUp(self): super(TestImpliedRoleDelete, self).setUp() @@ -135,8 +133,10 @@ class TestImpliedRoleDelete(TestRole): fake_resource = fakes.FakeResource( None, - {'prior-role': copy.deepcopy(identity_fakes.ROLES[0]), - 'implied': copy.deepcopy(identity_fakes.ROLES[1]), }, + { + 'prior-role': copy.deepcopy(identity_fakes.ROLES[0]), + 'implied': copy.deepcopy(identity_fakes.ROLES[1]), + }, loaded=True, ) self.inference_rules_mock.delete.return_value = fake_resource @@ -146,7 +146,8 @@ class TestImpliedRoleDelete(TestRole): def test_implied_role_delete(self): arglist = [ identity_fakes.ROLES[0]['id'], - '--implied-role', identity_fakes.ROLES[1]['id'], + '--implied-role', + identity_fakes.ROLES[1]['id'], ] verifylist = [ ('role', identity_fakes.ROLES[0]['id']), @@ -156,18 +157,17 @@ class TestImpliedRoleDelete(TestRole): self.cmd.take_action(parsed_args) self.inference_rules_mock.delete.assert_called_with( - identity_fakes.ROLES[0]['id'], - identity_fakes.ROLES[1]['id'] + identity_fakes.ROLES[0]['id'], identity_fakes.ROLES[1]['id'] ) class TestImpliedRoleList(TestRole): - def setUp(self): super(TestImpliedRoleList, self).setUp() self.inference_rules_mock.list_inference_roles.return_value = ( - identity_fakes.FakeImpliedRoleResponse.create_list()) + identity_fakes.FakeImpliedRoleResponse.create_list() + ) self.cmd = implied_role.ListImpliedRole(self.app, None) @@ -178,12 +178,20 @@ class TestImpliedRoleList(TestRole): columns, data = self.cmd.take_action(parsed_args) self.inference_rules_mock.list_inference_roles.assert_called_with() - collist = ['Prior Role ID', 'Prior Role Name', - 'Implied Role ID', 'Implied Role Name'] + collist = [ + 'Prior Role ID', + 'Prior Role Name', + 'Implied Role ID', + 'Implied Role Name', + ] self.assertEqual(collist, columns) datalist = [ - (identity_fakes.ROLES[0]['id'], identity_fakes.ROLES[0]['name'], - identity_fakes.ROLES[1]['id'], identity_fakes.ROLES[1]['name']) + ( + identity_fakes.ROLES[0]['id'], + identity_fakes.ROLES[0]['name'], + identity_fakes.ROLES[1]['id'], + identity_fakes.ROLES[1]['name'], + ) ] x = [d for d in data] self.assertEqual(datalist, x) diff --git a/openstackclient/tests/unit/identity/v3/test_limit.py b/openstackclient/tests/unit/identity/v3/test_limit.py index e5cd87b8..d5895afe 100644 --- a/openstackclient/tests/unit/identity/v3/test_limit.py +++ b/openstackclient/tests/unit/identity/v3/test_limit.py @@ -21,7 +21,6 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes class TestLimit(identity_fakes.TestIdentityv3): - def setUp(self): super(TestLimit, self).setUp() @@ -40,28 +39,21 @@ class TestLimit(identity_fakes.TestIdentityv3): class TestLimitCreate(TestLimit): - def setUp(self): super(TestLimitCreate, self).setUp() self.service = fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.SERVICE), - loaded=True + None, copy.deepcopy(identity_fakes.SERVICE), loaded=True ) self.services_mock.get.return_value = self.service self.project = fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.PROJECT), - loaded=True + None, copy.deepcopy(identity_fakes.PROJECT), loaded=True ) self.projects_mock.get.return_value = self.project self.region = fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.REGION), - loaded=True + None, copy.deepcopy(identity_fakes.REGION), loaded=True ) self.regions_mock.get.return_value = self.region @@ -69,23 +61,24 @@ class TestLimitCreate(TestLimit): def test_limit_create_without_options(self): self.limit_mock.create.return_value = fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.LIMIT), - loaded=True + None, copy.deepcopy(identity_fakes.LIMIT), loaded=True ) resource_limit = 15 arglist = [ - '--project', identity_fakes.project_id, - '--service', identity_fakes.service_id, - '--resource-limit', str(resource_limit), - identity_fakes.limit_resource_name + '--project', + identity_fakes.project_id, + '--service', + identity_fakes.service_id, + '--resource-limit', + str(resource_limit), + identity_fakes.limit_resource_name, ] verifylist = [ ('project', identity_fakes.project_id), ('service', identity_fakes.service_id), ('resource_name', identity_fakes.limit_resource_name), - ('resource_limit', resource_limit) + ('resource_limit', resource_limit), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -100,8 +93,15 @@ class TestLimitCreate(TestLimit): **kwargs ) - collist = ('description', 'id', 'project_id', 'region_id', - 'resource_limit', 'resource_name', 'service_id') + collist = ( + 'description', + 'id', + 'project_id', + 'region_id', + 'resource_limit', + 'resource_name', + 'service_id', + ) self.assertEqual(collist, columns) datalist = ( None, @@ -110,25 +110,28 @@ class TestLimitCreate(TestLimit): None, resource_limit, identity_fakes.limit_resource_name, - identity_fakes.service_id + identity_fakes.service_id, ) self.assertEqual(datalist, data) def test_limit_create_with_options(self): self.limit_mock.create.return_value = fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.LIMIT_OPTIONS), - loaded=True + None, copy.deepcopy(identity_fakes.LIMIT_OPTIONS), loaded=True ) resource_limit = 15 arglist = [ - '--project', identity_fakes.project_id, - '--service', identity_fakes.service_id, - '--resource-limit', str(resource_limit), - '--region', identity_fakes.region_id, - '--description', identity_fakes.limit_description, - identity_fakes.limit_resource_name + '--project', + identity_fakes.project_id, + '--service', + identity_fakes.service_id, + '--resource-limit', + str(resource_limit), + '--region', + identity_fakes.region_id, + '--description', + identity_fakes.limit_description, + identity_fakes.limit_resource_name, ] verifylist = [ ('project', identity_fakes.project_id), @@ -136,7 +139,7 @@ class TestLimitCreate(TestLimit): ('resource_name', identity_fakes.limit_resource_name), ('resource_limit', resource_limit), ('region', identity_fakes.region_id), - ('description', identity_fakes.limit_description) + ('description', identity_fakes.limit_description), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -144,7 +147,7 @@ class TestLimitCreate(TestLimit): kwargs = { 'description': identity_fakes.limit_description, - 'region': self.region + 'region': self.region, } self.limit_mock.create.assert_called_with( self.project, @@ -154,8 +157,15 @@ class TestLimitCreate(TestLimit): **kwargs ) - collist = ('description', 'id', 'project_id', 'region_id', - 'resource_limit', 'resource_name', 'service_id') + collist = ( + 'description', + 'id', + 'project_id', + 'region_id', + 'resource_limit', + 'resource_name', + 'service_id', + ) self.assertEqual(collist, columns) datalist = ( identity_fakes.limit_description, @@ -164,13 +174,12 @@ class TestLimitCreate(TestLimit): identity_fakes.region_id, resource_limit, identity_fakes.limit_resource_name, - identity_fakes.service_id + identity_fakes.service_id, ) self.assertEqual(datalist, data) class TestLimitDelete(TestLimit): - def setUp(self): super(TestLimitDelete, self).setUp() self.cmd = limit.DeleteLimit(self.app, None) @@ -179,16 +188,12 @@ class TestLimitDelete(TestLimit): self.limit_mock.delete.return_value = None arglist = [identity_fakes.limit_id] - verifylist = [ - ('limit_id', [identity_fakes.limit_id]) - ] + verifylist = [('limit_id', [identity_fakes.limit_id])] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.limit_mock.delete.assert_called_with( - identity_fakes.limit_id - ) + self.limit_mock.delete.assert_called_with(identity_fakes.limit_id) self.assertIsNone(result) def test_limit_delete_with_exception(self): @@ -196,29 +201,22 @@ class TestLimitDelete(TestLimit): self.limit_mock.delete.side_effect = return_value arglist = ['fake-limit-id'] - verifylist = [ - ('limit_id', ['fake-limit-id']) - ] + verifylist = [('limit_id', ['fake-limit-id'])] parsed_args = self.check_parser(self.cmd, arglist, verifylist) try: self.cmd.take_action(parsed_args) self.fail('CommandError should be raised.') except exceptions.CommandError as e: - self.assertEqual( - '1 of 1 limits failed to delete.', str(e) - ) + self.assertEqual('1 of 1 limits failed to delete.', str(e)) class TestLimitShow(TestLimit): - def setUp(self): super(TestLimitShow, self).setUp() self.limit_mock.get.return_value = fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.LIMIT), - loaded=True + None, copy.deepcopy(identity_fakes.LIMIT), loaded=True ) self.cmd = limit.ShowLimit(self.app, None) @@ -233,8 +231,13 @@ class TestLimitShow(TestLimit): self.limit_mock.get.assert_called_with(identity_fakes.limit_id) collist = ( - 'description', 'id', 'project_id', 'region_id', 'resource_limit', - 'resource_name', 'service_id' + 'description', + 'id', + 'project_id', + 'region_id', + 'resource_limit', + 'resource_name', + 'service_id', ) self.assertEqual(collist, columns) datalist = ( @@ -244,13 +247,12 @@ class TestLimitShow(TestLimit): None, identity_fakes.limit_resource_limit, identity_fakes.limit_resource_name, - identity_fakes.service_id + identity_fakes.service_id, ) self.assertEqual(datalist, data) class TestLimitSet(TestLimit): - def setUp(self): super(TestLimitSet, self).setUp() self.cmd = limit.SetLimit(self.app, None) @@ -263,12 +265,13 @@ class TestLimitSet(TestLimit): ) arglist = [ - '--description', identity_fakes.limit_description, - identity_fakes.limit_id + '--description', + identity_fakes.limit_description, + identity_fakes.limit_id, ] verifylist = [ ('description', identity_fakes.limit_description), - ('limit_id', identity_fakes.limit_id) + ('limit_id', identity_fakes.limit_id), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -277,12 +280,17 @@ class TestLimitSet(TestLimit): self.limit_mock.update.assert_called_with( identity_fakes.limit_id, description=identity_fakes.limit_description, - resource_limit=None + resource_limit=None, ) collist = ( - 'description', 'id', 'project_id', 'region_id', 'resource_limit', - 'resource_name', 'service_id' + 'description', + 'id', + 'project_id', + 'region_id', + 'resource_limit', + 'resource_name', + 'service_id', ) self.assertEqual(collist, columns) datalist = ( @@ -292,7 +300,7 @@ class TestLimitSet(TestLimit): None, identity_fakes.limit_resource_limit, identity_fakes.limit_resource_name, - identity_fakes.service_id + identity_fakes.service_id, ) self.assertEqual(datalist, data) @@ -305,12 +313,13 @@ class TestLimitSet(TestLimit): ) arglist = [ - '--resource-limit', str(resource_limit), - identity_fakes.limit_id + '--resource-limit', + str(resource_limit), + identity_fakes.limit_id, ] verifylist = [ ('resource_limit', resource_limit), - ('limit_id', identity_fakes.limit_id) + ('limit_id', identity_fakes.limit_id), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -319,12 +328,17 @@ class TestLimitSet(TestLimit): self.limit_mock.update.assert_called_with( identity_fakes.limit_id, description=None, - resource_limit=resource_limit + resource_limit=resource_limit, ) collist = ( - 'description', 'id', 'project_id', 'region_id', 'resource_limit', - 'resource_name', 'service_id' + 'description', + 'id', + 'project_id', + 'region_id', + 'resource_limit', + 'resource_name', + 'service_id', ) self.assertEqual(collist, columns) datalist = ( @@ -334,21 +348,18 @@ class TestLimitSet(TestLimit): None, resource_limit, identity_fakes.limit_resource_name, - identity_fakes.service_id + identity_fakes.service_id, ) self.assertEqual(datalist, data) class TestLimitList(TestLimit): - def setUp(self): super(TestLimitList, self).setUp() self.limit_mock.list.return_value = [ fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.LIMIT), - loaded=True + None, copy.deepcopy(identity_fakes.LIMIT), loaded=True ) ] @@ -362,22 +373,28 @@ class TestLimitList(TestLimit): columns, data = self.cmd.take_action(parsed_args) self.limit_mock.list.assert_called_with( - service=None, resource_name=None, region=None, - project=None + service=None, resource_name=None, region=None, project=None ) collist = ( - 'ID', 'Project ID', 'Service ID', 'Resource Name', - 'Resource Limit', 'Description', 'Region ID' + 'ID', + 'Project ID', + 'Service ID', + 'Resource Name', + 'Resource Limit', + 'Description', + 'Region ID', ) self.assertEqual(collist, columns) - datalist = (( - identity_fakes.limit_id, - identity_fakes.project_id, - identity_fakes.service_id, - identity_fakes.limit_resource_name, - identity_fakes.limit_resource_limit, - None, - None - ), ) + datalist = ( + ( + identity_fakes.limit_id, + identity_fakes.project_id, + identity_fakes.service_id, + identity_fakes.limit_resource_name, + identity_fakes.limit_resource_limit, + None, + None, + ), + ) self.assertEqual(datalist, tuple(data)) diff --git a/openstackclient/tests/unit/identity/v3/test_mappings.py b/openstackclient/tests/unit/identity/v3/test_mappings.py index 184bd2a2..e594a96b 100644 --- a/openstackclient/tests/unit/identity/v3/test_mappings.py +++ b/openstackclient/tests/unit/identity/v3/test_mappings.py @@ -23,7 +23,6 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes class TestMapping(identity_fakes.TestFederatedIdentity): - def setUp(self): super(TestMapping, self).setUp() @@ -33,82 +32,73 @@ class TestMapping(identity_fakes.TestFederatedIdentity): class TestMappingCreate(TestMapping): - def setUp(self): super(TestMappingCreate, self).setUp() self.mapping_mock.create.return_value = fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.MAPPING_RESPONSE), - loaded=True + None, copy.deepcopy(identity_fakes.MAPPING_RESPONSE), loaded=True ) self.cmd = mapping.CreateMapping(self.app, None) def test_create_mapping(self): arglist = [ - '--rules', identity_fakes.mapping_rules_file_path, - identity_fakes.mapping_id + '--rules', + identity_fakes.mapping_rules_file_path, + identity_fakes.mapping_id, ] verifylist = [ ('mapping', identity_fakes.mapping_id), - ('rules', identity_fakes.mapping_rules_file_path) + ('rules', identity_fakes.mapping_rules_file_path), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) mocker = mock.Mock() mocker.return_value = identity_fakes.MAPPING_RULES - with mock.patch("openstackclient.identity.v3.mapping." - "CreateMapping._read_rules", mocker): + with mock.patch( + "openstackclient.identity.v3.mapping." "CreateMapping._read_rules", + mocker, + ): columns, data = self.cmd.take_action(parsed_args) self.mapping_mock.create.assert_called_with( mapping_id=identity_fakes.mapping_id, - rules=identity_fakes.MAPPING_RULES) + rules=identity_fakes.MAPPING_RULES, + ) collist = ('id', 'rules') self.assertEqual(collist, columns) - datalist = (identity_fakes.mapping_id, - identity_fakes.MAPPING_RULES) + datalist = (identity_fakes.mapping_id, identity_fakes.MAPPING_RULES) self.assertEqual(datalist, data) class TestMappingDelete(TestMapping): - def setUp(self): super(TestMappingDelete, self).setUp() self.mapping_mock.get.return_value = fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.MAPPING_RESPONSE), - loaded=True) + None, copy.deepcopy(identity_fakes.MAPPING_RESPONSE), loaded=True + ) self.mapping_mock.delete.return_value = None self.cmd = mapping.DeleteMapping(self.app, None) def test_delete_mapping(self): - arglist = [ - identity_fakes.mapping_id - ] - verifylist = [ - ('mapping', [identity_fakes.mapping_id]) - ] + arglist = [identity_fakes.mapping_id] + verifylist = [('mapping', [identity_fakes.mapping_id])] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) - self.mapping_mock.delete.assert_called_with( - identity_fakes.mapping_id) + self.mapping_mock.delete.assert_called_with(identity_fakes.mapping_id) self.assertIsNone(result) class TestMappingList(TestMapping): - def setUp(self): super(TestMappingList, self).setUp() self.mapping_mock.get.return_value = fakes.FakeResource( - None, - {'id': identity_fakes.mapping_id}, - loaded=True) + None, {'id': identity_fakes.mapping_id}, loaded=True + ) # Pretend list command returns list of two mappings. # NOTE(marek-denis): We are returning FakeResources with mapping id # only as ShowMapping class is implemented in a way where rules will @@ -146,20 +136,15 @@ class TestMappingList(TestMapping): class TestMappingSet(TestMapping): - def setUp(self): super(TestMappingSet, self).setUp() self.mapping_mock.get.return_value = fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.MAPPING_RESPONSE), - loaded=True + None, copy.deepcopy(identity_fakes.MAPPING_RESPONSE), loaded=True ) self.mapping_mock.update.return_value = fakes.FakeResource( - None, - identity_fakes.MAPPING_RESPONSE_2, - loaded=True + None, identity_fakes.MAPPING_RESPONSE_2, loaded=True ) # Get the command object to test @@ -167,74 +152,69 @@ class TestMappingSet(TestMapping): def test_set_new_rules(self): arglist = [ - '--rules', identity_fakes.mapping_rules_file_path, - identity_fakes.mapping_id + '--rules', + identity_fakes.mapping_rules_file_path, + identity_fakes.mapping_id, ] verifylist = [ ('mapping', identity_fakes.mapping_id), - ('rules', identity_fakes.mapping_rules_file_path) + ('rules', identity_fakes.mapping_rules_file_path), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) mocker = mock.Mock() mocker.return_value = identity_fakes.MAPPING_RULES_2 - with mock.patch("openstackclient.identity.v3.mapping." - "SetMapping._read_rules", mocker): + with mock.patch( + "openstackclient.identity.v3.mapping." "SetMapping._read_rules", + mocker, + ): result = self.cmd.take_action(parsed_args) self.mapping_mock.update.assert_called_with( mapping=identity_fakes.mapping_id, - rules=identity_fakes.MAPPING_RULES_2) + rules=identity_fakes.MAPPING_RULES_2, + ) self.assertIsNone(result) def test_set_rules_wrong_file_path(self): arglist = [ - '--rules', identity_fakes.mapping_rules_file_path, - identity_fakes.mapping_id + '--rules', + identity_fakes.mapping_rules_file_path, + identity_fakes.mapping_id, ] verifylist = [ ('mapping', identity_fakes.mapping_id), - ('rules', identity_fakes.mapping_rules_file_path) + ('rules', identity_fakes.mapping_rules_file_path), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) self.assertRaises( - exceptions.CommandError, - self.cmd.take_action, - parsed_args) + exceptions.CommandError, self.cmd.take_action, parsed_args + ) class TestMappingShow(TestMapping): - def setUp(self): super(TestMappingShow, self).setUp() self.mapping_mock.get.return_value = fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.MAPPING_RESPONSE), - loaded=True + None, copy.deepcopy(identity_fakes.MAPPING_RESPONSE), loaded=True ) self.cmd = mapping.ShowMapping(self.app, None) def test_mapping_show(self): - arglist = [ - identity_fakes.mapping_id - ] - verifylist = [ - ('mapping', identity_fakes.mapping_id) - ] + arglist = [identity_fakes.mapping_id] + verifylist = [('mapping', identity_fakes.mapping_id)] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.mapping_mock.get.assert_called_with( - identity_fakes.mapping_id) + self.mapping_mock.get.assert_called_with(identity_fakes.mapping_id) collist = ('id', 'rules') self.assertEqual(collist, columns) - datalist = (identity_fakes.mapping_id, - identity_fakes.MAPPING_RULES) + datalist = (identity_fakes.mapping_id, identity_fakes.MAPPING_RULES) self.assertEqual(datalist, data) diff --git a/openstackclient/tests/unit/identity/v3/test_oauth.py b/openstackclient/tests/unit/identity/v3/test_oauth.py index 3aabd9b8..0a4a6155 100644 --- a/openstackclient/tests/unit/identity/v3/test_oauth.py +++ b/openstackclient/tests/unit/identity/v3/test_oauth.py @@ -18,7 +18,6 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes class TestOAuth1(identity_fakes.TestOAuth1): - def setUp(self): super(TestOAuth1, self).setUp() identity_client = self.app.client_manager.identity @@ -33,7 +32,6 @@ class TestOAuth1(identity_fakes.TestOAuth1): class TestAccessTokenCreate(TestOAuth1): - def setUp(self): super(TestAccessTokenCreate, self).setUp() @@ -47,11 +45,16 @@ class TestAccessTokenCreate(TestOAuth1): def test_create_access_tokens(self): arglist = [ - '--consumer-key', identity_fakes.consumer_id, - '--consumer-secret', identity_fakes.consumer_secret, - '--request-key', identity_fakes.request_token_id, - '--request-secret', identity_fakes.request_token_secret, - '--verifier', identity_fakes.oauth_verifier_pin, + '--consumer-key', + identity_fakes.consumer_id, + '--consumer-secret', + identity_fakes.consumer_secret, + '--request-key', + identity_fakes.request_token_id, + '--request-secret', + identity_fakes.request_token_secret, + '--verifier', + identity_fakes.oauth_verifier_pin, ] verifylist = [ ('consumer_key', identity_fakes.consumer_id), @@ -83,7 +86,6 @@ class TestAccessTokenCreate(TestOAuth1): class TestRequestTokenAuthorize(TestOAuth1): - def setUp(self): super(TestRequestTokenAuthorize, self).setUp() @@ -100,8 +102,10 @@ class TestRequestTokenAuthorize(TestOAuth1): def test_authorize_request_tokens(self): arglist = [ - '--request-key', identity_fakes.request_token_id, - '--role', identity_fakes.role_name, + '--request-key', + identity_fakes.request_token_id, + '--role', + identity_fakes.role_name, ] verifylist = [ ('request_key', identity_fakes.request_token_id), @@ -117,14 +121,11 @@ class TestRequestTokenAuthorize(TestOAuth1): collist = ('oauth_verifier',) self.assertEqual(collist, columns) - datalist = ( - identity_fakes.oauth_verifier_pin, - ) + datalist = (identity_fakes.oauth_verifier_pin,) self.assertEqual(datalist, data) class TestRequestTokenCreate(TestOAuth1): - def setUp(self): super(TestRequestTokenCreate, self).setUp() @@ -144,9 +145,12 @@ class TestRequestTokenCreate(TestOAuth1): def test_create_request_tokens(self): arglist = [ - '--consumer-key', identity_fakes.consumer_id, - '--consumer-secret', identity_fakes.consumer_secret, - '--project', identity_fakes.project_id, + '--consumer-key', + identity_fakes.consumer_id, + '--consumer-secret', + identity_fakes.consumer_secret, + '--project', + identity_fakes.project_id, ] verifylist = [ ('consumer_key', identity_fakes.consumer_id), diff --git a/openstackclient/tests/unit/identity/v3/test_project.py b/openstackclient/tests/unit/identity/v3/test_project.py index dfd0805b..d5d3bb1f 100644 --- a/openstackclient/tests/unit/identity/v3/test_project.py +++ b/openstackclient/tests/unit/identity/v3/test_project.py @@ -25,7 +25,6 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes class TestProject(identity_fakes.TestIdentityv3): - def setUp(self): super(TestProject, self).setUp() @@ -39,7 +38,6 @@ class TestProject(identity_fakes.TestIdentityv3): class TestProjectCreate(TestProject): - domain = identity_fakes.FakeDomain.create_one_domain() columns = ( @@ -50,14 +48,15 @@ class TestProjectCreate(TestProject): 'is_domain', 'name', 'parent_id', - 'tags' + 'tags', ) def setUp(self): super(TestProjectCreate, self).setUp() self.project = identity_fakes.FakeProject.create_one_project( - attrs={'domain_id': self.domain.id}) + attrs={'domain_id': self.domain.id} + ) self.domains_mock.get.return_value = self.domain self.projects_mock.create.return_value = self.project self.datalist = ( @@ -68,7 +67,7 @@ class TestProjectCreate(TestProject): False, self.project.name, self.project.parent_id, - self.project.tags + self.project.tags, ) # Get the command object to test self.cmd = project.CreateProject(self.app, None) @@ -82,7 +81,7 @@ class TestProjectCreate(TestProject): ('enable', False), ('disable', False), ('name', self.project.name), - ('tags', []) + ('tags', []), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -103,9 +102,7 @@ class TestProjectCreate(TestProject): } # ProjectManager.create(name=, domain=, description=, # enabled=, **kwargs) - self.projects_mock.create.assert_called_with( - **kwargs - ) + self.projects_mock.create.assert_called_with(**kwargs) collist = ( 'description', @@ -115,7 +112,7 @@ class TestProjectCreate(TestProject): 'is_domain', 'name', 'parent_id', - 'tags' + 'tags', ) self.assertEqual(collist, columns) datalist = ( @@ -126,13 +123,14 @@ class TestProjectCreate(TestProject): False, self.project.name, self.project.parent_id, - self.project.tags + self.project.tags, ) self.assertEqual(datalist, data) def test_project_create_description(self): arglist = [ - '--description', 'new desc', + '--description', + 'new desc', self.project.name, ] verifylist = [ @@ -141,7 +139,7 @@ class TestProjectCreate(TestProject): ('disable', False), ('name', self.project.name), ('parent', None), - ('tags', []) + ('tags', []), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -162,16 +160,15 @@ class TestProjectCreate(TestProject): } # ProjectManager.create(name=, domain=, description=, # enabled=, **kwargs) - self.projects_mock.create.assert_called_with( - **kwargs - ) + self.projects_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) def test_project_create_domain(self): arglist = [ - '--domain', self.project.domain_id, + '--domain', + self.project.domain_id, self.project.name, ] verifylist = [ @@ -180,7 +177,7 @@ class TestProjectCreate(TestProject): ('disable', False), ('name', self.project.name), ('parent', None), - ('tags', []) + ('tags', []), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -201,16 +198,15 @@ class TestProjectCreate(TestProject): } # ProjectManager.create(name=, domain=, description=, # enabled=, **kwargs) - self.projects_mock.create.assert_called_with( - **kwargs - ) + self.projects_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) def test_project_create_domain_no_perms(self): arglist = [ - '--domain', self.project.domain_id, + '--domain', + self.project.domain_id, self.project.name, ] verifylist = [ @@ -219,7 +215,7 @@ class TestProjectCreate(TestProject): ('disable', False), ('name', self.project.name), ('parent', None), - ('tags', []) + ('tags', []), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) mocker = mock.Mock() @@ -238,9 +234,7 @@ class TestProjectCreate(TestProject): 'tags': [], 'options': {}, } - self.projects_mock.create.assert_called_with( - **kwargs - ) + self.projects_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -254,7 +248,7 @@ class TestProjectCreate(TestProject): ('disable', False), ('name', self.project.name), ('parent', None), - ('tags', []) + ('tags', []), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -275,9 +269,7 @@ class TestProjectCreate(TestProject): } # ProjectManager.create(name=, domain=, description=, # enabled=, **kwargs) - self.projects_mock.create.assert_called_with( - **kwargs - ) + self.projects_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -312,17 +304,17 @@ class TestProjectCreate(TestProject): } # ProjectManager.create(name=, domain=, # description=, enabled=, **kwargs) - self.projects_mock.create.assert_called_with( - **kwargs - ) + self.projects_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) def test_project_create_property(self): arglist = [ - '--property', 'fee=fi', - '--property', 'fo=fum', + '--property', + 'fee=fi', + '--property', + 'fo=fum', self.project.name, ] verifylist = [ @@ -350,16 +342,15 @@ class TestProjectCreate(TestProject): } # ProjectManager.create(name=, domain=, description=, # enabled=, **kwargs) - self.projects_mock.create.assert_called_with( - **kwargs - ) + self.projects_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) def test_project_create_is_domain_false_property(self): arglist = [ - '--property', 'is_domain=false', + '--property', + 'is_domain=false', self.project.name, ] verifylist = [ @@ -390,16 +381,15 @@ class TestProjectCreate(TestProject): 'tags': [], 'options': {}, } - self.projects_mock.create.assert_called_with( - **kwargs - ) + self.projects_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) def test_project_create_is_domain_true_property(self): arglist = [ - '--property', 'is_domain=true', + '--property', + 'is_domain=true', self.project.name, ] verifylist = [ @@ -430,16 +420,15 @@ class TestProjectCreate(TestProject): 'tags': [], 'options': {}, } - self.projects_mock.create.assert_called_with( - **kwargs - ) + self.projects_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) def test_project_create_is_domain_none_property(self): arglist = [ - '--property', 'is_domain=none', + '--property', + 'is_domain=none', self.project.name, ] verifylist = [ @@ -470,9 +459,7 @@ class TestProjectCreate(TestProject): 'tags': [], 'options': {}, } - self.projects_mock.create.assert_called_with( - **kwargs - ) + self.projects_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -480,13 +467,16 @@ class TestProjectCreate(TestProject): def test_project_create_parent(self): self.parent = identity_fakes.FakeProject.create_one_project() self.project = identity_fakes.FakeProject.create_one_project( - attrs={'domain_id': self.domain.id, 'parent_id': self.parent.id}) + attrs={'domain_id': self.domain.id, 'parent_id': self.parent.id} + ) self.projects_mock.get.return_value = self.parent self.projects_mock.create.return_value = self.project arglist = [ - '--domain', self.project.domain_id, - '--parent', self.parent.name, + '--domain', + self.project.domain_id, + '--parent', + self.parent.name, self.project.name, ] verifylist = [ @@ -495,7 +485,7 @@ class TestProjectCreate(TestProject): ('enable', False), ('disable', False), ('name', self.project.name), - ('tags', []) + ('tags', []), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -511,9 +501,7 @@ class TestProjectCreate(TestProject): 'options': {}, } - self.projects_mock.create.assert_called_with( - **kwargs - ) + self.projects_mock.create.assert_called_with(**kwargs) collist = ( 'description', @@ -523,7 +511,7 @@ class TestProjectCreate(TestProject): 'is_domain', 'name', 'parent_id', - 'tags' + 'tags', ) self.assertEqual(columns, collist) datalist = ( @@ -534,20 +522,24 @@ class TestProjectCreate(TestProject): self.project.is_domain, self.project.name, self.parent.id, - self.project.tags + self.project.tags, ) self.assertEqual(data, datalist) def test_project_create_invalid_parent(self): self.projects_mock.resource_class.__name__ = 'Project' self.projects_mock.get.side_effect = exceptions.NotFound( - 'Invalid parent') + 'Invalid parent' + ) self.projects_mock.find.side_effect = exceptions.NotFound( - 'Invalid parent') + 'Invalid parent' + ) arglist = [ - '--domain', self.project.domain_id, - '--parent', 'invalid', + '--domain', + self.project.domain_id, + '--parent', + 'invalid', self.project.name, ] verifylist = [ @@ -567,8 +559,10 @@ class TestProjectCreate(TestProject): def test_project_create_with_tags(self): arglist = [ - '--domain', self.project.domain_id, - '--tag', 'foo', + '--domain', + self.project.domain_id, + '--tag', + 'foo', self.project.name, ] verifylist = [ @@ -577,7 +571,7 @@ class TestProjectCreate(TestProject): ('disable', False), ('name', self.project.name), ('parent', None), - ('tags', ['foo']) + ('tags', ['foo']), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -596,9 +590,7 @@ class TestProjectCreate(TestProject): 'tags': ['foo'], 'options': {}, } - self.projects_mock.create.assert_called_with( - **kwargs - ) + self.projects_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -615,7 +607,7 @@ class TestProjectCreate(TestProject): ('disable', False), ('name', self.project.name), ('parent', None), - ('tags', []) + ('tags', []), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -636,9 +628,7 @@ class TestProjectCreate(TestProject): } # ProjectManager.create(name=, domain=, description=, # enabled=, **kwargs) - self.projects_mock.create.assert_called_with( - **kwargs - ) + self.projects_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -655,7 +645,7 @@ class TestProjectCreate(TestProject): ('disable', False), ('name', self.project.name), ('parent', None), - ('tags', []) + ('tags', []), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -676,16 +666,13 @@ class TestProjectCreate(TestProject): } # ProjectManager.create(name=, domain=, description=, # enabled=, **kwargs) - self.projects_mock.create.assert_called_with( - **kwargs - ) + self.projects_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) class TestProjectDelete(TestProject): - project = identity_fakes.FakeProject.create_one_project() def setUp(self): @@ -716,8 +703,7 @@ class TestProjectDelete(TestProject): @mock.patch.object(utils, 'find_resource') def test_delete_multi_projects_with_exception(self, find_mock): - find_mock.side_effect = [self.project, - exceptions.CommandError] + find_mock.side_effect = [self.project, exceptions.CommandError] arglist = [ self.project.id, 'unexist_project', @@ -731,8 +717,7 @@ class TestProjectDelete(TestProject): self.cmd.take_action(parsed_args) self.fail('CommandError should be raised.') except exceptions.CommandError as e: - self.assertEqual('1 of 2 projects failed to delete.', - str(e)) + self.assertEqual('1 of 2 projects failed to delete.', str(e)) find_mock.assert_any_call(self.projects_mock, self.project.id) find_mock.assert_any_call(self.projects_mock, 'unexist_project') @@ -742,10 +727,10 @@ class TestProjectDelete(TestProject): class TestProjectList(TestProject): - domain = identity_fakes.FakeDomain.create_one_domain() project = identity_fakes.FakeProject.create_one_project( - attrs={'domain_id': domain.id}) + attrs={'domain_id': domain.id} + ) projects = identity_fakes.FakeProject.create_projects() columns = ( @@ -759,10 +744,18 @@ class TestProjectList(TestProject): ), ) datalists = ( - (projects[0].description, True, - projects[0].id, projects[0].name,), - (projects[1].description, True, - projects[1].id, projects[1].name,), + ( + projects[0].description, + True, + projects[0].id, + projects[0].name, + ), + ( + projects[1].description, + True, + projects[1].id, + projects[1].name, + ), ) def setUp(self): @@ -804,18 +797,21 @@ class TestProjectList(TestProject): collist = ('ID', 'Name', 'Domain ID', 'Description', 'Enabled') self.assertEqual(collist, columns) - datalist = (( - self.project.id, - self.project.name, - self.project.domain_id, - self.project.description, - True, - ), ) + datalist = ( + ( + self.project.id, + self.project.name, + self.project.domain_id, + self.project.description, + True, + ), + ) self.assertEqual(datalist, tuple(data)) def test_project_list_domain(self): arglist = [ - '--domain', self.project.domain_id, + '--domain', + self.project.domain_id, ] verifylist = [ ('domain', self.project.domain_id), @@ -830,14 +826,16 @@ class TestProjectList(TestProject): # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) self.projects_mock.list.assert_called_with( - domain=self.project.domain_id) + domain=self.project.domain_id + ) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, tuple(data)) def test_project_list_domain_no_perms(self): arglist = [ - '--domain', self.project.domain_id, + '--domain', + self.project.domain_id, ] verifylist = [ ('domain', self.project.domain_id), @@ -850,17 +848,20 @@ class TestProjectList(TestProject): columns, data = self.cmd.take_action(parsed_args) self.projects_mock.list.assert_called_with( - domain=self.project.domain_id) + domain=self.project.domain_id + ) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, tuple(data)) def test_project_list_parent(self): self.parent = identity_fakes.FakeProject.create_one_project() self.project = identity_fakes.FakeProject.create_one_project( - attrs={'domain_id': self.domain.id, 'parent_id': self.parent.id}) + attrs={'domain_id': self.domain.id, 'parent_id': self.parent.id} + ) arglist = [ - '--parent', self.parent.id, + '--parent', + self.parent.id, ] verifylist = [ ('parent', self.parent.id), @@ -879,7 +880,10 @@ class TestProjectList(TestProject): def test_project_list_sort(self): self.projects_mock.list.return_value = self.projects - arglist = ['--sort', 'name:asc', ] + arglist = [ + '--sort', + 'name:asc', + ] verifylist = [] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -926,22 +930,25 @@ class TestProjectList(TestProject): # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) self.projects_mock.list.assert_called_with( - user=self.app.client_manager.auth_ref.user_id) + user=self.app.client_manager.auth_ref.user_id + ) collist = ('ID', 'Name') self.assertEqual(collist, columns) - datalist = (( - self.project.id, - self.project.name, - ), ) + datalist = ( + ( + self.project.id, + self.project.name, + ), + ) self.assertEqual(datalist, tuple(data)) class TestProjectSet(TestProject): - domain = identity_fakes.FakeDomain.create_one_domain() project = identity_fakes.FakeProject.create_one_project( - attrs={'domain_id': domain.id}) + attrs={'domain_id': domain.id} + ) def setUp(self): super(TestProjectSet, self).setUp() @@ -971,8 +978,10 @@ class TestProjectSet(TestProject): def test_project_set_name(self): arglist = [ - '--name', 'qwerty', - '--domain', self.project.domain_id, + '--name', + 'qwerty', + '--domain', + self.project.domain_id, self.project.name, ] verifylist = [ @@ -992,16 +1001,15 @@ class TestProjectSet(TestProject): } # ProjectManager.update(project, name=, domain=, description=, # enabled=, **kwargs) - self.projects_mock.update.assert_called_with( - self.project.id, - **kwargs - ) + self.projects_mock.update.assert_called_with(self.project.id, **kwargs) self.assertIsNone(result) def test_project_set_description(self): arglist = [ - '--domain', self.project.domain_id, - '--description', 'new desc', + '--domain', + self.project.domain_id, + '--description', + 'new desc', self.project.name, ] verifylist = [ @@ -1019,15 +1027,13 @@ class TestProjectSet(TestProject): kwargs = { 'description': 'new desc', } - self.projects_mock.update.assert_called_with( - self.project.id, - **kwargs - ) + self.projects_mock.update.assert_called_with(self.project.id, **kwargs) self.assertIsNone(result) def test_project_set_enable(self): arglist = [ - '--domain', self.project.domain_id, + '--domain', + self.project.domain_id, '--enable', self.project.name, ] @@ -1045,15 +1051,13 @@ class TestProjectSet(TestProject): kwargs = { 'enabled': True, } - self.projects_mock.update.assert_called_with( - self.project.id, - **kwargs - ) + self.projects_mock.update.assert_called_with(self.project.id, **kwargs) self.assertIsNone(result) def test_project_set_disable(self): arglist = [ - '--domain', self.project.domain_id, + '--domain', + self.project.domain_id, '--disable', self.project.name, ] @@ -1071,17 +1075,17 @@ class TestProjectSet(TestProject): kwargs = { 'enabled': False, } - self.projects_mock.update.assert_called_with( - self.project.id, - **kwargs - ) + self.projects_mock.update.assert_called_with(self.project.id, **kwargs) self.assertIsNone(result) def test_project_set_property(self): arglist = [ - '--domain', self.project.domain_id, - '--property', 'fee=fi', - '--property', 'fo=fum', + '--domain', + self.project.domain_id, + '--property', + 'fee=fi', + '--property', + 'fo=fum', self.project.name, ] verifylist = [ @@ -1098,17 +1102,17 @@ class TestProjectSet(TestProject): 'fee': 'fi', 'fo': 'fum', } - self.projects_mock.update.assert_called_with( - self.project.id, - **kwargs - ) + self.projects_mock.update.assert_called_with(self.project.id, **kwargs) self.assertIsNone(result) def test_project_set_tags(self): arglist = [ - '--name', 'qwerty', - '--domain', self.project.domain_id, - '--tag', 'foo', + '--name', + 'qwerty', + '--domain', + self.project.domain_id, + '--tag', + 'foo', self.project.name, ] verifylist = [ @@ -1117,28 +1121,23 @@ class TestProjectSet(TestProject): ('enable', False), ('disable', False), ('project', self.project.name), - ('tags', ['foo']) + ('tags', ['foo']), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) # Set expected values - kwargs = { - 'name': 'qwerty', - 'tags': ['foo'] - } + kwargs = {'name': 'qwerty', 'tags': ['foo']} # ProjectManager.update(project, name=, domain=, description=, # enabled=, **kwargs) - self.projects_mock.update.assert_called_with( - self.project.id, - **kwargs - ) + self.projects_mock.update.assert_called_with(self.project.id, **kwargs) self.assertIsNone(result) def test_project_set_with_immutable_option(self): arglist = [ - '--domain', self.project.domain_id, + '--domain', + self.project.domain_id, '--immutable', self.project.name, ] @@ -1157,15 +1156,13 @@ class TestProjectSet(TestProject): kwargs = { 'options': {'immutable': True}, } - self.projects_mock.update.assert_called_with( - self.project.id, - **kwargs - ) + self.projects_mock.update.assert_called_with(self.project.id, **kwargs) self.assertIsNone(result) def test_project_set_with_no_immutable_option(self): arglist = [ - '--domain', self.project.domain_id, + '--domain', + self.project.domain_id, '--no-immutable', self.project.name, ] @@ -1184,28 +1181,24 @@ class TestProjectSet(TestProject): kwargs = { 'options': {'immutable': False}, } - self.projects_mock.update.assert_called_with( - self.project.id, - **kwargs - ) + self.projects_mock.update.assert_called_with(self.project.id, **kwargs) self.assertIsNone(result) class TestProjectShow(TestProject): - domain = identity_fakes.FakeDomain.create_one_domain() def setUp(self): super(TestProjectShow, self).setUp() self.project = identity_fakes.FakeProject.create_one_project( - attrs={'domain_id': self.domain.id}) + attrs={'domain_id': self.domain.id} + ) # Get the command object to test self.cmd = project.ShowProject(self.app, None) def test_project_show(self): - self.projects_mock.get.return_value = self.project arglist = [ @@ -1216,15 +1209,15 @@ class TestProjectShow(TestProject): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.app.client_manager.identity.tokens.get_token_data.return_value = \ - {'token': - {'project': - {'domain': {}, - 'name': parsed_args.project, - 'id': parsed_args.project - } - } - } + self.app.client_manager.identity.tokens.get_token_data.return_value = { + 'token': { + 'project': { + 'domain': {}, + 'name': parsed_args.project, + 'id': parsed_args.project, + } + } + } # In base command class ShowOne in cliff, abstract method take_action() # returns a two-part tuple with a tuple of column names and a tuple of @@ -1241,7 +1234,7 @@ class TestProjectShow(TestProject): 'is_domain', 'name', 'parent_id', - 'tags' + 'tags', ) self.assertEqual(collist, columns) datalist = ( @@ -1252,7 +1245,7 @@ class TestProjectShow(TestProject): False, self.project.name, self.project.parent_id, - self.project.tags + self.project.tags, ) self.assertEqual(datalist, data) @@ -1260,7 +1253,7 @@ class TestProjectShow(TestProject): self.project = identity_fakes.FakeProject.create_one_project( attrs={ 'parent_id': self.project.parent_id, - 'parents': [{'project': {'id': self.project.parent_id}}] + 'parents': [{'project': {'id': self.project.parent_id}}], } ) self.projects_mock.get.return_value = self.project @@ -1275,23 +1268,28 @@ class TestProjectShow(TestProject): ('children', False), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.app.client_manager.identity.tokens.get_token_data.return_value = \ - {'token': - {'project': - {'domain': {}, - 'name': parsed_args.project, - 'id': parsed_args.project - } - } - } + self.app.client_manager.identity.tokens.get_token_data.return_value = { + 'token': { + 'project': { + 'domain': {}, + 'name': parsed_args.project, + 'id': parsed_args.project, + } + } + } columns, data = self.cmd.take_action(parsed_args) - self.projects_mock.get.assert_has_calls([call(self.project.id), - call(self.project.id, - parents_as_ids=True, - subtree_as_ids=False, - )]) + self.projects_mock.get.assert_has_calls( + [ + call(self.project.id), + call( + self.project.id, + parents_as_ids=True, + subtree_as_ids=False, + ), + ] + ) collist = ( 'description', @@ -1302,7 +1300,7 @@ class TestProjectShow(TestProject): 'name', 'parent_id', 'parents', - 'tags' + 'tags', ) self.assertEqual(columns, collist) datalist = ( @@ -1314,7 +1312,7 @@ class TestProjectShow(TestProject): self.project.name, self.project.parent_id, [{'project': {'id': self.project.parent_id}}], - self.project.tags + self.project.tags, ) self.assertEqual(data, datalist) @@ -1322,7 +1320,7 @@ class TestProjectShow(TestProject): self.project = identity_fakes.FakeProject.create_one_project( attrs={ 'parent_id': self.project.parent_id, - 'subtree': [{'project': {'id': 'children-id'}}] + 'subtree': [{'project': {'id': 'children-id'}}], } ) self.projects_mock.get.return_value = self.project @@ -1337,22 +1335,27 @@ class TestProjectShow(TestProject): ('children', True), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.app.client_manager.identity.tokens.get_token_data.return_value = \ - {'token': - {'project': - {'domain': {}, - 'name': parsed_args.project, - 'id': parsed_args.project - } - } - } + self.app.client_manager.identity.tokens.get_token_data.return_value = { + 'token': { + 'project': { + 'domain': {}, + 'name': parsed_args.project, + 'id': parsed_args.project, + } + } + } columns, data = self.cmd.take_action(parsed_args) - self.projects_mock.get.assert_has_calls([call(self.project.id), - call(self.project.id, - parents_as_ids=False, - subtree_as_ids=True, - )]) + self.projects_mock.get.assert_has_calls( + [ + call(self.project.id), + call( + self.project.id, + parents_as_ids=False, + subtree_as_ids=True, + ), + ] + ) collist = ( 'description', @@ -1363,7 +1366,7 @@ class TestProjectShow(TestProject): 'name', 'parent_id', 'subtree', - 'tags' + 'tags', ) self.assertEqual(columns, collist) datalist = ( @@ -1375,7 +1378,7 @@ class TestProjectShow(TestProject): self.project.name, self.project.parent_id, [{'project': {'id': 'children-id'}}], - self.project.tags + self.project.tags, ) self.assertEqual(data, datalist) @@ -1384,7 +1387,7 @@ class TestProjectShow(TestProject): attrs={ 'parent_id': self.project.parent_id, 'parents': [{'project': {'id': self.project.parent_id}}], - 'subtree': [{'project': {'id': 'children-id'}}] + 'subtree': [{'project': {'id': 'children-id'}}], } ) self.projects_mock.get.return_value = self.project @@ -1400,22 +1403,27 @@ class TestProjectShow(TestProject): ('children', True), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.app.client_manager.identity.tokens.get_token_data.return_value = \ - {'token': - {'project': - {'domain': {}, - 'name': parsed_args.project, - 'id': parsed_args.project - } - } - } + self.app.client_manager.identity.tokens.get_token_data.return_value = { + 'token': { + 'project': { + 'domain': {}, + 'name': parsed_args.project, + 'id': parsed_args.project, + } + } + } columns, data = self.cmd.take_action(parsed_args) - self.projects_mock.get.assert_has_calls([call(self.project.id), - call(self.project.id, - parents_as_ids=True, - subtree_as_ids=True, - )]) + self.projects_mock.get.assert_has_calls( + [ + call(self.project.id), + call( + self.project.id, + parents_as_ids=True, + subtree_as_ids=True, + ), + ] + ) collist = ( 'description', @@ -1427,7 +1435,7 @@ class TestProjectShow(TestProject): 'parent_id', 'parents', 'subtree', - 'tags' + 'tags', ) self.assertEqual(columns, collist) datalist = ( @@ -1440,27 +1448,29 @@ class TestProjectShow(TestProject): self.project.parent_id, [{'project': {'id': self.project.parent_id}}], [{'project': {'id': 'children-id'}}], - self.project.tags + self.project.tags, ) self.assertEqual(data, datalist) def test_project_show_with_domain(self): project = identity_fakes.FakeProject.create_one_project( - {"name": self.project.name}) - - self.app.client_manager.identity.tokens.get_token_data.return_value = \ - {'token': - {'project': - {'domain': {"id": self.project.domain_id}, - 'name': self.project.name, - 'id': self.project.id - } - } - } + {"name": self.project.name} + ) + + self.app.client_manager.identity.tokens.get_token_data.return_value = { + 'token': { + 'project': { + 'domain': {"id": self.project.domain_id}, + 'name': self.project.name, + 'id': self.project.id, + } + } + } identity_client = self.app.client_manager.identity arglist = [ - "--domain", self.domain.id, + "--domain", + self.domain.id, project.name, ] verifylist = [ @@ -1469,13 +1479,14 @@ class TestProjectShow(TestProject): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - project_str = common._get_token_resource(identity_client, 'project', - parsed_args.project, - parsed_args.domain) + project_str = common._get_token_resource( + identity_client, 'project', parsed_args.project, parsed_args.domain + ) self.assertEqual(self.project.id, project_str) arglist = [ - "--domain", project.domain_id, + "--domain", + project.domain_id, project.name, ] verifylist = [ @@ -1484,7 +1495,7 @@ class TestProjectShow(TestProject): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - project_str = common._get_token_resource(identity_client, 'project', - parsed_args.project, - parsed_args.domain) + project_str = common._get_token_resource( + identity_client, 'project', parsed_args.project, parsed_args.domain + ) self.assertEqual(project.name, project_str) diff --git a/openstackclient/tests/unit/identity/v3/test_protocol.py b/openstackclient/tests/unit/identity/v3/test_protocol.py index 30b4aa4a..bb27910c 100644 --- a/openstackclient/tests/unit/identity/v3/test_protocol.py +++ b/openstackclient/tests/unit/identity/v3/test_protocol.py @@ -20,7 +20,6 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes class TestProtocol(identity_fakes.TestFederatedIdentity): - def setUp(self): super(TestProtocol, self).setUp() @@ -30,7 +29,6 @@ class TestProtocol(identity_fakes.TestFederatedIdentity): class TestProtocolCreate(TestProtocol): - def setUp(self): super(TestProtocolCreate, self).setUp() @@ -42,33 +40,37 @@ class TestProtocolCreate(TestProtocol): def test_create_protocol(self): argslist = [ identity_fakes.protocol_id, - '--identity-provider', identity_fakes.idp_id, - '--mapping', identity_fakes.mapping_id + '--identity-provider', + identity_fakes.idp_id, + '--mapping', + identity_fakes.mapping_id, ] verifylist = [ ('federation_protocol', identity_fakes.protocol_id), ('identity_provider', identity_fakes.idp_id), - ('mapping', identity_fakes.mapping_id) + ('mapping', identity_fakes.mapping_id), ] parsed_args = self.check_parser(self.cmd, argslist, verifylist) columns, data = self.cmd.take_action(parsed_args) self.protocols_mock.create.assert_called_with( protocol_id=identity_fakes.protocol_id, identity_provider=identity_fakes.idp_id, - mapping=identity_fakes.mapping_id) + mapping=identity_fakes.mapping_id, + ) collist = ('id', 'identity_provider', 'mapping') self.assertEqual(collist, columns) - datalist = (identity_fakes.protocol_id, - identity_fakes.idp_id, - identity_fakes.mapping_id) + datalist = ( + identity_fakes.protocol_id, + identity_fakes.idp_id, + identity_fakes.mapping_id, + ) self.assertEqual(datalist, data) class TestProtocolDelete(TestProtocol): - def setUp(self): super(TestProtocolDelete, self).setUp() @@ -84,8 +86,9 @@ class TestProtocolDelete(TestProtocol): def test_delete_identity_provider(self): arglist = [ - '--identity-provider', identity_fakes.idp_id, - identity_fakes.protocol_id + '--identity-provider', + identity_fakes.idp_id, + identity_fakes.protocol_id, ] verifylist = [ ('federation_protocol', [identity_fakes.protocol_id]), @@ -96,20 +99,24 @@ class TestProtocolDelete(TestProtocol): result = self.cmd.take_action(parsed_args) self.protocols_mock.delete.assert_called_with( - identity_fakes.idp_id, identity_fakes.protocol_id) + identity_fakes.idp_id, identity_fakes.protocol_id + ) self.assertIsNone(result) class TestProtocolList(TestProtocol): - def setUp(self): super(TestProtocolList, self).setUp() self.protocols_mock.get.return_value = fakes.FakeResource( - None, identity_fakes.PROTOCOL_ID_MAPPING, loaded=True) + None, identity_fakes.PROTOCOL_ID_MAPPING, loaded=True + ) - self.protocols_mock.list.return_value = [fakes.FakeResource( - None, identity_fakes.PROTOCOL_ID_MAPPING, loaded=True)] + self.protocols_mock.list.return_value = [ + fakes.FakeResource( + None, identity_fakes.PROTOCOL_ID_MAPPING, loaded=True + ) + ] self.cmd = federation_protocol.ListProtocols(self.app, None) @@ -124,65 +131,83 @@ class TestProtocolList(TestProtocol): class TestProtocolSet(TestProtocol): - def setUp(self): super(TestProtocolSet, self).setUp() self.protocols_mock.get.return_value = fakes.FakeResource( - None, identity_fakes.PROTOCOL_OUTPUT, loaded=True) + None, identity_fakes.PROTOCOL_OUTPUT, loaded=True + ) self.protocols_mock.update.return_value = fakes.FakeResource( - None, identity_fakes.PROTOCOL_OUTPUT_UPDATED, loaded=True) + None, identity_fakes.PROTOCOL_OUTPUT_UPDATED, loaded=True + ) self.cmd = federation_protocol.SetProtocol(self.app, None) def test_set_new_mapping(self): arglist = [ identity_fakes.protocol_id, - '--identity-provider', identity_fakes.idp_id, - '--mapping', identity_fakes.mapping_id + '--identity-provider', + identity_fakes.idp_id, + '--mapping', + identity_fakes.mapping_id, + ] + verifylist = [ + ('identity_provider', identity_fakes.idp_id), + ('federation_protocol', identity_fakes.protocol_id), + ('mapping', identity_fakes.mapping_id), ] - verifylist = [('identity_provider', identity_fakes.idp_id), - ('federation_protocol', identity_fakes.protocol_id), - ('mapping', identity_fakes.mapping_id)] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) self.protocols_mock.update.assert_called_with( - identity_fakes.idp_id, identity_fakes.protocol_id, - identity_fakes.mapping_id) + identity_fakes.idp_id, + identity_fakes.protocol_id, + identity_fakes.mapping_id, + ) collist = ('id', 'identity_provider', 'mapping') self.assertEqual(collist, columns) - datalist = (identity_fakes.protocol_id, identity_fakes.idp_id, - identity_fakes.mapping_id_updated) + datalist = ( + identity_fakes.protocol_id, + identity_fakes.idp_id, + identity_fakes.mapping_id_updated, + ) self.assertEqual(datalist, data) class TestProtocolShow(TestProtocol): - def setUp(self): super(TestProtocolShow, self).setUp() self.protocols_mock.get.return_value = fakes.FakeResource( - None, identity_fakes.PROTOCOL_OUTPUT, loaded=False) + None, identity_fakes.PROTOCOL_OUTPUT, loaded=False + ) self.cmd = federation_protocol.ShowProtocol(self.app, None) def test_show_protocol(self): - arglist = [identity_fakes.protocol_id, '--identity-provider', - identity_fakes.idp_id] - verifylist = [('federation_protocol', identity_fakes.protocol_id), - ('identity_provider', identity_fakes.idp_id)] + arglist = [ + identity_fakes.protocol_id, + '--identity-provider', + identity_fakes.idp_id, + ] + verifylist = [ + ('federation_protocol', identity_fakes.protocol_id), + ('identity_provider', identity_fakes.idp_id), + ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) - self.protocols_mock.get.assert_called_with(identity_fakes.idp_id, - identity_fakes.protocol_id) + self.protocols_mock.get.assert_called_with( + identity_fakes.idp_id, identity_fakes.protocol_id + ) collist = ('id', 'identity_provider', 'mapping') self.assertEqual(collist, columns) - datalist = (identity_fakes.protocol_id, - identity_fakes.idp_id, - identity_fakes.mapping_id) + datalist = ( + identity_fakes.protocol_id, + identity_fakes.idp_id, + identity_fakes.mapping_id, + ) self.assertEqual(datalist, data) diff --git a/openstackclient/tests/unit/identity/v3/test_region.py b/openstackclient/tests/unit/identity/v3/test_region.py index e83a4e9f..9e83b7a8 100644 --- a/openstackclient/tests/unit/identity/v3/test_region.py +++ b/openstackclient/tests/unit/identity/v3/test_region.py @@ -19,7 +19,6 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes class TestRegion(identity_fakes.TestIdentityv3): - def setUp(self): super(TestRegion, self).setUp() @@ -29,7 +28,6 @@ class TestRegion(identity_fakes.TestIdentityv3): class TestRegionCreate(TestRegion): - columns = ( 'description', 'parent_region', @@ -56,11 +54,12 @@ class TestRegionCreate(TestRegion): def test_region_create_description(self): arglist = [ identity_fakes.region_id, - '--description', identity_fakes.region_description, + '--description', + identity_fakes.region_description, ] verifylist = [ ('region', identity_fakes.region_id), - ('description', identity_fakes.region_description) + ('description', identity_fakes.region_description), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -75,9 +74,7 @@ class TestRegionCreate(TestRegion): 'id': identity_fakes.region_id, 'parent_region': None, } - self.regions_mock.create.assert_called_with( - **kwargs - ) + self.regions_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -102,9 +99,7 @@ class TestRegionCreate(TestRegion): 'id': identity_fakes.region_id, 'parent_region': None, } - self.regions_mock.create.assert_called_with( - **kwargs - ) + self.regions_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -112,7 +107,8 @@ class TestRegionCreate(TestRegion): def test_region_create_parent_region_id(self): arglist = [ identity_fakes.region_id, - '--parent-region', identity_fakes.region_parent_region_id, + '--parent-region', + identity_fakes.region_parent_region_id, ] verifylist = [ ('region', identity_fakes.region_id), @@ -131,15 +127,12 @@ class TestRegionCreate(TestRegion): 'id': identity_fakes.region_id, 'parent_region': identity_fakes.region_parent_region_id, } - self.regions_mock.create.assert_called_with( - **kwargs - ) + self.regions_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) class TestRegionDelete(TestRegion): - def setUp(self): super(TestRegionDelete, self).setUp() @@ -166,7 +159,6 @@ class TestRegionDelete(TestRegion): class TestRegionList(TestRegion): - columns = ( 'Region', 'Parent Region', @@ -210,7 +202,8 @@ class TestRegionList(TestRegion): def test_region_list_parent_region_id(self): arglist = [ - '--parent-region', identity_fakes.region_parent_region_id, + '--parent-region', + identity_fakes.region_parent_region_id, ] verifylist = [ ('parent_region', identity_fakes.region_parent_region_id), @@ -222,14 +215,14 @@ class TestRegionList(TestRegion): # containing the data to be listed. columns, data = self.cmd.take_action(parsed_args) self.regions_mock.list.assert_called_with( - parent_region_id=identity_fakes.region_parent_region_id) + parent_region_id=identity_fakes.region_parent_region_id + ) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, tuple(data)) class TestRegionSet(TestRegion): - def setUp(self): super(TestRegionSet, self).setUp() @@ -255,14 +248,14 @@ class TestRegionSet(TestRegion): kwargs = {} self.regions_mock.update.assert_called_with( - identity_fakes.region_id, - **kwargs + identity_fakes.region_id, **kwargs ) self.assertIsNone(result) def test_region_set_description(self): arglist = [ - '--description', 'qwerty', + '--description', + 'qwerty', identity_fakes.region_id, ] verifylist = [ @@ -278,14 +271,14 @@ class TestRegionSet(TestRegion): 'description': 'qwerty', } self.regions_mock.update.assert_called_with( - identity_fakes.region_id, - **kwargs + identity_fakes.region_id, **kwargs ) self.assertIsNone(result) def test_region_set_parent_region_id(self): arglist = [ - '--parent-region', 'new_parent', + '--parent-region', + 'new_parent', identity_fakes.region_id, ] verifylist = [ @@ -301,14 +294,12 @@ class TestRegionSet(TestRegion): 'parent_region': 'new_parent', } self.regions_mock.update.assert_called_with( - identity_fakes.region_id, - **kwargs + identity_fakes.region_id, **kwargs ) self.assertIsNone(result) class TestRegionShow(TestRegion): - def setUp(self): super(TestRegionShow, self).setUp() diff --git a/openstackclient/tests/unit/identity/v3/test_registered_limit.py b/openstackclient/tests/unit/identity/v3/test_registered_limit.py index 262ca4f9..1ba6737e 100644 --- a/openstackclient/tests/unit/identity/v3/test_registered_limit.py +++ b/openstackclient/tests/unit/identity/v3/test_registered_limit.py @@ -21,7 +21,6 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes class TestRegisteredLimit(identity_fakes.TestIdentityv3): - def setUp(self): super(TestRegisteredLimit, self).setUp() @@ -36,21 +35,16 @@ class TestRegisteredLimit(identity_fakes.TestIdentityv3): class TestRegisteredLimitCreate(TestRegisteredLimit): - def setUp(self): super(TestRegisteredLimitCreate, self).setUp() self.service = fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.SERVICE), - loaded=True + None, copy.deepcopy(identity_fakes.SERVICE), loaded=True ) self.services_mock.get.return_value = self.service self.region = fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.REGION), - loaded=True + None, copy.deepcopy(identity_fakes.REGION), loaded=True ) self.regions_mock.get.return_value = self.region @@ -58,23 +52,23 @@ class TestRegisteredLimitCreate(TestRegisteredLimit): def test_registered_limit_create_without_options(self): self.registered_limit_mock.create.return_value = fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.REGISTERED_LIMIT), - loaded=True + None, copy.deepcopy(identity_fakes.REGISTERED_LIMIT), loaded=True ) resource_name = identity_fakes.registered_limit_resource_name default_limit = identity_fakes.registered_limit_default_limit arglist = [ - '--service', identity_fakes.service_id, - '--default-limit', '10', + '--service', + identity_fakes.service_id, + '--default-limit', + '10', resource_name, ] verifylist = [ ('service', identity_fakes.service_id), ('default_limit', default_limit), - ('resource_name', resource_name) + ('resource_name', resource_name), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -85,8 +79,14 @@ class TestRegisteredLimitCreate(TestRegisteredLimit): self.service, resource_name, default_limit, **kwargs ) - collist = ('default_limit', 'description', 'id', 'region_id', - 'resource_name', 'service_id') + collist = ( + 'default_limit', + 'description', + 'id', + 'region_id', + 'resource_name', + 'service_id', + ) self.assertEqual(collist, columns) datalist = ( @@ -95,7 +95,7 @@ class TestRegisteredLimitCreate(TestRegisteredLimit): identity_fakes.registered_limit_id, None, identity_fakes.registered_limit_resource_name, - identity_fakes.service_id + identity_fakes.service_id, ) self.assertEqual(datalist, data) @@ -103,18 +103,22 @@ class TestRegisteredLimitCreate(TestRegisteredLimit): self.registered_limit_mock.create.return_value = fakes.FakeResource( None, copy.deepcopy(identity_fakes.REGISTERED_LIMIT_OPTIONS), - loaded=True + loaded=True, ) resource_name = identity_fakes.registered_limit_resource_name default_limit = identity_fakes.registered_limit_default_limit description = identity_fakes.registered_limit_description arglist = [ - '--region', identity_fakes.region_id, - '--description', description, - '--service', identity_fakes.service_id, - '--default-limit', '10', - resource_name + '--region', + identity_fakes.region_id, + '--description', + description, + '--service', + identity_fakes.service_id, + '--default-limit', + '10', + resource_name, ] verifylist = [ @@ -122,7 +126,7 @@ class TestRegisteredLimitCreate(TestRegisteredLimit): ('description', description), ('service', identity_fakes.service_id), ('default_limit', default_limit), - ('resource_name', resource_name) + ('resource_name', resource_name), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -133,8 +137,14 @@ class TestRegisteredLimitCreate(TestRegisteredLimit): self.service, resource_name, default_limit, **kwargs ) - collist = ('default_limit', 'description', 'id', 'region_id', - 'resource_name', 'service_id') + collist = ( + 'default_limit', + 'description', + 'id', + 'region_id', + 'resource_name', + 'service_id', + ) self.assertEqual(collist, columns) datalist = ( @@ -143,13 +153,12 @@ class TestRegisteredLimitCreate(TestRegisteredLimit): identity_fakes.registered_limit_id, identity_fakes.region_id, identity_fakes.registered_limit_resource_name, - identity_fakes.service_id + identity_fakes.service_id, ) self.assertEqual(datalist, data) class TestRegisteredLimitDelete(TestRegisteredLimit): - def setUp(self): super(TestRegisteredLimitDelete, self).setUp() @@ -176,9 +185,7 @@ class TestRegisteredLimitDelete(TestRegisteredLimit): self.registered_limit_mock.delete.side_effect = return_value arglist = ['fake-registered-limit-id'] - verifylist = [ - ('registered_limit_id', ['fake-registered-limit-id']) - ] + verifylist = [('registered_limit_id', ['fake-registered-limit-id'])] parsed_args = self.check_parser(self.cmd, arglist, verifylist) try: @@ -191,14 +198,11 @@ class TestRegisteredLimitDelete(TestRegisteredLimit): class TestRegisteredLimitShow(TestRegisteredLimit): - def setUp(self): super(TestRegisteredLimitShow, self).setUp() self.registered_limit_mock.get.return_value = fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.REGISTERED_LIMIT), - loaded=True + None, copy.deepcopy(identity_fakes.REGISTERED_LIMIT), loaded=True ) self.cmd = registered_limit.ShowRegisteredLimit(self.app, None) @@ -217,8 +221,12 @@ class TestRegisteredLimitShow(TestRegisteredLimit): ) collist = ( - 'default_limit', 'description', 'id', 'region_id', 'resource_name', - 'service_id' + 'default_limit', + 'description', + 'id', + 'region_id', + 'resource_name', + 'service_id', ) self.assertEqual(collist, columns) datalist = ( @@ -227,33 +235,33 @@ class TestRegisteredLimitShow(TestRegisteredLimit): identity_fakes.registered_limit_id, None, identity_fakes.registered_limit_resource_name, - identity_fakes.service_id + identity_fakes.service_id, ) self.assertEqual(datalist, data) class TestRegisteredLimitSet(TestRegisteredLimit): - def setUp(self): super(TestRegisteredLimitSet, self).setUp() self.cmd = registered_limit.SetRegisteredLimit(self.app, None) def test_registered_limit_set_description(self): registered_limit = copy.deepcopy(identity_fakes.REGISTERED_LIMIT) - registered_limit['description'] = ( - identity_fakes.registered_limit_description - ) + registered_limit[ + 'description' + ] = identity_fakes.registered_limit_description self.registered_limit_mock.update.return_value = fakes.FakeResource( None, registered_limit, loaded=True ) arglist = [ - '--description', identity_fakes.registered_limit_description, - identity_fakes.registered_limit_id + '--description', + identity_fakes.registered_limit_description, + identity_fakes.registered_limit_id, ] verifylist = [ ('description', identity_fakes.registered_limit_description), - ('registered_limit_id', identity_fakes.registered_limit_id) + ('registered_limit_id', identity_fakes.registered_limit_id), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -265,12 +273,16 @@ class TestRegisteredLimitSet(TestRegisteredLimit): resource_name=None, default_limit=None, description=identity_fakes.registered_limit_description, - region=None + region=None, ) collist = ( - 'default_limit', 'description', 'id', 'region_id', 'resource_name', - 'service_id' + 'default_limit', + 'description', + 'id', + 'region_id', + 'resource_name', + 'service_id', ) self.assertEqual(collist, columns) datalist = ( @@ -279,7 +291,7 @@ class TestRegisteredLimitSet(TestRegisteredLimit): identity_fakes.registered_limit_id, None, identity_fakes.registered_limit_resource_name, - identity_fakes.service_id + identity_fakes.service_id, ) self.assertEqual(datalist, data) @@ -292,12 +304,13 @@ class TestRegisteredLimitSet(TestRegisteredLimit): ) arglist = [ - '--default-limit', str(default_limit), - identity_fakes.registered_limit_id + '--default-limit', + str(default_limit), + identity_fakes.registered_limit_id, ] verifylist = [ ('default_limit', default_limit), - ('registered_limit_id', identity_fakes.registered_limit_id) + ('registered_limit_id', identity_fakes.registered_limit_id), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -309,12 +322,16 @@ class TestRegisteredLimitSet(TestRegisteredLimit): resource_name=None, default_limit=default_limit, description=None, - region=None + region=None, ) collist = ( - 'default_limit', 'description', 'id', 'region_id', 'resource_name', - 'service_id' + 'default_limit', + 'description', + 'id', + 'region_id', + 'resource_name', + 'service_id', ) self.assertEqual(collist, columns) datalist = ( @@ -323,7 +340,7 @@ class TestRegisteredLimitSet(TestRegisteredLimit): identity_fakes.registered_limit_id, None, identity_fakes.registered_limit_resource_name, - identity_fakes.service_id + identity_fakes.service_id, ) self.assertEqual(datalist, data) @@ -336,12 +353,13 @@ class TestRegisteredLimitSet(TestRegisteredLimit): ) arglist = [ - '--resource-name', resource_name, - identity_fakes.registered_limit_id + '--resource-name', + resource_name, + identity_fakes.registered_limit_id, ] verifylist = [ ('resource_name', resource_name), - ('registered_limit_id', identity_fakes.registered_limit_id) + ('registered_limit_id', identity_fakes.registered_limit_id), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -353,12 +371,16 @@ class TestRegisteredLimitSet(TestRegisteredLimit): resource_name=resource_name, default_limit=None, description=None, - region=None + region=None, ) collist = ( - 'default_limit', 'description', 'id', 'region_id', 'resource_name', - 'service_id' + 'default_limit', + 'description', + 'id', + 'region_id', + 'resource_name', + 'service_id', ) self.assertEqual(collist, columns) datalist = ( @@ -367,7 +389,7 @@ class TestRegisteredLimitSet(TestRegisteredLimit): identity_fakes.registered_limit_id, None, resource_name, - identity_fakes.service_id + identity_fakes.service_id, ) self.assertEqual(datalist, data) @@ -380,13 +402,10 @@ class TestRegisteredLimitSet(TestRegisteredLimit): ) self.services_mock.get.return_value = service - arglist = [ - '--service', service.id, - identity_fakes.registered_limit_id - ] + arglist = ['--service', service.id, identity_fakes.registered_limit_id] verifylist = [ ('service', service.id), - ('registered_limit_id', identity_fakes.registered_limit_id) + ('registered_limit_id', identity_fakes.registered_limit_id), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -398,12 +417,16 @@ class TestRegisteredLimitSet(TestRegisteredLimit): resource_name=None, default_limit=None, description=None, - region=None + region=None, ) collist = ( - 'default_limit', 'description', 'id', 'region_id', 'resource_name', - 'service_id' + 'default_limit', + 'description', + 'id', + 'region_id', + 'resource_name', + 'service_id', ) self.assertEqual(collist, columns) datalist = ( @@ -412,7 +435,7 @@ class TestRegisteredLimitSet(TestRegisteredLimit): identity_fakes.registered_limit_id, None, identity_fakes.registered_limit_resource_name, - service.id + service.id, ) self.assertEqual(datalist, data) @@ -420,24 +443,17 @@ class TestRegisteredLimitSet(TestRegisteredLimit): registered_limit = copy.deepcopy(identity_fakes.REGISTERED_LIMIT) region = identity_fakes.REGION region['id'] = 'RegionTwo' - region = fakes.FakeResource( - None, - copy.deepcopy(region), - loaded=True - ) + region = fakes.FakeResource(None, copy.deepcopy(region), loaded=True) registered_limit['region_id'] = region.id self.registered_limit_mock.update.return_value = fakes.FakeResource( None, registered_limit, loaded=True ) self.regions_mock.get.return_value = region - arglist = [ - '--region', region.id, - identity_fakes.registered_limit_id - ] + arglist = ['--region', region.id, identity_fakes.registered_limit_id] verifylist = [ ('region', region.id), - ('registered_limit_id', identity_fakes.registered_limit_id) + ('registered_limit_id', identity_fakes.registered_limit_id), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -449,12 +465,16 @@ class TestRegisteredLimitSet(TestRegisteredLimit): resource_name=None, default_limit=None, description=None, - region=region + region=region, ) collist = ( - 'default_limit', 'description', 'id', 'region_id', 'resource_name', - 'service_id' + 'default_limit', + 'description', + 'id', + 'region_id', + 'resource_name', + 'service_id', ) self.assertEqual(collist, columns) datalist = ( @@ -463,20 +483,17 @@ class TestRegisteredLimitSet(TestRegisteredLimit): identity_fakes.registered_limit_id, region.id, identity_fakes.registered_limit_resource_name, - identity_fakes.service_id + identity_fakes.service_id, ) self.assertEqual(datalist, data) class TestRegisteredLimitList(TestRegisteredLimit): - def setUp(self): super(TestRegisteredLimitList, self).setUp() self.registered_limit_mock.get.return_value = fakes.FakeResource( - None, - copy.deepcopy(identity_fakes.REGISTERED_LIMIT), - loaded=True + None, copy.deepcopy(identity_fakes.REGISTERED_LIMIT), loaded=True ) self.cmd = registered_limit.ShowRegisteredLimit(self.app, None) @@ -495,8 +512,12 @@ class TestRegisteredLimitList(TestRegisteredLimit): ) collist = ( - 'default_limit', 'description', 'id', 'region_id', 'resource_name', - 'service_id' + 'default_limit', + 'description', + 'id', + 'region_id', + 'resource_name', + 'service_id', ) self.assertEqual(collist, columns) datalist = ( @@ -505,6 +526,6 @@ class TestRegisteredLimitList(TestRegisteredLimit): identity_fakes.registered_limit_id, None, identity_fakes.registered_limit_resource_name, - identity_fakes.service_id + identity_fakes.service_id, ) self.assertEqual(datalist, data) diff --git a/openstackclient/tests/unit/identity/v3/test_role.py b/openstackclient/tests/unit/identity/v3/test_role.py index 774b2c2b..12fd1611 100644 --- a/openstackclient/tests/unit/identity/v3/test_role.py +++ b/openstackclient/tests/unit/identity/v3/test_role.py @@ -26,7 +26,6 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes class TestRole(identity_fakes.TestIdentityv3): - def setUp(self): super(TestRole, self).setUp() @@ -55,13 +54,11 @@ class TestRole(identity_fakes.TestIdentityv3): class TestRoleInherited(TestRole): - def _is_inheritance_testcase(self): return True class TestRoleAdd(TestRole): - def setUp(self): super(TestRoleAdd, self).setUp() @@ -105,8 +102,10 @@ class TestRoleAdd(TestRole): def test_role_add_user_system(self): arglist = [ - '--user', identity_fakes.user_name, - '--system', 'all', + '--user', + identity_fakes.user_name, + '--system', + 'all', identity_fakes.role_name, ] if self._is_inheritance_testcase(): @@ -132,15 +131,16 @@ class TestRoleAdd(TestRole): } # RoleManager.grant(role, user=, group=, domain=, project=) self.roles_mock.grant.assert_called_with( - identity_fakes.role_id, - **kwargs + identity_fakes.role_id, **kwargs ) self.assertIsNone(result) def test_role_add_user_domain(self): arglist = [ - '--user', identity_fakes.user_name, - '--domain', identity_fakes.domain_name, + '--user', + identity_fakes.user_name, + '--domain', + identity_fakes.domain_name, identity_fakes.role_name, ] if self._is_inheritance_testcase(): @@ -165,15 +165,16 @@ class TestRoleAdd(TestRole): } # RoleManager.grant(role, user=, group=, domain=, project=) self.roles_mock.grant.assert_called_with( - identity_fakes.role_id, - **kwargs + identity_fakes.role_id, **kwargs ) self.assertIsNone(result) def test_role_add_user_project(self): arglist = [ - '--user', identity_fakes.user_name, - '--project', identity_fakes.project_name, + '--user', + identity_fakes.user_name, + '--project', + identity_fakes.project_name, identity_fakes.role_name, ] if self._is_inheritance_testcase(): @@ -198,15 +199,16 @@ class TestRoleAdd(TestRole): } # RoleManager.grant(role, user=, group=, domain=, project=) self.roles_mock.grant.assert_called_with( - identity_fakes.role_id, - **kwargs + identity_fakes.role_id, **kwargs ) self.assertIsNone(result) def test_role_add_group_system(self): arglist = [ - '--group', identity_fakes.group_name, - '--system', 'all', + '--group', + identity_fakes.group_name, + '--system', + 'all', identity_fakes.role_name, ] if self._is_inheritance_testcase(): @@ -232,15 +234,16 @@ class TestRoleAdd(TestRole): } # RoleManager.grant(role, user=, group=, domain=, project=) self.roles_mock.grant.assert_called_with( - identity_fakes.role_id, - **kwargs + identity_fakes.role_id, **kwargs ) self.assertIsNone(result) def test_role_add_group_domain(self): arglist = [ - '--group', identity_fakes.group_name, - '--domain', identity_fakes.domain_name, + '--group', + identity_fakes.group_name, + '--domain', + identity_fakes.domain_name, identity_fakes.role_name, ] if self._is_inheritance_testcase(): @@ -265,15 +268,16 @@ class TestRoleAdd(TestRole): } # RoleManager.grant(role, user=, group=, domain=, project=) self.roles_mock.grant.assert_called_with( - identity_fakes.role_id, - **kwargs + identity_fakes.role_id, **kwargs ) self.assertIsNone(result) def test_role_add_group_project(self): arglist = [ - '--group', identity_fakes.group_name, - '--project', identity_fakes.project_name, + '--group', + identity_fakes.group_name, + '--project', + identity_fakes.project_name, identity_fakes.role_name, ] if self._is_inheritance_testcase(): @@ -298,8 +302,7 @@ class TestRoleAdd(TestRole): } # RoleManager.grant(role, user=, group=, domain=, project=) self.roles_mock.grant.assert_called_with( - identity_fakes.role_id, - **kwargs + identity_fakes.role_id, **kwargs ) self.assertIsNone(result) @@ -310,9 +313,12 @@ class TestRoleAdd(TestRole): loaded=True, ) arglist = [ - '--user', identity_fakes.user_name, - '--project', identity_fakes.project_name, - '--role-domain', identity_fakes.domain_name, + '--user', + identity_fakes.user_name, + '--project', + identity_fakes.project_name, + '--role-domain', + identity_fakes.domain_name, identity_fakes.ROLE_2['name'], ] if self._is_inheritance_testcase(): @@ -337,8 +343,7 @@ class TestRoleAdd(TestRole): } # RoleManager.grant(role, user=, group=, domain=, project=) self.roles_mock.grant.assert_called_with( - identity_fakes.ROLE_2['id'], - **kwargs + identity_fakes.ROLE_2['id'], **kwargs ) self.assertIsNone(result) @@ -355,8 +360,9 @@ class TestRoleAdd(TestRole): ('inherited', False), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.assertRaises(exceptions.CommandError, - self.cmd.take_action, parsed_args) + self.assertRaises( + exceptions.CommandError, self.cmd.take_action, parsed_args + ) class TestRoleAddInherited(TestRoleAdd, TestRoleInherited): @@ -364,7 +370,6 @@ class TestRoleAddInherited(TestRoleAdd, TestRoleInherited): class TestRoleCreate(TestRole): - def setUp(self): super(TestRoleCreate, self).setUp() @@ -406,9 +411,7 @@ class TestRoleCreate(TestRole): } # RoleManager.create(name=, domain=) - self.roles_mock.create.assert_called_with( - **kwargs - ) + self.roles_mock.create.assert_called_with(**kwargs) collist = ('domain', 'id', 'name') self.assertEqual(collist, columns) @@ -420,7 +423,6 @@ class TestRoleCreate(TestRole): self.assertEqual(datalist, data) def test_role_create_with_domain(self): - self.roles_mock.create.return_value = fakes.FakeResource( None, copy.deepcopy(identity_fakes.ROLE_2), @@ -428,7 +430,8 @@ class TestRoleCreate(TestRole): ) arglist = [ - '--domain', identity_fakes.domain_name, + '--domain', + identity_fakes.domain_name, identity_fakes.ROLE_2['name'], ] verifylist = [ @@ -451,9 +454,7 @@ class TestRoleCreate(TestRole): } # RoleManager.create(name=, domain=) - self.roles_mock.create.assert_called_with( - **kwargs - ) + self.roles_mock.create.assert_called_with(**kwargs) collist = ('domain', 'id', 'name') self.assertEqual(collist, columns) @@ -465,14 +466,14 @@ class TestRoleCreate(TestRole): self.assertEqual(datalist, data) def test_role_create_with_description(self): - self.roles_mock.create.return_value = fakes.FakeResource( None, copy.deepcopy(identity_fakes.ROLE_2), loaded=True, ) arglist = [ - '--description', identity_fakes.role_description, + '--description', + identity_fakes.role_description, identity_fakes.ROLE_2['name'], ] verifylist = [ @@ -495,9 +496,7 @@ class TestRoleCreate(TestRole): } # RoleManager.create(name=, domain=) - self.roles_mock.create.assert_called_with( - **kwargs - ) + self.roles_mock.create.assert_called_with(**kwargs) collist = ('domain', 'id', 'name') self.assertEqual(collist, columns) @@ -509,7 +508,6 @@ class TestRoleCreate(TestRole): self.assertEqual(datalist, data) def test_role_create_with_immutable_option(self): - self.roles_mock.create.return_value = fakes.FakeResource( None, copy.deepcopy(identity_fakes.ROLE_2), @@ -532,7 +530,6 @@ class TestRoleCreate(TestRole): # Set expected values kwargs = { - 'options': {'immutable': True}, 'description': None, 'name': identity_fakes.ROLE_2['name'], @@ -540,9 +537,7 @@ class TestRoleCreate(TestRole): } # RoleManager.create(name=, domain=) - self.roles_mock.create.assert_called_with( - **kwargs - ) + self.roles_mock.create.assert_called_with(**kwargs) collist = ('domain', 'id', 'name') self.assertEqual(collist, columns) @@ -554,7 +549,6 @@ class TestRoleCreate(TestRole): self.assertEqual(datalist, data) def test_role_create_with_no_immutable_option(self): - self.roles_mock.create.return_value = fakes.FakeResource( None, copy.deepcopy(identity_fakes.ROLE_2), @@ -577,7 +571,6 @@ class TestRoleCreate(TestRole): # Set expected values kwargs = { - 'options': {'immutable': False}, 'description': None, 'name': identity_fakes.ROLE_2['name'], @@ -585,9 +578,7 @@ class TestRoleCreate(TestRole): } # RoleManager.create(name=, domain=) - self.roles_mock.create.assert_called_with( - **kwargs - ) + self.roles_mock.create.assert_called_with(**kwargs) collist = ('domain', 'id', 'name') self.assertEqual(collist, columns) @@ -600,7 +591,6 @@ class TestRoleCreate(TestRole): class TestRoleDelete(TestRole): - def setUp(self): super(TestRoleDelete, self).setUp() @@ -639,7 +629,8 @@ class TestRoleDelete(TestRole): self.roles_mock.delete.return_value = None arglist = [ - '--domain', identity_fakes.domain_name, + '--domain', + identity_fakes.domain_name, identity_fakes.ROLE_2['name'], ] verifylist = [ @@ -657,8 +648,10 @@ class TestRoleDelete(TestRole): @mock.patch.object(utils, 'find_resource') def test_delete_multi_roles_with_exception(self, find_mock): - find_mock.side_effect = [self.roles_mock.get.return_value, - exceptions.CommandError] + find_mock.side_effect = [ + self.roles_mock.get.return_value, + exceptions.CommandError, + ] arglist = [ identity_fakes.role_name, 'unexist_role', @@ -672,22 +665,20 @@ class TestRoleDelete(TestRole): self.cmd.take_action(parsed_args) self.fail('CommandError should be raised.') except exceptions.CommandError as e: - self.assertEqual('1 of 2 roles failed to delete.', - str(e)) + self.assertEqual('1 of 2 roles failed to delete.', str(e)) - find_mock.assert_any_call(self.roles_mock, - identity_fakes.role_name, - domain_id=None) - find_mock.assert_any_call(self.roles_mock, - 'unexist_role', - domain_id=None) + find_mock.assert_any_call( + self.roles_mock, identity_fakes.role_name, domain_id=None + ) + find_mock.assert_any_call( + self.roles_mock, 'unexist_role', domain_id=None + ) self.assertEqual(2, find_mock.call_count) self.roles_mock.delete.assert_called_once_with(identity_fakes.role_id) class TestRoleList(TestRole): - columns = ( 'ID', 'Name', @@ -743,7 +734,8 @@ class TestRoleList(TestRole): ), ] arglist = [ - '--domain', identity_fakes.domain_name, + '--domain', + identity_fakes.domain_name, ] verifylist = [ ('domain', identity_fakes.domain_name), @@ -756,26 +748,23 @@ class TestRoleList(TestRole): columns, data = self.cmd.take_action(parsed_args) # Set expected values - kwargs = { - 'domain_id': identity_fakes.domain_id - } + kwargs = {'domain_id': identity_fakes.domain_id} # RoleManager.list(user=, group=, domain=, project=, **kwargs) - self.roles_mock.list.assert_called_with( - **kwargs - ) + self.roles_mock.list.assert_called_with(**kwargs) collist = ('ID', 'Name', 'Domain') self.assertEqual(collist, columns) - datalist = (( - identity_fakes.ROLE_2['id'], - identity_fakes.ROLE_2['name'], - identity_fakes.domain_name, - ), ) + datalist = ( + ( + identity_fakes.ROLE_2['id'], + identity_fakes.ROLE_2['name'], + identity_fakes.domain_name, + ), + ) self.assertEqual(datalist, tuple(data)) class TestRoleRemove(TestRole): - def setUp(self): super(TestRoleRemove, self).setUp() @@ -815,9 +804,11 @@ class TestRoleRemove(TestRole): def test_role_remove_user_system(self): arglist = [ - '--user', identity_fakes.user_name, - '--system', 'all', - identity_fakes.role_name + '--user', + identity_fakes.user_name, + '--system', + 'all', + identity_fakes.role_name, ] if self._is_inheritance_testcase(): arglist.append('--inherited') @@ -842,8 +833,7 @@ class TestRoleRemove(TestRole): } # RoleManager.revoke(role, user=, group=, domain=, project=) self.roles_mock.revoke.assert_called_with( - identity_fakes.role_id, - **kwargs + identity_fakes.role_id, **kwargs ) self.assertIsNone(result) @@ -856,9 +846,11 @@ class TestRoleRemove(TestRole): find_mock.side_effect = exceptions.CommandError arglist = [ - '--user', identity_fakes.user_id, - '--system', 'all', - identity_fakes.role_name + '--user', + identity_fakes.user_id, + '--system', + 'all', + identity_fakes.role_name, ] if self._is_inheritance_testcase(): arglist.append('--inherited') @@ -883,15 +875,16 @@ class TestRoleRemove(TestRole): } # RoleManager.revoke(role, user=, group=, domain=, project=) self.roles_mock.revoke.assert_called_with( - identity_fakes.role_id, - **kwargs + identity_fakes.role_id, **kwargs ) self.assertIsNone(result) def test_role_remove_user_domain(self): arglist = [ - '--user', identity_fakes.user_name, - '--domain', identity_fakes.domain_name, + '--user', + identity_fakes.user_name, + '--domain', + identity_fakes.domain_name, identity_fakes.role_name, ] if self._is_inheritance_testcase(): @@ -916,8 +909,7 @@ class TestRoleRemove(TestRole): } # RoleManager.revoke(role, user=, group=, domain=, project=) self.roles_mock.revoke.assert_called_with( - identity_fakes.role_id, - **kwargs + identity_fakes.role_id, **kwargs ) self.assertIsNone(result) @@ -929,9 +921,11 @@ class TestRoleRemove(TestRole): find_mock.side_effect = exceptions.CommandError arglist = [ - '--user', identity_fakes.user_id, - '--domain', identity_fakes.domain_name, - identity_fakes.role_name + '--user', + identity_fakes.user_id, + '--domain', + identity_fakes.domain_name, + identity_fakes.role_name, ] if self._is_inheritance_testcase(): arglist.append('--inherited') @@ -956,15 +950,16 @@ class TestRoleRemove(TestRole): } # RoleManager.revoke(role, user=, group=, domain=, project=) self.roles_mock.revoke.assert_called_with( - identity_fakes.role_id, - **kwargs + identity_fakes.role_id, **kwargs ) self.assertIsNone(result) def test_role_remove_user_project(self): arglist = [ - '--user', identity_fakes.user_name, - '--project', identity_fakes.project_name, + '--user', + identity_fakes.user_name, + '--project', + identity_fakes.project_name, identity_fakes.role_name, ] if self._is_inheritance_testcase(): @@ -989,8 +984,7 @@ class TestRoleRemove(TestRole): } # RoleManager.revoke(role, user=, group=, domain=, project=) self.roles_mock.revoke.assert_called_with( - identity_fakes.role_id, - **kwargs + identity_fakes.role_id, **kwargs ) self.assertIsNone(result) @@ -1002,9 +996,11 @@ class TestRoleRemove(TestRole): find_mock.side_effect = exceptions.CommandError arglist = [ - '--user', identity_fakes.user_id, - '--project', identity_fakes.project_name, - identity_fakes.role_name + '--user', + identity_fakes.user_id, + '--project', + identity_fakes.project_name, + identity_fakes.role_name, ] if self._is_inheritance_testcase(): arglist.append('--inherited') @@ -1029,15 +1025,16 @@ class TestRoleRemove(TestRole): } # RoleManager.revoke(role, user=, group=, domain=, project=) self.roles_mock.revoke.assert_called_with( - identity_fakes.role_id, - **kwargs + identity_fakes.role_id, **kwargs ) self.assertIsNone(result) def test_role_remove_group_system(self): arglist = [ - '--group', identity_fakes.group_name, - '--system', 'all', + '--group', + identity_fakes.group_name, + '--system', + 'all', identity_fakes.role_name, ] if self._is_inheritance_testcase(): @@ -1064,8 +1061,7 @@ class TestRoleRemove(TestRole): } # RoleManager.revoke(role, user=, group=, domain=, project=) self.roles_mock.revoke.assert_called_with( - identity_fakes.role_id, - **kwargs + identity_fakes.role_id, **kwargs ) self.assertIsNone(result) @@ -1077,9 +1073,11 @@ class TestRoleRemove(TestRole): find_mock.side_effect = exceptions.CommandError arglist = [ - '--group', identity_fakes.group_id, - '--system', 'all', - identity_fakes.role_name + '--group', + identity_fakes.group_id, + '--system', + 'all', + identity_fakes.role_name, ] if self._is_inheritance_testcase(): arglist.append('--inherited') @@ -1104,15 +1102,16 @@ class TestRoleRemove(TestRole): } # RoleManager.revoke(role, user=, group=, domain=, project=) self.roles_mock.revoke.assert_called_with( - identity_fakes.role_id, - **kwargs + identity_fakes.role_id, **kwargs ) self.assertIsNone(result) def test_role_remove_group_domain(self): arglist = [ - '--group', identity_fakes.group_name, - '--domain', identity_fakes.domain_name, + '--group', + identity_fakes.group_name, + '--domain', + identity_fakes.domain_name, identity_fakes.role_name, ] if self._is_inheritance_testcase(): @@ -1138,8 +1137,7 @@ class TestRoleRemove(TestRole): } # RoleManager.revoke(role, user=, group=, domain=, project=) self.roles_mock.revoke.assert_called_with( - identity_fakes.role_id, - **kwargs + identity_fakes.role_id, **kwargs ) self.assertIsNone(result) @@ -1151,9 +1149,11 @@ class TestRoleRemove(TestRole): find_mock.side_effect = exceptions.CommandError arglist = [ - '--group', identity_fakes.group_id, - '--domain', identity_fakes.domain_name, - identity_fakes.role_name + '--group', + identity_fakes.group_id, + '--domain', + identity_fakes.domain_name, + identity_fakes.role_name, ] if self._is_inheritance_testcase(): arglist.append('--inherited') @@ -1178,15 +1178,16 @@ class TestRoleRemove(TestRole): } # RoleManager.revoke(role, user=, group=, domain=, project=) self.roles_mock.revoke.assert_called_with( - identity_fakes.role_id, - **kwargs + identity_fakes.role_id, **kwargs ) self.assertIsNone(result) def test_role_remove_group_project(self): arglist = [ - '--group', identity_fakes.group_name, - '--project', identity_fakes.project_name, + '--group', + identity_fakes.group_name, + '--project', + identity_fakes.project_name, identity_fakes.role_name, ] if self._is_inheritance_testcase(): @@ -1211,8 +1212,7 @@ class TestRoleRemove(TestRole): } # RoleManager.revoke(role, user=, group=, domain=, project=) self.roles_mock.revoke.assert_called_with( - identity_fakes.role_id, - **kwargs + identity_fakes.role_id, **kwargs ) self.assertIsNone(result) @@ -1224,9 +1224,11 @@ class TestRoleRemove(TestRole): find_mock.side_effect = exceptions.CommandError arglist = [ - '--group', identity_fakes.group_id, - '--project', identity_fakes.project_name, - identity_fakes.role_name + '--group', + identity_fakes.group_id, + '--project', + identity_fakes.project_name, + identity_fakes.role_name, ] if self._is_inheritance_testcase(): arglist.append('--inherited') @@ -1251,8 +1253,7 @@ class TestRoleRemove(TestRole): } # RoleManager.revoke(role, user=, group=, domain=, project=) self.roles_mock.revoke.assert_called_with( - identity_fakes.role_id, - **kwargs + identity_fakes.role_id, **kwargs ) self.assertIsNone(result) @@ -1263,8 +1264,10 @@ class TestRoleRemove(TestRole): loaded=True, ) arglist = [ - '--group', identity_fakes.group_name, - '--domain', identity_fakes.domain_name, + '--group', + identity_fakes.group_name, + '--domain', + identity_fakes.domain_name, identity_fakes.ROLE_2['name'], ] if self._is_inheritance_testcase(): @@ -1289,8 +1292,7 @@ class TestRoleRemove(TestRole): } # RoleManager.revoke(role, user=, group=, domain=, project=) self.roles_mock.revoke.assert_called_with( - identity_fakes.ROLE_2['id'], - **kwargs + identity_fakes.ROLE_2['id'], **kwargs ) self.assertIsNone(result) @@ -1307,12 +1309,12 @@ class TestRoleRemove(TestRole): ('inherited', False), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - self.assertRaises(exceptions.CommandError, - self.cmd.take_action, parsed_args) + self.assertRaises( + exceptions.CommandError, self.cmd.take_action, parsed_args + ) class TestRoleSet(TestRole): - def setUp(self): super(TestRoleSet, self).setUp() @@ -1328,7 +1330,8 @@ class TestRoleSet(TestRole): def test_role_set_no_options(self): arglist = [ - '--name', 'over', + '--name', + 'over', identity_fakes.role_name, ] verifylist = [ @@ -1347,8 +1350,7 @@ class TestRoleSet(TestRole): } # RoleManager.update(role, name=) self.roles_mock.update.assert_called_with( - identity_fakes.role_id, - **kwargs + identity_fakes.role_id, **kwargs ) self.assertIsNone(result) @@ -1359,8 +1361,10 @@ class TestRoleSet(TestRole): loaded=True, ) arglist = [ - '--name', 'over', - '--domain', identity_fakes.domain_name, + '--name', + 'over', + '--domain', + identity_fakes.domain_name, identity_fakes.ROLE_2['name'], ] verifylist = [ @@ -1380,8 +1384,7 @@ class TestRoleSet(TestRole): } # RoleManager.update(role, name=) self.roles_mock.update.assert_called_with( - identity_fakes.ROLE_2['id'], - **kwargs + identity_fakes.ROLE_2['id'], **kwargs ) self.assertIsNone(result) @@ -1392,8 +1395,10 @@ class TestRoleSet(TestRole): loaded=True, ) arglist = [ - '--name', 'over', - '--description', identity_fakes.role_description, + '--name', + 'over', + '--description', + identity_fakes.role_description, identity_fakes.ROLE_2['name'], ] verifylist = [ @@ -1413,8 +1418,7 @@ class TestRoleSet(TestRole): } # RoleManager.update(role, name=) self.roles_mock.update.assert_called_with( - identity_fakes.ROLE_2['id'], - **kwargs + identity_fakes.ROLE_2['id'], **kwargs ) self.assertIsNone(result) @@ -1425,7 +1429,8 @@ class TestRoleSet(TestRole): loaded=True, ) arglist = [ - '--name', 'over', + '--name', + 'over', '--immutable', identity_fakes.ROLE_2['name'], ] @@ -1446,8 +1451,7 @@ class TestRoleSet(TestRole): } # RoleManager.update(role, name=) self.roles_mock.update.assert_called_with( - identity_fakes.ROLE_2['id'], - **kwargs + identity_fakes.ROLE_2['id'], **kwargs ) self.assertIsNone(result) @@ -1458,7 +1462,8 @@ class TestRoleSet(TestRole): loaded=True, ) arglist = [ - '--name', 'over', + '--name', + 'over', '--no-immutable', identity_fakes.ROLE_2['name'], ] @@ -1479,14 +1484,12 @@ class TestRoleSet(TestRole): } # RoleManager.update(role, name=) self.roles_mock.update.assert_called_with( - identity_fakes.ROLE_2['id'], - **kwargs + identity_fakes.ROLE_2['id'], **kwargs ) self.assertIsNone(result) class TestRoleShow(TestRole): - def setUp(self): super(TestRoleShow, self).setUp() @@ -1534,7 +1537,8 @@ class TestRoleShow(TestRole): loaded=True, ) arglist = [ - '--domain', identity_fakes.domain_name, + '--domain', + identity_fakes.domain_name, identity_fakes.ROLE_2['name'], ] verifylist = [ diff --git a/openstackclient/tests/unit/identity/v3/test_role_assignment.py b/openstackclient/tests/unit/identity/v3/test_role_assignment.py index 7d38d360..04cb68cb 100644 --- a/openstackclient/tests/unit/identity/v3/test_role_assignment.py +++ b/openstackclient/tests/unit/identity/v3/test_role_assignment.py @@ -20,13 +20,11 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes class TestRoleAssignment(identity_fakes.TestIdentityv3): - def setUp(self): super(TestRoleAssignment, self).setUp() class TestRoleAssignmentList(TestRoleAssignment): - columns = ( 'Role', 'User', @@ -60,26 +58,28 @@ class TestRoleAssignmentList(TestRoleAssignment): self.roles_mock = self.app.client_manager.identity.roles self.roles_mock.reset_mock() - self.role_assignments_mock = self.app.client_manager.identity.\ - role_assignments + self.role_assignments_mock = ( + self.app.client_manager.identity.role_assignments + ) self.role_assignments_mock.reset_mock() # Get the command object to test self.cmd = role_assignment.ListRoleAssignment(self.app, None) def test_role_assignment_list_no_filters(self): - self.role_assignments_mock.list.return_value = [ fakes.FakeResource( None, copy.deepcopy( - identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID), + identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID + ), loaded=True, ), fakes.FakeResource( None, copy.deepcopy( - identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_GROUP_ID), + identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_GROUP_ID + ), loaded=True, ), ] @@ -102,47 +102,51 @@ class TestRoleAssignmentList(TestRoleAssignment): user=None, project=None, os_inherit_extension_inherited_to=None, - include_names=False) + include_names=False, + ) self.assertEqual(self.columns, columns) - datalist = (( - identity_fakes.role_id, - identity_fakes.user_id, - '', - identity_fakes.project_id, - '', - '', - False - ), (identity_fakes.role_id, - '', - identity_fakes.group_id, - identity_fakes.project_id, - '', - '', - False - ),) + datalist = ( + ( + identity_fakes.role_id, + identity_fakes.user_id, + '', + identity_fakes.project_id, + '', + '', + False, + ), + ( + identity_fakes.role_id, + '', + identity_fakes.group_id, + identity_fakes.project_id, + '', + '', + False, + ), + ) self.assertEqual(datalist, tuple(data)) def test_role_assignment_list_user(self): - self.role_assignments_mock.list.return_value = [ fakes.FakeResource( None, copy.deepcopy( - identity_fakes.ASSIGNMENT_WITH_DOMAIN_ID_AND_USER_ID), + identity_fakes.ASSIGNMENT_WITH_DOMAIN_ID_AND_USER_ID + ), loaded=True, ), fakes.FakeResource( None, copy.deepcopy( - identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID), + identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID + ), loaded=True, ), ] - arglist = [ - '--user', identity_fakes.user_name - ] + arglist = ['--user', identity_fakes.user_name] verifylist = [ ('user', identity_fakes.user_name), ('group', None), @@ -170,47 +174,51 @@ class TestRoleAssignmentList(TestRoleAssignment): role=None, effective=False, os_inherit_extension_inherited_to=None, - include_names=False) + include_names=False, + ) self.assertEqual(self.columns, columns) - datalist = (( - identity_fakes.role_id, - identity_fakes.user_id, - '', - '', - identity_fakes.domain_id, - '', - False - ), (identity_fakes.role_id, - identity_fakes.user_id, - '', - identity_fakes.project_id, - '', - '', - False - ),) + datalist = ( + ( + identity_fakes.role_id, + identity_fakes.user_id, + '', + '', + identity_fakes.domain_id, + '', + False, + ), + ( + identity_fakes.role_id, + identity_fakes.user_id, + '', + identity_fakes.project_id, + '', + '', + False, + ), + ) self.assertEqual(datalist, tuple(data)) def test_role_assignment_list_group(self): - self.role_assignments_mock.list.return_value = [ fakes.FakeResource( None, copy.deepcopy( - identity_fakes.ASSIGNMENT_WITH_DOMAIN_ID_AND_GROUP_ID), + identity_fakes.ASSIGNMENT_WITH_DOMAIN_ID_AND_GROUP_ID + ), loaded=True, ), fakes.FakeResource( None, copy.deepcopy( - identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_GROUP_ID), + identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_GROUP_ID + ), loaded=True, ), ] - arglist = [ - '--group', identity_fakes.group_name - ] + arglist = ['--group', identity_fakes.group_name] verifylist = [ ('user', None), ('group', identity_fakes.group_name), @@ -238,47 +246,51 @@ class TestRoleAssignmentList(TestRoleAssignment): role=None, user=None, os_inherit_extension_inherited_to=None, - include_names=False) + include_names=False, + ) self.assertEqual(self.columns, columns) - datalist = (( - identity_fakes.role_id, - '', - identity_fakes.group_id, - '', - identity_fakes.domain_id, - '', - False - ), (identity_fakes.role_id, - '', - identity_fakes.group_id, - identity_fakes.project_id, - '', - '', - False - ),) + datalist = ( + ( + identity_fakes.role_id, + '', + identity_fakes.group_id, + '', + identity_fakes.domain_id, + '', + False, + ), + ( + identity_fakes.role_id, + '', + identity_fakes.group_id, + identity_fakes.project_id, + '', + '', + False, + ), + ) self.assertEqual(datalist, tuple(data)) def test_role_assignment_list_domain(self): - self.role_assignments_mock.list.return_value = [ fakes.FakeResource( None, copy.deepcopy( - identity_fakes.ASSIGNMENT_WITH_DOMAIN_ID_AND_USER_ID), + identity_fakes.ASSIGNMENT_WITH_DOMAIN_ID_AND_USER_ID + ), loaded=True, ), fakes.FakeResource( None, copy.deepcopy( - identity_fakes.ASSIGNMENT_WITH_DOMAIN_ID_AND_GROUP_ID), + identity_fakes.ASSIGNMENT_WITH_DOMAIN_ID_AND_GROUP_ID + ), loaded=True, ), ] - arglist = [ - '--domain', identity_fakes.domain_name - ] + arglist = ['--domain', identity_fakes.domain_name] verifylist = [ ('user', None), ('group', None), @@ -306,47 +318,51 @@ class TestRoleAssignmentList(TestRoleAssignment): role=None, user=None, os_inherit_extension_inherited_to=None, - include_names=False) + include_names=False, + ) self.assertEqual(self.columns, columns) - datalist = (( - identity_fakes.role_id, - identity_fakes.user_id, - '', - '', - identity_fakes.domain_id, - '', - False - ), (identity_fakes.role_id, - '', - identity_fakes.group_id, - '', - identity_fakes.domain_id, - '', - False - ),) + datalist = ( + ( + identity_fakes.role_id, + identity_fakes.user_id, + '', + '', + identity_fakes.domain_id, + '', + False, + ), + ( + identity_fakes.role_id, + '', + identity_fakes.group_id, + '', + identity_fakes.domain_id, + '', + False, + ), + ) self.assertEqual(datalist, tuple(data)) def test_role_assignment_list_project(self): - self.role_assignments_mock.list.return_value = [ fakes.FakeResource( None, copy.deepcopy( - identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID), + identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID + ), loaded=True, ), fakes.FakeResource( None, copy.deepcopy( - identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_GROUP_ID), + identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_GROUP_ID + ), loaded=True, ), ] - arglist = [ - '--project', identity_fakes.project_name - ] + arglist = ['--project', identity_fakes.project_name] verifylist = [ ('user', None), ('group', None), @@ -374,29 +390,33 @@ class TestRoleAssignmentList(TestRoleAssignment): role=None, user=None, os_inherit_extension_inherited_to=None, - include_names=False) + include_names=False, + ) self.assertEqual(self.columns, columns) - datalist = (( - identity_fakes.role_id, - identity_fakes.user_id, - '', - identity_fakes.project_id, - '', - '', - False - ), (identity_fakes.role_id, - '', - identity_fakes.group_id, - identity_fakes.project_id, - '', - '', - False - ),) + datalist = ( + ( + identity_fakes.role_id, + identity_fakes.user_id, + '', + identity_fakes.project_id, + '', + '', + False, + ), + ( + identity_fakes.role_id, + '', + identity_fakes.group_id, + identity_fakes.project_id, + '', + '', + False, + ), + ) self.assertEqual(datalist, tuple(data)) def test_role_assignment_list_def_creds(self): - auth_ref = self.app.client_manager.auth_ref = mock.Mock() auth_ref.project_id.return_value = identity_fakes.project_id auth_ref.user_id.return_value = identity_fakes.user_id @@ -405,7 +425,8 @@ class TestRoleAssignmentList(TestRoleAssignment): fakes.FakeResource( None, copy.deepcopy( - identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID), + identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID + ), loaded=True, ), ] @@ -443,33 +464,37 @@ class TestRoleAssignmentList(TestRoleAssignment): role=None, effective=False, os_inherit_extension_inherited_to=None, - include_names=False) + include_names=False, + ) self.assertEqual(self.columns, columns) - datalist = (( - identity_fakes.role_id, - identity_fakes.user_id, - '', - identity_fakes.project_id, - '', - '', - False - ),) + datalist = ( + ( + identity_fakes.role_id, + identity_fakes.user_id, + '', + identity_fakes.project_id, + '', + '', + False, + ), + ) self.assertEqual(datalist, tuple(data)) def test_role_assignment_list_effective(self): - self.role_assignments_mock.list.return_value = [ fakes.FakeResource( None, copy.deepcopy( - identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID), + identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID + ), loaded=True, ), fakes.FakeResource( None, copy.deepcopy( - identity_fakes.ASSIGNMENT_WITH_DOMAIN_ID_AND_USER_ID), + identity_fakes.ASSIGNMENT_WITH_DOMAIN_ID_AND_USER_ID + ), loaded=True, ), ] @@ -502,44 +527,42 @@ class TestRoleAssignmentList(TestRoleAssignment): role=None, user=None, os_inherit_extension_inherited_to=None, - include_names=False) + include_names=False, + ) self.assertEqual(self.columns, columns) - datalist = (( - identity_fakes.role_id, - identity_fakes.user_id, - '', - identity_fakes.project_id, - '', - '', - False - ), (identity_fakes.role_id, - identity_fakes.user_id, - '', - '', - identity_fakes.domain_id, - '', - False - ),) + datalist = ( + ( + identity_fakes.role_id, + identity_fakes.user_id, + '', + identity_fakes.project_id, + '', + '', + False, + ), + ( + identity_fakes.role_id, + identity_fakes.user_id, + '', + '', + identity_fakes.domain_id, + '', + False, + ), + ) self.assertEqual(tuple(data), datalist) def test_role_assignment_list_inherited(self): - + fake_assignment_a = copy.deepcopy( + identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID_INHERITED + ) + fake_assignment_b = copy.deepcopy( + identity_fakes.ASSIGNMENT_WITH_DOMAIN_ID_AND_USER_ID_INHERITED + ) self.role_assignments_mock.list.return_value = [ - fakes.FakeResource( - None, - copy.deepcopy( - (identity_fakes. - ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID_INHERITED)), - loaded=True, - ), - fakes.FakeResource( - None, - copy.deepcopy( - (identity_fakes. - ASSIGNMENT_WITH_DOMAIN_ID_AND_USER_ID_INHERITED)), - loaded=True, - ), + fakes.FakeResource(None, fake_assignment_a, loaded=True), + fakes.FakeResource(None, fake_assignment_b, loaded=True), ] arglist = ['--inherited'] @@ -570,44 +593,42 @@ class TestRoleAssignmentList(TestRoleAssignment): role=None, user=None, os_inherit_extension_inherited_to='projects', - include_names=False) + include_names=False, + ) self.assertEqual(self.columns, columns) - datalist = (( - identity_fakes.role_id, - identity_fakes.user_id, - '', - identity_fakes.project_id, - '', - '', - True - ), (identity_fakes.role_id, - identity_fakes.user_id, - '', - '', - identity_fakes.domain_id, - '', - True - ),) + datalist = ( + ( + identity_fakes.role_id, + identity_fakes.user_id, + '', + identity_fakes.project_id, + '', + '', + True, + ), + ( + identity_fakes.role_id, + identity_fakes.user_id, + '', + '', + identity_fakes.domain_id, + '', + True, + ), + ) self.assertEqual(datalist, tuple(data)) def test_role_assignment_list_include_names(self): - + fake_role_assignment_a = copy.deepcopy( + identity_fakes.ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID_INCLUDE_NAMES + ) + fake_role_assignment_b = copy.deepcopy( + identity_fakes.ASSIGNMENT_WITH_DOMAIN_ID_AND_USER_ID_INCLUDE_NAMES + ) self.role_assignments_mock.list.return_value = [ - fakes.FakeResource( - None, - copy.deepcopy( - identity_fakes - .ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID_INCLUDE_NAMES), - loaded=True, - ), - fakes.FakeResource( - None, - copy.deepcopy( - identity_fakes - .ASSIGNMENT_WITH_DOMAIN_ID_AND_USER_ID_INCLUDE_NAMES), - loaded=True, - ), + fakes.FakeResource(None, fake_role_assignment_a, loaded=True), + fakes.FakeResource(None, fake_role_assignment_b, loaded=True), ] arglist = ['--names'] @@ -640,46 +661,62 @@ class TestRoleAssignmentList(TestRoleAssignment): role=None, user=None, os_inherit_extension_inherited_to=None, - include_names=True) + include_names=True, + ) collist = ( - 'Role', 'User', 'Group', 'Project', 'Domain', 'System', 'Inherited' + 'Role', + 'User', + 'Group', + 'Project', + 'Domain', + 'System', + 'Inherited', ) self.assertEqual(columns, collist) - datalist1 = (( - identity_fakes.role_name, - '@'.join([identity_fakes.user_name, identity_fakes.domain_name]), - '', - '@'.join([identity_fakes.project_name, - identity_fakes.domain_name]), - '', - '', - False - ), (identity_fakes.role_name, - '@'.join([identity_fakes.user_name, identity_fakes.domain_name]), - '', - '', - identity_fakes.domain_name, - '', - False - ),) + datalist1 = ( + ( + identity_fakes.role_name, + '@'.join( + [identity_fakes.user_name, identity_fakes.domain_name] + ), + '', + '@'.join( + [identity_fakes.project_name, identity_fakes.domain_name] + ), + '', + '', + False, + ), + ( + identity_fakes.role_name, + '@'.join( + [identity_fakes.user_name, identity_fakes.domain_name] + ), + '', + '', + identity_fakes.domain_name, + '', + False, + ), + ) self.assertEqual(tuple(data), datalist1) def test_role_assignment_list_domain_role(self): - self.role_assignments_mock.list.return_value = [ fakes.FakeResource( None, - copy.deepcopy( - identity_fakes.ASSIGNMENT_WITH_DOMAIN_ROLE), + copy.deepcopy(identity_fakes.ASSIGNMENT_WITH_DOMAIN_ROLE), loaded=True, ), ] arglist = [ - '--role', identity_fakes.ROLE_2['name'], - '--role-domain', identity_fakes.domain_name + '--role', + identity_fakes.ROLE_2['name'], + '--role-domain', + identity_fakes.domain_name, ] verifylist = [ ('user', None), @@ -708,16 +745,19 @@ class TestRoleAssignmentList(TestRoleAssignment): role=self.roles_mock.get(), effective=False, os_inherit_extension_inherited_to=None, - include_names=False) + include_names=False, + ) self.assertEqual(self.columns, columns) - datalist = (( - identity_fakes.ROLE_2['id'], - identity_fakes.user_id, - '', - '', - identity_fakes.domain_id, - '', - False - ),) + datalist = ( + ( + identity_fakes.ROLE_2['id'], + identity_fakes.user_id, + '', + '', + identity_fakes.domain_id, + '', + False, + ), + ) self.assertEqual(datalist, tuple(data)) diff --git a/openstackclient/tests/unit/identity/v3/test_service.py b/openstackclient/tests/unit/identity/v3/test_service.py index 4cba445b..8143ddd5 100644 --- a/openstackclient/tests/unit/identity/v3/test_service.py +++ b/openstackclient/tests/unit/identity/v3/test_service.py @@ -21,7 +21,6 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes class TestService(identity_fakes.TestIdentityv3): - def setUp(self): super(TestService, self).setUp() @@ -31,7 +30,6 @@ class TestService(identity_fakes.TestIdentityv3): class TestServiceCreate(TestService): - columns = ( 'description', 'enabled', @@ -58,7 +56,8 @@ class TestServiceCreate(TestService): def test_service_create_name(self): arglist = [ - '--name', self.service.name, + '--name', + self.service.name, self.service.type, ] verifylist = [ @@ -88,7 +87,8 @@ class TestServiceCreate(TestService): def test_service_create_description(self): arglist = [ - '--description', self.service.description, + '--description', + self.service.description, self.service.type, ] verifylist = [ @@ -178,7 +178,6 @@ class TestServiceCreate(TestService): class TestServiceDelete(TestService): - service = identity_fakes.FakeService.create_one_service() def setUp(self): @@ -209,7 +208,6 @@ class TestServiceDelete(TestService): class TestServiceList(TestService): - service = identity_fakes.FakeService.create_one_service() def setUp(self): @@ -234,11 +232,13 @@ class TestServiceList(TestService): collist = ('ID', 'Name', 'Type') self.assertEqual(collist, columns) - datalist = (( - self.service.id, - self.service.name, - self.service.type, - ), ) + datalist = ( + ( + self.service.id, + self.service.name, + self.service.type, + ), + ) self.assertEqual(datalist, tuple(data)) def test_service_list_long(self): @@ -259,18 +259,19 @@ class TestServiceList(TestService): collist = ('ID', 'Name', 'Type', 'Description', 'Enabled') self.assertEqual(collist, columns) - datalist = (( - self.service.id, - self.service.name, - self.service.type, - self.service.description, - True, - ), ) + datalist = ( + ( + self.service.id, + self.service.name, + self.service.type, + self.service.description, + True, + ), + ) self.assertEqual(datalist, tuple(data)) class TestServiceSet(TestService): - service = identity_fakes.FakeService.create_one_service() def setUp(self): @@ -303,7 +304,8 @@ class TestServiceSet(TestService): def test_service_set_type(self): arglist = [ - '--type', self.service.type, + '--type', + self.service.type, self.service.name, ] verifylist = [ @@ -323,15 +325,13 @@ class TestServiceSet(TestService): 'type': self.service.type, } # ServiceManager.update(service, name=, type=, enabled=, **kwargs) - self.services_mock.update.assert_called_with( - self.service.id, - **kwargs - ) + self.services_mock.update.assert_called_with(self.service.id, **kwargs) self.assertIsNone(result) def test_service_set_name(self): arglist = [ - '--name', self.service.name, + '--name', + self.service.name, self.service.name, ] verifylist = [ @@ -351,15 +351,13 @@ class TestServiceSet(TestService): 'name': self.service.name, } # ServiceManager.update(service, name=, type=, enabled=, **kwargs) - self.services_mock.update.assert_called_with( - self.service.id, - **kwargs - ) + self.services_mock.update.assert_called_with(self.service.id, **kwargs) self.assertIsNone(result) def test_service_set_description(self): arglist = [ - '--description', self.service.description, + '--description', + self.service.description, self.service.name, ] verifylist = [ @@ -379,10 +377,7 @@ class TestServiceSet(TestService): 'description': self.service.description, } # ServiceManager.update(service, name=, type=, enabled=, **kwargs) - self.services_mock.update.assert_called_with( - self.service.id, - **kwargs - ) + self.services_mock.update.assert_called_with(self.service.id, **kwargs) self.assertIsNone(result) def test_service_set_enable(self): @@ -407,10 +402,7 @@ class TestServiceSet(TestService): 'enabled': True, } # ServiceManager.update(service, name=, type=, enabled=, **kwargs) - self.services_mock.update.assert_called_with( - self.service.id, - **kwargs - ) + self.services_mock.update.assert_called_with(self.service.id, **kwargs) self.assertIsNone(result) def test_service_set_disable(self): @@ -435,15 +427,11 @@ class TestServiceSet(TestService): 'enabled': False, } # ServiceManager.update(service, name=, type=, enabled=, **kwargs) - self.services_mock.update.assert_called_with( - self.service.id, - **kwargs - ) + self.services_mock.update.assert_called_with(self.service.id, **kwargs) self.assertIsNone(result) class TestServiceShow(TestService): - service = identity_fakes.FakeService.create_one_service() def setUp(self): @@ -470,9 +458,7 @@ class TestServiceShow(TestService): columns, data = self.cmd.take_action(parsed_args) # ServiceManager.get(id) - self.services_mock.find.assert_called_with( - name=self.service.name - ) + self.services_mock.find.assert_called_with(name=self.service.name) collist = ('description', 'enabled', 'id', 'name', 'type') self.assertEqual(collist, columns) @@ -501,4 +487,6 @@ class TestServiceShow(TestService): except exceptions.CommandError as e: self.assertEqual( "Multiple service matches found for 'nounique_service'," - " use an ID to be more specific.", str(e)) + " use an ID to be more specific.", + str(e), + ) diff --git a/openstackclient/tests/unit/identity/v3/test_service_provider.py b/openstackclient/tests/unit/identity/v3/test_service_provider.py index 57473ef9..59117da9 100644 --- a/openstackclient/tests/unit/identity/v3/test_service_provider.py +++ b/openstackclient/tests/unit/identity/v3/test_service_provider.py @@ -20,7 +20,6 @@ from openstackclient.tests.unit.identity.v3 import fakes as service_fakes class TestServiceProvider(service_fakes.TestFederatedIdentity): - def setUp(self): super(TestServiceProvider, self).setUp() @@ -30,7 +29,6 @@ class TestServiceProvider(service_fakes.TestFederatedIdentity): class TestServiceProviderCreate(TestServiceProvider): - columns = ( 'auth_url', 'description', @@ -43,7 +41,7 @@ class TestServiceProviderCreate(TestServiceProvider): service_fakes.sp_description, True, service_fakes.sp_id, - service_fakes.service_provider_url + service_fakes.service_provider_url, ) def setUp(self): @@ -56,15 +54,16 @@ class TestServiceProviderCreate(TestServiceProvider): def test_create_service_provider_required_options_only(self): arglist = [ - '--auth-url', service_fakes.sp_auth_url, - '--service-provider-url', service_fakes.service_provider_url, + '--auth-url', + service_fakes.sp_auth_url, + '--service-provider-url', + service_fakes.service_provider_url, service_fakes.sp_id, ] verifylist = [ ('auth_url', service_fakes.sp_auth_url), ('service_provider_url', service_fakes.service_provider_url), ('service_provider_id', service_fakes.sp_id), - ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) columns, data = self.cmd.take_action(parsed_args) @@ -74,23 +73,24 @@ class TestServiceProviderCreate(TestServiceProvider): 'enabled': True, 'description': None, 'auth_url': service_fakes.sp_auth_url, - 'sp_url': service_fakes.service_provider_url + 'sp_url': service_fakes.service_provider_url, } self.service_providers_mock.create.assert_called_with( - id=service_fakes.sp_id, - **kwargs + id=service_fakes.sp_id, **kwargs ) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) def test_create_service_provider_description(self): - arglist = [ - '--description', service_fakes.sp_description, - '--auth-url', service_fakes.sp_auth_url, - '--service-provider-url', service_fakes.service_provider_url, + '--description', + service_fakes.sp_description, + '--auth-url', + service_fakes.sp_auth_url, + '--service-provider-url', + service_fakes.service_provider_url, service_fakes.sp_id, ] verifylist = [ @@ -112,15 +112,13 @@ class TestServiceProviderCreate(TestServiceProvider): } self.service_providers_mock.create.assert_called_with( - id=service_fakes.sp_id, - **kwargs + id=service_fakes.sp_id, **kwargs ) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) def test_create_service_provider_disabled(self): - # Prepare FakeResource object service_provider = copy.deepcopy(service_fakes.SERVICE_PROVIDER) service_provider['enabled'] = False @@ -130,8 +128,10 @@ class TestServiceProviderCreate(TestServiceProvider): self.service_providers_mock.create.return_value = resource arglist = [ - '--auth-url', service_fakes.sp_auth_url, - '--service-provider-url', service_fakes.service_provider_url, + '--auth-url', + service_fakes.sp_auth_url, + '--service-provider-url', + service_fakes.service_provider_url, '--disable', service_fakes.sp_id, ] @@ -151,8 +151,7 @@ class TestServiceProviderCreate(TestServiceProvider): } self.service_providers_mock.create.assert_called_with( - id=service_fakes.sp_id, - **kwargs + id=service_fakes.sp_id, **kwargs ) self.assertEqual(self.columns, columns) datalist = ( @@ -160,13 +159,12 @@ class TestServiceProviderCreate(TestServiceProvider): None, False, service_fakes.sp_id, - service_fakes.service_provider_url + service_fakes.service_provider_url, ) self.assertEqual(datalist, data) class TestServiceProviderDelete(TestServiceProvider): - def setUp(self): super(TestServiceProviderDelete, self).setUp() @@ -198,7 +196,6 @@ class TestServiceProviderDelete(TestServiceProvider): class TestServiceProviderList(TestServiceProvider): - def setUp(self): super(TestServiceProviderList, self).setUp() @@ -232,17 +229,18 @@ class TestServiceProviderList(TestServiceProvider): collist = ('ID', 'Enabled', 'Description', 'Auth URL') self.assertEqual(collist, columns) - datalist = (( - service_fakes.sp_id, - True, - service_fakes.sp_description, - service_fakes.sp_auth_url - ), ) + datalist = ( + ( + service_fakes.sp_id, + True, + service_fakes.sp_description, + service_fakes.sp_auth_url, + ), + ) self.assertEqual(tuple(data), datalist) class TestServiceProviderSet(TestServiceProvider): - columns = ( 'auth_url', 'description', @@ -272,16 +270,13 @@ class TestServiceProviderSet(TestServiceProvider): """Prepare fake return objects before the test is executed""" updated_sp = copy.deepcopy(service_fakes.SERVICE_PROVIDER) updated_sp['enabled'] = False - resources = fakes.FakeResource( - None, - updated_sp, - loaded=True - ) + resources = fakes.FakeResource(None, updated_sp, loaded=True) self.service_providers_mock.update.return_value = resources prepare(self) arglist = [ - '--disable', service_fakes.sp_id, + '--disable', + service_fakes.sp_id, ] verifylist = [ ('service_provider', service_fakes.sp_id), @@ -295,7 +290,7 @@ class TestServiceProviderSet(TestServiceProvider): enabled=False, description=None, auth_url=None, - sp_url=None + sp_url=None, ) def test_service_provider_enable(self): @@ -309,13 +304,14 @@ class TestServiceProviderSet(TestServiceProvider): resources = fakes.FakeResource( None, copy.deepcopy(service_fakes.SERVICE_PROVIDER), - loaded=True + loaded=True, ) self.service_providers_mock.update.return_value = resources prepare(self) arglist = [ - '--enable', service_fakes.sp_id, + '--enable', + service_fakes.sp_id, ] verifylist = [ ('service_provider', service_fakes.sp_id), @@ -326,8 +322,12 @@ class TestServiceProviderSet(TestServiceProvider): self.cmd.take_action(parsed_args) self.service_providers_mock.update.assert_called_with( - service_fakes.sp_id, enabled=True, description=None, - auth_url=None, sp_url=None) + service_fakes.sp_id, + enabled=True, + description=None, + auth_url=None, + sp_url=None, + ) def test_service_provider_no_options(self): def prepare(self): @@ -335,7 +335,7 @@ class TestServiceProviderSet(TestServiceProvider): resources = fakes.FakeResource( None, copy.deepcopy(service_fakes.SERVICE_PROVIDER), - loaded=True + loaded=True, ) self.service_providers_mock.get.return_value = resources @@ -364,7 +364,6 @@ class TestServiceProviderSet(TestServiceProvider): class TestServiceProviderShow(TestServiceProvider): - def setUp(self): super(TestServiceProviderShow, self).setUp() @@ -373,8 +372,10 @@ class TestServiceProviderShow(TestServiceProvider): copy.deepcopy(service_fakes.SERVICE_PROVIDER), loaded=True, ) - self.service_providers_mock.get.side_effect = [Exception("Not found"), - ret] + self.service_providers_mock.get.side_effect = [ + Exception("Not found"), + ret, + ] self.service_providers_mock.get.return_value = ret # Get the command object to test @@ -392,8 +393,7 @@ class TestServiceProviderShow(TestServiceProvider): columns, data = self.cmd.take_action(parsed_args) self.service_providers_mock.get.assert_called_with( - service_fakes.sp_id, - id='BETA' + service_fakes.sp_id, id='BETA' ) collist = ('auth_url', 'description', 'enabled', 'id', 'sp_url') @@ -403,6 +403,6 @@ class TestServiceProviderShow(TestServiceProvider): service_fakes.sp_description, True, service_fakes.sp_id, - service_fakes.service_provider_url + service_fakes.service_provider_url, ) self.assertEqual(data, datalist) diff --git a/openstackclient/tests/unit/identity/v3/test_token.py b/openstackclient/tests/unit/identity/v3/test_token.py index adb491b3..80d5dc19 100644 --- a/openstackclient/tests/unit/identity/v3/test_token.py +++ b/openstackclient/tests/unit/identity/v3/test_token.py @@ -20,7 +20,6 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes class TestToken(identity_fakes.TestIdentityv3): - def setUp(self): super(TestToken, self).setUp() @@ -30,7 +29,6 @@ class TestToken(identity_fakes.TestIdentityv3): class TestTokenIssue(TestToken): - def setUp(self): super(TestTokenIssue, self).setUp() @@ -117,7 +115,6 @@ class TestTokenIssue(TestToken): class TestTokenRevoke(TestToken): - TOKEN = 'fob' def setUp(self): diff --git a/openstackclient/tests/unit/identity/v3/test_trust.py b/openstackclient/tests/unit/identity/v3/test_trust.py index d530adf5..67e64cea 100644 --- a/openstackclient/tests/unit/identity/v3/test_trust.py +++ b/openstackclient/tests/unit/identity/v3/test_trust.py @@ -23,7 +23,6 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes class TestTrust(identity_fakes.TestIdentityv3): - def setUp(self): super(TestTrust, self).setUp() @@ -38,7 +37,6 @@ class TestTrust(identity_fakes.TestIdentityv3): class TestTrustCreate(TestTrust): - def setUp(self): super(TestTrustCreate, self).setUp() @@ -71,10 +69,12 @@ class TestTrustCreate(TestTrust): def test_trust_create_basic(self): arglist = [ - '--project', identity_fakes.project_id, - '--role', identity_fakes.role_id, + '--project', + identity_fakes.project_id, + '--role', + identity_fakes.role_id, + identity_fakes.user_id, identity_fakes.user_id, - identity_fakes.user_id ] verifylist = [ ('project', identity_fakes.project_id), @@ -100,13 +100,18 @@ class TestTrustCreate(TestTrust): # TrustManager.create(trustee_id, trustor_id, impersonation=, # project=, role_names=, expires_at=) self.trusts_mock.create.assert_called_with( - identity_fakes.user_id, - identity_fakes.user_id, - **kwargs + identity_fakes.user_id, identity_fakes.user_id, **kwargs ) - collist = ('expires_at', 'id', 'impersonation', 'project_id', - 'roles', 'trustee_user_id', 'trustor_user_id') + collist = ( + 'expires_at', + 'id', + 'impersonation', + 'project_id', + 'roles', + 'trustee_user_id', + 'trustor_user_id', + ) self.assertEqual(collist, columns) datalist = ( identity_fakes.trust_expires, @@ -115,13 +120,12 @@ class TestTrustCreate(TestTrust): identity_fakes.project_id, identity_fakes.role_name, identity_fakes.user_id, - identity_fakes.user_id + identity_fakes.user_id, ) self.assertEqual(datalist, data) class TestTrustDelete(TestTrust): - def setUp(self): super(TestTrustDelete, self).setUp() @@ -140,9 +144,7 @@ class TestTrustDelete(TestTrust): arglist = [ identity_fakes.trust_id, ] - verifylist = [ - ('trust', [identity_fakes.trust_id]) - ] + verifylist = [('trust', [identity_fakes.trust_id])] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = self.cmd.take_action(parsed_args) @@ -154,8 +156,10 @@ class TestTrustDelete(TestTrust): @mock.patch.object(utils, 'find_resource') def test_delete_multi_trusts_with_exception(self, find_mock): - find_mock.side_effect = [self.trusts_mock.get.return_value, - exceptions.CommandError] + find_mock.side_effect = [ + self.trusts_mock.get.return_value, + exceptions.CommandError, + ] arglist = [ identity_fakes.trust_id, 'unexist_trust', @@ -169,19 +173,18 @@ class TestTrustDelete(TestTrust): self.cmd.take_action(parsed_args) self.fail('CommandError should be raised.') except exceptions.CommandError as e: - self.assertEqual('1 of 2 trusts failed to delete.', - str(e)) + self.assertEqual('1 of 2 trusts failed to delete.', str(e)) find_mock.assert_any_call(self.trusts_mock, identity_fakes.trust_id) find_mock.assert_any_call(self.trusts_mock, 'unexist_trust') self.assertEqual(2, find_mock.call_count) self.trusts_mock.delete.assert_called_once_with( - identity_fakes.trust_id) + identity_fakes.trust_id + ) class TestTrustList(TestTrust): - def setUp(self): super(TestTrustList, self).setUp() @@ -211,17 +214,25 @@ class TestTrustList(TestTrust): trustee_user=None, ) - collist = ('ID', 'Expires At', 'Impersonation', 'Project ID', - 'Trustee User ID', 'Trustor User ID') + collist = ( + 'ID', + 'Expires At', + 'Impersonation', + 'Project ID', + 'Trustee User ID', + 'Trustor User ID', + ) self.assertEqual(collist, columns) - datalist = (( - identity_fakes.trust_id, - identity_fakes.trust_expires, - identity_fakes.trust_impersonation, - identity_fakes.project_id, - identity_fakes.user_id, - identity_fakes.user_id - ), ) + datalist = ( + ( + identity_fakes.trust_id, + identity_fakes.trust_expires, + identity_fakes.trust_impersonation, + identity_fakes.project_id, + identity_fakes.user_id, + identity_fakes.user_id, + ), + ) self.assertEqual(datalist, tuple(data)) def test_trust_list_auth_user(self): @@ -248,17 +259,25 @@ class TestTrustList(TestTrust): trustee_user=self.users_mock.get() ) - collist = ('ID', 'Expires At', 'Impersonation', 'Project ID', - 'Trustee User ID', 'Trustor User ID') + collist = ( + 'ID', + 'Expires At', + 'Impersonation', + 'Project ID', + 'Trustee User ID', + 'Trustor User ID', + ) self.assertEqual(collist, columns) - datalist = (( - identity_fakes.trust_id, - identity_fakes.trust_expires, - identity_fakes.trust_impersonation, - identity_fakes.project_id, - identity_fakes.user_id, - identity_fakes.user_id - ), ) + datalist = ( + ( + identity_fakes.trust_id, + identity_fakes.trust_expires, + identity_fakes.trust_impersonation, + identity_fakes.project_id, + identity_fakes.user_id, + identity_fakes.user_id, + ), + ) self.assertEqual(datalist, tuple(data)) def test_trust_list_trustee(self): @@ -281,17 +300,25 @@ class TestTrustList(TestTrust): trustor_user=None, ) - collist = ('ID', 'Expires At', 'Impersonation', 'Project ID', - 'Trustee User ID', 'Trustor User ID') + collist = ( + 'ID', + 'Expires At', + 'Impersonation', + 'Project ID', + 'Trustee User ID', + 'Trustor User ID', + ) self.assertEqual(collist, columns) - datalist = (( - identity_fakes.trust_id, - identity_fakes.trust_expires, - identity_fakes.trust_impersonation, - identity_fakes.project_id, - identity_fakes.user_id, - identity_fakes.user_id - ), ) + datalist = ( + ( + identity_fakes.trust_id, + identity_fakes.trust_expires, + identity_fakes.trust_impersonation, + identity_fakes.project_id, + identity_fakes.user_id, + identity_fakes.user_id, + ), + ) self.assertEqual(datalist, tuple(data)) def test_trust_list_trustor(self): @@ -314,22 +341,29 @@ class TestTrustList(TestTrust): trustee_user=None, ) - collist = ('ID', 'Expires At', 'Impersonation', 'Project ID', - 'Trustee User ID', 'Trustor User ID') + collist = ( + 'ID', + 'Expires At', + 'Impersonation', + 'Project ID', + 'Trustee User ID', + 'Trustor User ID', + ) self.assertEqual(collist, columns) - datalist = (( - identity_fakes.trust_id, - identity_fakes.trust_expires, - identity_fakes.trust_impersonation, - identity_fakes.project_id, - identity_fakes.user_id, - identity_fakes.user_id - ), ) + datalist = ( + ( + identity_fakes.trust_id, + identity_fakes.trust_expires, + identity_fakes.trust_impersonation, + identity_fakes.project_id, + identity_fakes.user_id, + identity_fakes.user_id, + ), + ) self.assertEqual(datalist, tuple(data)) class TestTrustShow(TestTrust): - def setUp(self): super(TestTrustShow, self).setUp() @@ -358,8 +392,15 @@ class TestTrustShow(TestTrust): self.trusts_mock.get.assert_called_with(identity_fakes.trust_id) - collist = ('expires_at', 'id', 'impersonation', 'project_id', - 'roles', 'trustee_user_id', 'trustor_user_id') + collist = ( + 'expires_at', + 'id', + 'impersonation', + 'project_id', + 'roles', + 'trustee_user_id', + 'trustor_user_id', + ) self.assertEqual(collist, columns) datalist = ( identity_fakes.trust_expires, @@ -368,6 +409,6 @@ class TestTrustShow(TestTrust): identity_fakes.project_id, identity_fakes.role_name, identity_fakes.user_id, - identity_fakes.user_id + identity_fakes.user_id, ) self.assertEqual(datalist, data) diff --git a/openstackclient/tests/unit/identity/v3/test_unscoped_saml.py b/openstackclient/tests/unit/identity/v3/test_unscoped_saml.py index 34655263..fcc72bd6 100644 --- a/openstackclient/tests/unit/identity/v3/test_unscoped_saml.py +++ b/openstackclient/tests/unit/identity/v3/test_unscoped_saml.py @@ -18,7 +18,6 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes class TestUnscopedSAML(identity_fakes.TestFederatedIdentity): - def setUp(self): super(TestUnscopedSAML, self).setUp() @@ -30,7 +29,6 @@ class TestUnscopedSAML(identity_fakes.TestFederatedIdentity): class TestDomainList(TestUnscopedSAML): - def setUp(self): super(TestDomainList, self).setUp() @@ -59,17 +57,18 @@ class TestDomainList(TestUnscopedSAML): collist = ('ID', 'Enabled', 'Name', 'Description') self.assertEqual(collist, columns) - datalist = (( - identity_fakes.domain_id, - True, - identity_fakes.domain_name, - identity_fakes.domain_description, - ), ) + datalist = ( + ( + identity_fakes.domain_id, + True, + identity_fakes.domain_name, + identity_fakes.domain_description, + ), + ) self.assertEqual(datalist, tuple(data)) class TestProjectList(TestUnscopedSAML): - def setUp(self): super(TestProjectList, self).setUp() @@ -98,10 +97,12 @@ class TestProjectList(TestUnscopedSAML): collist = ('ID', 'Domain ID', 'Enabled', 'Name') self.assertEqual(collist, columns) - datalist = (( - identity_fakes.project_id, - identity_fakes.domain_id, - True, - identity_fakes.project_name, - ), ) + datalist = ( + ( + identity_fakes.project_id, + identity_fakes.domain_id, + True, + identity_fakes.project_name, + ), + ) self.assertEqual(datalist, tuple(data)) diff --git a/openstackclient/tests/unit/identity/v3/test_user.py b/openstackclient/tests/unit/identity/v3/test_user.py index c71435ba..15ebd67e 100644 --- a/openstackclient/tests/unit/identity/v3/test_user.py +++ b/openstackclient/tests/unit/identity/v3/test_user.py @@ -25,7 +25,6 @@ from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes class TestUser(identity_fakes.TestIdentityv3): - def setUp(self): super(TestUser, self).setUp() @@ -46,13 +45,13 @@ class TestUser(identity_fakes.TestIdentityv3): self.users_mock.reset_mock() # Shortcut for RoleAssignmentManager Mock - self.role_assignments_mock = self.app.client_manager.identity.\ - role_assignments + self.role_assignments_mock = ( + self.app.client_manager.identity.role_assignments + ) self.role_assignments_mock.reset_mock() class TestUserCreate(TestUser): - domain = identity_fakes.FakeDomain.create_one_domain() project = identity_fakes.FakeProject.create_one_project() @@ -69,8 +68,10 @@ class TestUserCreate(TestUser): super(TestUserCreate, self).setUp() self.user = identity_fakes.FakeUser.create_one_user( - attrs={'domain_id': self.domain.id, - 'default_project_id': self.project.id} + attrs={ + 'domain_id': self.domain.id, + 'default_project_id': self.project.id, + } ) self.datalist = ( self.project.id, @@ -118,16 +119,15 @@ class TestUserCreate(TestUser): # UserManager.create(name=, domain=, project=, password=, email=, # description=, enabled=, default_project=) - self.users_mock.create.assert_called_with( - **kwargs - ) + self.users_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) def test_user_create_password(self): arglist = [ - '--password', 'secret', + '--password', + 'secret', self.user.name, ] verifylist = [ @@ -157,9 +157,7 @@ class TestUserCreate(TestUser): } # UserManager.create(name=, domain=, project=, password=, email=, # description=, enabled=, default_project=) - self.users_mock.create.assert_called_with( - **kwargs - ) + self.users_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -198,16 +196,15 @@ class TestUserCreate(TestUser): } # UserManager.create(name=, domain=, project=, password=, email=, # description=, enabled=, default_project=) - self.users_mock.create.assert_called_with( - **kwargs - ) + self.users_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) def test_user_create_email(self): arglist = [ - '--email', 'barney@example.com', + '--email', + 'barney@example.com', self.user.name, ] verifylist = [ @@ -236,16 +233,15 @@ class TestUserCreate(TestUser): } # UserManager.create(name=, domain=, project=, password=, email=, # description=, enabled=, default_project=) - self.users_mock.create.assert_called_with( - **kwargs - ) + self.users_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) def test_user_create_project(self): arglist = [ - '--project', self.project.name, + '--project', + self.project.name, self.user.name, ] verifylist = [ @@ -274,9 +270,7 @@ class TestUserCreate(TestUser): } # UserManager.create(name=, domain=, project=, password=, email=, # description=, enabled=, default_project=) - self.users_mock.create.assert_called_with( - **kwargs - ) + self.users_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) datalist = ( @@ -291,8 +285,10 @@ class TestUserCreate(TestUser): def test_user_create_project_domain(self): arglist = [ - '--project', self.project.name, - '--project-domain', self.project.domain_id, + '--project', + self.project.name, + '--project-domain', + self.project.domain_id, self.user.name, ] verifylist = [ @@ -322,9 +318,7 @@ class TestUserCreate(TestUser): } # UserManager.create(name=, domain=, project=, password=, email=, # description=, enabled=, default_project=) - self.users_mock.create.assert_called_with( - **kwargs - ) + self.users_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) datalist = ( @@ -339,7 +333,8 @@ class TestUserCreate(TestUser): def test_user_create_domain(self): arglist = [ - '--domain', self.domain.name, + '--domain', + self.domain.name, self.user.name, ] verifylist = [ @@ -368,9 +363,7 @@ class TestUserCreate(TestUser): } # UserManager.create(name=, domain=, project=, password=, email=, # description=, enabled=, default_project=) - self.users_mock.create.assert_called_with( - **kwargs - ) + self.users_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -405,9 +398,7 @@ class TestUserCreate(TestUser): } # UserManager.create(name=, domain=, project=, password=, email=, # description=, enabled=, default_project=) - self.users_mock.create.assert_called_with( - **kwargs - ) + self.users_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -441,9 +432,7 @@ class TestUserCreate(TestUser): 'password': None, } # users.create(name=, password, email, tenant_id=None, enabled=True) - self.users_mock.create.assert_called_with( - **kwargs - ) + self.users_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -478,9 +467,7 @@ class TestUserCreate(TestUser): } # UserManager.create(name=, domain=, project=, password=, email=, # description=, enabled=, default_project=) - self.users_mock.create.assert_called_with( - **kwargs - ) + self.users_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -516,9 +503,7 @@ class TestUserCreate(TestUser): } # UserManager.create(name=, domain=, project=, password=, email=, # description=, enabled=, default_project=) - self.users_mock.create.assert_called_with( - **kwargs - ) + self.users_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -554,9 +539,7 @@ class TestUserCreate(TestUser): } # UserManager.create(name=, domain=, project=, password=, email=, # description=, enabled=, default_project=) - self.users_mock.create.assert_called_with( - **kwargs - ) + self.users_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -592,9 +575,7 @@ class TestUserCreate(TestUser): } # UserManager.create(name=, domain=, project=, password=, email=, # description=, enabled=, default_project=) - self.users_mock.create.assert_called_with( - **kwargs - ) + self.users_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -630,9 +611,7 @@ class TestUserCreate(TestUser): } # UserManager.create(name=, domain=, project=, password=, email=, # description=, enabled=, default_project=) - self.users_mock.create.assert_called_with( - **kwargs - ) + self.users_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -668,9 +647,7 @@ class TestUserCreate(TestUser): } # UserManager.create(name=, domain=, project=, password=, email=, # description=, enabled=, default_project=) - self.users_mock.create.assert_called_with( - **kwargs - ) + self.users_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -706,9 +683,7 @@ class TestUserCreate(TestUser): } # UserManager.create(name=, domain=, project=, password=, email=, # description=, enabled=, default_project=) - self.users_mock.create.assert_called_with( - **kwargs - ) + self.users_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -744,9 +719,7 @@ class TestUserCreate(TestUser): } # UserManager.create(name=, domain=, project=, password=, email=, # description=, enabled=, default_project=) - self.users_mock.create.assert_called_with( - **kwargs - ) + self.users_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -782,9 +755,7 @@ class TestUserCreate(TestUser): } # UserManager.create(name=, domain=, project=, password=, email=, # description=, enabled=, default_project=) - self.users_mock.create.assert_called_with( - **kwargs - ) + self.users_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -820,22 +791,24 @@ class TestUserCreate(TestUser): } # UserManager.create(name=, domain=, project=, password=, email=, # description=, enabled=, default_project=) - self.users_mock.create.assert_called_with( - **kwargs - ) + self.users_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) def test_user_create_option_with_multi_factor_auth_rule(self): arglist = [ - '--multi-factor-auth-rule', identity_fakes.mfa_opt1, - '--multi-factor-auth-rule', identity_fakes.mfa_opt2, + '--multi-factor-auth-rule', + identity_fakes.mfa_opt1, + '--multi-factor-auth-rule', + identity_fakes.mfa_opt2, self.user.name, ] verifylist = [ - ('multi_factor_auth_rule', [identity_fakes.mfa_opt1, - identity_fakes.mfa_opt2]), + ( + 'multi_factor_auth_rule', + [identity_fakes.mfa_opt1, identity_fakes.mfa_opt2], + ), ('enable', False), ('disable', False), ('name', self.user.name), @@ -855,15 +828,14 @@ class TestUserCreate(TestUser): 'domain': None, 'email': None, 'enabled': True, - 'options': {'multi_factor_auth_rules': [["password", "totp"], - ["password"]]}, + 'options': { + 'multi_factor_auth_rules': [["password", "totp"], ["password"]] + }, 'password': None, } # UserManager.create(name=, domain=, project=, password=, email=, # description=, enabled=, default_project=) - self.users_mock.create.assert_called_with( - **kwargs - ) + self.users_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) @@ -872,7 +844,8 @@ class TestUserCreate(TestUser): arglist = [ '--ignore-password-expiry', '--disable-multi-factor-auth', - '--multi-factor-auth-rule', identity_fakes.mfa_opt1, + '--multi-factor-auth-rule', + identity_fakes.mfa_opt1, self.user.name, ] verifylist = [ @@ -898,23 +871,22 @@ class TestUserCreate(TestUser): 'domain': None, 'email': None, 'enabled': True, - 'options': {'ignore_password_expiry': True, - 'multi_factor_auth_enabled': False, - 'multi_factor_auth_rules': [["password", "totp"]]}, + 'options': { + 'ignore_password_expiry': True, + 'multi_factor_auth_enabled': False, + 'multi_factor_auth_rules': [["password", "totp"]], + }, 'password': None, } # UserManager.create(name=, domain=, project=, password=, email=, # description=, enabled=, default_project=) - self.users_mock.create.assert_called_with( - **kwargs - ) + self.users_mock.create.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, data) class TestUserDelete(TestUser): - user = identity_fakes.FakeUser.create_one_user() def setUp(self): @@ -945,8 +917,7 @@ class TestUserDelete(TestUser): @mock.patch.object(utils, 'find_resource') def test_delete_multi_users_with_exception(self, find_mock): - find_mock.side_effect = [self.user, - exceptions.CommandError] + find_mock.side_effect = [self.user, exceptions.CommandError] arglist = [ self.user.id, 'unexist_user', @@ -960,8 +931,7 @@ class TestUserDelete(TestUser): self.cmd.take_action(parsed_args) self.fail('CommandError should be raised.') except exceptions.CommandError as e: - self.assertEqual('1 of 2 users failed to delete.', - str(e)) + self.assertEqual('1 of 2 users failed to delete.', str(e)) find_mock.assert_any_call(self.users_mock, self.user.id) find_mock.assert_any_call(self.users_mock, 'unexist_user') @@ -971,22 +941,19 @@ class TestUserDelete(TestUser): class TestUserList(TestUser): - domain = identity_fakes.FakeDomain.create_one_domain() project = identity_fakes.FakeProject.create_one_project() user = identity_fakes.FakeUser.create_one_user( - attrs={'domain_id': domain.id, - 'default_project_id': project.id} + attrs={'domain_id': domain.id, 'default_project_id': project.id} ) group = identity_fakes.FakeGroup.create_one_group() role_assignment = ( identity_fakes.FakeRoleAssignment.create_one_role_assignment( - attrs={'user': {'id': user.id}})) + attrs={'user': {'id': user.id}} + ) + ) - columns = [ - 'ID', - 'Name' - ] + columns = ['ID', 'Name'] datalist = ( ( user.id, @@ -1023,16 +990,15 @@ class TestUserList(TestUser): 'group': None, } - self.users_mock.list.assert_called_with( - **kwargs - ) + self.users_mock.list.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, tuple(data)) def test_user_list_domain(self): arglist = [ - '--domain', self.domain.id, + '--domain', + self.domain.id, ] verifylist = [ ('domain', self.domain.id), @@ -1050,16 +1016,15 @@ class TestUserList(TestUser): 'group': None, } - self.users_mock.list.assert_called_with( - **kwargs - ) + self.users_mock.list.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, tuple(data)) def test_user_list_group(self): arglist = [ - '--group', self.group.name, + '--group', + self.group.name, ] verifylist = [ ('group', self.group.name), @@ -1077,9 +1042,7 @@ class TestUserList(TestUser): 'group': self.group.id, } - self.users_mock.list.assert_called_with( - **kwargs - ) + self.users_mock.list.assert_called_with(**kwargs) self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, tuple(data)) @@ -1104,9 +1067,7 @@ class TestUserList(TestUser): 'group': None, } - self.users_mock.list.assert_called_with( - **kwargs - ) + self.users_mock.list.assert_called_with(**kwargs) collist = [ 'ID', @@ -1133,7 +1094,8 @@ class TestUserList(TestUser): def test_user_list_project(self): arglist = [ - '--project', self.project.name, + '--project', + self.project.name, ] verifylist = [ ('project', self.project.name), @@ -1157,15 +1119,13 @@ class TestUserList(TestUser): class TestUserSet(TestUser): - project = identity_fakes.FakeProject.create_one_project() domain = identity_fakes.FakeDomain.create_one_domain() user = identity_fakes.FakeUser.create_one_user( attrs={'default_project_id': project.id} ) user2 = identity_fakes.FakeUser.create_one_user( - attrs={'default_project_id': project.id, - 'domain_id': domain.id} + attrs={'default_project_id': project.id, 'domain_id': domain.id} ) def setUp(self): @@ -1199,7 +1159,8 @@ class TestUserSet(TestUser): def test_user_set_name(self): arglist = [ - '--name', 'qwerty', + '--name', + 'qwerty', self.user.name, ] verifylist = [ @@ -1222,17 +1183,16 @@ class TestUserSet(TestUser): } # UserManager.update(user, name=, domain=, project=, password=, # email=, description=, enabled=, default_project=) - self.users_mock.update.assert_called_with( - self.user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.user.id, **kwargs) self.assertIsNone(result) def test_user_set_specify_domain(self): arglist = [ - '--name', 'qwerty', - '--domain', self.domain.id, - self.user2.name + '--name', + 'qwerty', + '--domain', + self.domain.id, + self.user2.name, ] verifylist = [ ('name', 'qwerty'), @@ -1248,20 +1208,15 @@ class TestUserSet(TestUser): result = self.cmd.take_action(parsed_args) - kwargs = { - 'enabled': True, - 'name': 'qwerty' - } + kwargs = {'enabled': True, 'name': 'qwerty'} - self.users_mock.update.assert_called_with( - self.user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.user.id, **kwargs) self.assertIsNone(result) def test_user_set_password(self): arglist = [ - '--password', 'secret', + '--password', + 'secret', self.user.name, ] verifylist = [ @@ -1285,10 +1240,7 @@ class TestUserSet(TestUser): } # UserManager.update(user, name=, domain=, project=, password=, # email=, description=, enabled=, default_project=) - self.users_mock.update.assert_called_with( - self.user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.user.id, **kwargs) self.assertIsNone(result) def test_user_set_password_prompt(self): @@ -1320,15 +1272,13 @@ class TestUserSet(TestUser): } # UserManager.update(user, name=, domain=, project=, password=, # email=, description=, enabled=, default_project=) - self.users_mock.update.assert_called_with( - self.user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.user.id, **kwargs) self.assertIsNone(result) def test_user_set_email(self): arglist = [ - '--email', 'barney@example.com', + '--email', + 'barney@example.com', self.user.name, ] verifylist = [ @@ -1351,15 +1301,13 @@ class TestUserSet(TestUser): } # UserManager.update(user, name=, domain=, project=, password=, # email=, description=, enabled=, default_project=) - self.users_mock.update.assert_called_with( - self.user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.user.id, **kwargs) self.assertIsNone(result) def test_user_set_project(self): arglist = [ - '--project', self.project.id, + '--project', + self.project.id, self.user.name, ] verifylist = [ @@ -1382,16 +1330,15 @@ class TestUserSet(TestUser): } # UserManager.update(user, name=, domain=, project=, password=, # email=, description=, enabled=, default_project=) - self.users_mock.update.assert_called_with( - self.user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.user.id, **kwargs) self.assertIsNone(result) def test_user_set_project_domain(self): arglist = [ - '--project', self.project.id, - '--project-domain', self.project.domain_id, + '--project', + self.project.id, + '--project-domain', + self.project.domain_id, self.user.name, ] verifylist = [ @@ -1415,10 +1362,7 @@ class TestUserSet(TestUser): } # UserManager.update(user, name=, domain=, project=, password=, # email=, description=, enabled=, default_project=) - self.users_mock.update.assert_called_with( - self.user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.user.id, **kwargs) self.assertIsNone(result) def test_user_set_enable(self): @@ -1445,10 +1389,7 @@ class TestUserSet(TestUser): } # UserManager.update(user, name=, domain=, project=, password=, # email=, description=, enabled=, default_project=) - self.users_mock.update.assert_called_with( - self.user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.user.id, **kwargs) self.assertIsNone(result) def test_user_set_disable(self): @@ -1475,10 +1416,7 @@ class TestUserSet(TestUser): } # UserManager.update(user, name=, domain=, project=, password=, # email=, description=, enabled=, default_project=) - self.users_mock.update.assert_called_with( - self.user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.user.id, **kwargs) self.assertIsNone(result) def test_user_set_ignore_lockout_failure_attempts(self): @@ -1506,10 +1444,7 @@ class TestUserSet(TestUser): } # UserManager.update(user, name=, domain=, project=, password=, # email=, description=, enabled=, default_project=) - self.users_mock.update.assert_called_with( - self.user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.user.id, **kwargs) self.assertIsNone(result) def test_user_set_no_ignore_lockout_failure_attempts(self): @@ -1537,10 +1472,7 @@ class TestUserSet(TestUser): } # UserManager.update(user, name=, domain=, project=, password=, # email=, description=, enabled=, default_project=) - self.users_mock.update.assert_called_with( - self.user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.user.id, **kwargs) self.assertIsNone(result) def test_user_set_ignore_password_expiry(self): @@ -1568,10 +1500,7 @@ class TestUserSet(TestUser): } # UserManager.update(user, name=, domain=, project=, password=, # email=, description=, enabled=, default_project=) - self.users_mock.update.assert_called_with( - self.user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.user.id, **kwargs) self.assertIsNone(result) def test_user_set_no_ignore_password_expiry(self): @@ -1599,10 +1528,7 @@ class TestUserSet(TestUser): } # UserManager.update(user, name=, domain=, project=, password=, # email=, description=, enabled=, default_project=) - self.users_mock.update.assert_called_with( - self.user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.user.id, **kwargs) self.assertIsNone(result) def test_user_set_ignore_change_password_upon_first_use(self): @@ -1630,10 +1556,7 @@ class TestUserSet(TestUser): } # UserManager.update(user, name=, domain=, project=, password=, # email=, description=, enabled=, default_project=) - self.users_mock.update.assert_called_with( - self.user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.user.id, **kwargs) self.assertIsNone(result) def test_user_set_no_ignore_change_password_upon_first_use(self): @@ -1661,10 +1584,7 @@ class TestUserSet(TestUser): } # UserManager.update(user, name=, domain=, project=, password=, # email=, description=, enabled=, default_project=) - self.users_mock.update.assert_called_with( - self.user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.user.id, **kwargs) self.assertIsNone(result) def test_user_set_enable_lock_password(self): @@ -1692,10 +1612,7 @@ class TestUserSet(TestUser): } # UserManager.update(user, name=, domain=, project=, password=, # email=, description=, enabled=, default_project=) - self.users_mock.update.assert_called_with( - self.user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.user.id, **kwargs) self.assertIsNone(result) def test_user_set_disable_lock_password(self): @@ -1723,10 +1640,7 @@ class TestUserSet(TestUser): } # UserManager.update(user, name=, domain=, project=, password=, # email=, description=, enabled=, default_project=) - self.users_mock.update.assert_called_with( - self.user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.user.id, **kwargs) self.assertIsNone(result) def test_user_set_enable_multi_factor_auth(self): @@ -1754,10 +1668,7 @@ class TestUserSet(TestUser): } # UserManager.update(user, name=, domain=, project=, password=, # email=, description=, enabled=, default_project=) - self.users_mock.update.assert_called_with( - self.user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.user.id, **kwargs) self.assertIsNone(result) def test_user_set_disable_multi_factor_auth(self): @@ -1785,15 +1696,13 @@ class TestUserSet(TestUser): } # UserManager.update(user, name=, domain=, project=, password=, # email=, description=, enabled=, default_project=) - self.users_mock.update.assert_called_with( - self.user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.user.id, **kwargs) self.assertIsNone(result) def test_user_set_option_multi_factor_auth_rule(self): arglist = [ - '--multi-factor-auth-rule', identity_fakes.mfa_opt1, + '--multi-factor-auth-rule', + identity_fakes.mfa_opt1, self.user.name, ] verifylist = [ @@ -1812,21 +1721,20 @@ class TestUserSet(TestUser): # Set expected values kwargs = { 'enabled': True, - 'options': {'multi_factor_auth_rules': [["password", "totp"]]}} + 'options': {'multi_factor_auth_rules': [["password", "totp"]]}, + } # UserManager.update(user, name=, domain=, project=, password=, # email=, description=, enabled=, default_project=) - self.users_mock.update.assert_called_with( - self.user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.user.id, **kwargs) self.assertIsNone(result) def test_user_set_with_multiple_options(self): arglist = [ '--ignore-password-expiry', '--enable-multi-factor-auth', - '--multi-factor-auth-rule', identity_fakes.mfa_opt1, + '--multi-factor-auth-rule', + identity_fakes.mfa_opt1, self.user.name, ] verifylist = [ @@ -1847,21 +1755,20 @@ class TestUserSet(TestUser): # Set expected values kwargs = { 'enabled': True, - 'options': {'ignore_password_expiry': True, - 'multi_factor_auth_enabled': True, - 'multi_factor_auth_rules': [["password", "totp"]]}} + 'options': { + 'ignore_password_expiry': True, + 'multi_factor_auth_enabled': True, + 'multi_factor_auth_rules': [["password", "totp"]], + }, + } # UserManager.update(user, name=, domain=, project=, password=, # email=, description=, enabled=, default_project=) - self.users_mock.update.assert_called_with( - self.user.id, - **kwargs - ) + self.users_mock.update.assert_called_with(self.user.id, **kwargs) self.assertIsNone(result) class TestUserSetPassword(TestUser): - def setUp(self): super(TestUserSetPassword, self).setUp() self.cmd = user.SetPasswordUser(self.app, None) @@ -1877,7 +1784,8 @@ class TestUserSetPassword(TestUser): current_pass = 'old_pass' new_pass = 'new_pass' arglist = [ - '--password', new_pass, + '--password', + new_pass, ] verifylist = [ ('password', new_pass), @@ -1911,8 +1819,10 @@ class TestUserSetPassword(TestUser): current_pass = 'old_pass' new_pass = 'new_pass' arglist = [ - '--password', new_pass, - '--original-password', current_pass, + '--password', + new_pass, + '--original-password', + current_pass, ] verifylist = [ ('password', new_pass), @@ -1929,7 +1839,6 @@ class TestUserSetPassword(TestUser): class TestUserShow(TestUser): - user = identity_fakes.FakeUser.create_one_user() def setUp(self): @@ -1939,17 +1848,18 @@ class TestUserShow(TestUser): # Get the command object to test self.cmd = user.ShowUser(self.app, None) - self.app.client_manager.identity.auth.client.get_user_id.\ - return_value = self.user.id - self.app.client_manager.identity.tokens.get_token_data.return_value = \ - {'token': - {'user': - {'domain': {'id': self.user.domain_id}, - 'id': self.user.id, - 'name': self.user.name, - } - } - } + self.app.client_manager.identity.auth.client.get_user_id.return_value = ( # noqa: E501 + self.user.id + ) + self.app.client_manager.identity.tokens.get_token_data.return_value = { + 'token': { + 'user': { + 'domain': {'id': self.user.domain_id}, + 'id': self.user.id, + 'name': self.user.name, + } + } + } def test_user_show(self): arglist = [ @@ -1967,8 +1877,14 @@ class TestUserShow(TestUser): self.users_mock.get.assert_called_with(self.user.id) - collist = ('default_project_id', 'domain_id', 'email', - 'enabled', 'id', 'name') + collist = ( + 'default_project_id', + 'domain_id', + 'email', + 'enabled', + 'id', + 'name', + ) self.assertEqual(collist, columns) datalist = ( self.user.default_project_id, @@ -1982,11 +1898,13 @@ class TestUserShow(TestUser): def test_user_show_with_domain(self): user = identity_fakes.FakeUser.create_one_user( - {"name": self.user.name}) + {"name": self.user.name} + ) identity_client = self.app.client_manager.identity arglist = [ - "--domain", self.user.domain_id, + "--domain", + self.user.domain_id, user.name, ] verifylist = [ @@ -1995,13 +1913,14 @@ class TestUserShow(TestUser): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - user_str = common._get_token_resource(identity_client, 'user', - parsed_args.user, - parsed_args.domain) + user_str = common._get_token_resource( + identity_client, 'user', parsed_args.user, parsed_args.domain + ) self.assertEqual(self.user.id, user_str) arglist = [ - "--domain", user.domain_id, + "--domain", + user.domain_id, user.name, ] verifylist = [ @@ -2010,7 +1929,7 @@ class TestUserShow(TestUser): ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) - user_str = common._get_token_resource(identity_client, 'user', - parsed_args.user, - parsed_args.domain) + user_str = common._get_token_resource( + identity_client, 'user', parsed_args.user, parsed_args.domain + ) self.assertEqual(user.name, user_str) |