diff options
| author | Josh Kearney <josh@jk0.org> | 2013-01-31 13:31:41 -0600 |
|---|---|---|
| committer | Josh Kearney <josh@jk0.org> | 2013-01-31 13:31:41 -0600 |
| commit | b26cb5bf683e7f4f03d9704524a188b76ac5e9b9 (patch) | |
| tree | f059ddb3b7e15f50d722cf1fbd2b0eaf8242b1a4 /openstackclient/identity/v2_0/user.py | |
| parent | aa4f12aec1d13d02df2ecc2710d85ebd90d6dfe7 (diff) | |
| download | python-openstackclient-b26cb5bf683e7f4f03d9704524a188b76ac5e9b9.tar.gz | |
Upgraded to PEP8 1.3.3 to stay aligned with Nova, etc.
Made all the necessary changes to pass new PEP8 standards.
Also cleaned up docstrings to conform to the HACKING stanards.
Change-Id: Ib8df3030da7a7885655689ab5da0717748c9edbe
Diffstat (limited to 'openstackclient/identity/v2_0/user.py')
| -rw-r--r-- | openstackclient/identity/v2_0/user.py | 78 |
1 files changed, 27 insertions, 51 deletions
diff --git a/openstackclient/identity/v2_0/user.py b/openstackclient/identity/v2_0/user.py index cf69d73f..2017e5e3 100644 --- a/openstackclient/identity/v2_0/user.py +++ b/openstackclient/identity/v2_0/user.py @@ -13,9 +13,7 @@ # under the License. # -""" -User action implementations -""" +"""User action implementations""" import logging @@ -37,45 +35,39 @@ class CreateUser(show.ShowOne): parser.add_argument( 'name', metavar='<user-name>', - help='New user name', - ) + help='New user name') parser.add_argument( '--password', metavar='<user-password>', - help='New user password', - ) + help='New user password') parser.add_argument( '--email', metavar='<user-email>', - help='New user email address', - ) + help='New user email address') parser.add_argument( '--tenant', metavar='<tenant>', - help='New default tenant name or ID', - ) + help='New default tenant name or ID') enable_group = parser.add_mutually_exclusive_group() enable_group.add_argument( '--enable', dest='enabled', action='store_true', default=True, - help='Enable user', - ) + help='Enable user') enable_group.add_argument( '--disable', dest='enabled', action='store_false', - help='Disable user', - ) + help='Disable user') return parser def take_action(self, parsed_args): self.log.debug('take_action(%s)' % parsed_args) identity_client = self.app.client_manager.identity if parsed_args.tenant: - tenant_id = utils.find_resource( - identity_client.tenants, parsed_args.tenant).id + tenant_id = utils.find_resource(identity_client.tenants, + parsed_args.tenant).id else: tenant_id = None user = identity_client.users.create( @@ -83,8 +75,7 @@ class CreateUser(show.ShowOne): parsed_args.password, parsed_args.email, tenant_id=tenant_id, - enabled=parsed_args.enabled, - ) + enabled=parsed_args.enabled) info = {} info.update(user._info) @@ -102,15 +93,13 @@ class DeleteUser(command.Command): parser.add_argument( 'user', metavar='<user>', - help='Name or ID of user to delete', - ) + help='Name or ID of user to delete') return parser def take_action(self, parsed_args): self.log.debug('take_action(%s)' % parsed_args) identity_client = self.app.client_manager.identity - user = utils.find_resource( - identity_client.users, parsed_args.user) + user = utils.find_resource(identity_client.users, parsed_args.user) identity_client.users.delete(user.id) return @@ -126,14 +115,12 @@ class ListUser(lister.Lister): parser.add_argument( '--tenant', metavar='<tenant>', - help='Name or ID of tenant to filter users', - ) + help='Name or ID of tenant to filter users') parser.add_argument( '--long', action='store_true', default=False, - help='Additional fields are listed in output', - ) + help='Additional fields are listed in output') return parser def take_action(self, parsed_args): @@ -147,8 +134,7 @@ class ListUser(lister.Lister): (utils.get_item_properties( s, columns, formatters={}, - ) for s in data), - ) + ) for s in data)) class SetUser(command.Command): @@ -162,57 +148,49 @@ class SetUser(command.Command): parser.add_argument( 'user', metavar='<user>', - help='Name or ID of user to change', - ) + help='Name or ID of user to change') parser.add_argument( '--name', metavar='<new-user-name>', - help='New user name', - ) + help='New user name') parser.add_argument( '--password', metavar='<user-password>', - help='New user password', - ) + help='New user password') parser.add_argument( '--email', metavar='<user-email>', - help='New user email address', - ) + help='New user email address') parser.add_argument( '--tenant', metavar='<tenant>', - help='New default tenant name or ID', - ) + help='New default tenant name or ID') enable_group = parser.add_mutually_exclusive_group() enable_group.add_argument( '--enable', dest='enabled', action='store_true', default=True, - help='Enable user (default)', - ) + help='Enable user (default)') enable_group.add_argument( '--disable', dest='enabled', action='store_false', - help='Disable user', - ) + help='Disable user') return parser def take_action(self, parsed_args): self.log.debug('take_action(%s)' % parsed_args) identity_client = self.app.client_manager.identity - user = utils.find_resource( - identity_client.users, parsed_args.user) + user = utils.find_resource(identity_client.users, parsed_args.user) kwargs = {} if parsed_args.name: kwargs['name'] = parsed_args.name if parsed_args.email: kwargs['email'] = parsed_args.email if parsed_args.tenant: - tenant_id = utils.find_resource( - identity_client.tenants, parsed_args.tenant).id + tenant_id = utils.find_resource(identity_client.tenants, + parsed_args.tenant).id kwargs['tenantId'] = tenant_id if 'enabled' in parsed_args: kwargs['enabled'] = parsed_args.enabled @@ -235,15 +213,13 @@ class ShowUser(show.ShowOne): parser.add_argument( 'user', metavar='<user>', - help='Name or ID of user to display', - ) + help='Name or ID of user to display') return parser def take_action(self, parsed_args): self.log.debug('take_action(%s)' % parsed_args) identity_client = self.app.client_manager.identity - user = utils.find_resource( - identity_client.users, parsed_args.user) + user = utils.find_resource(identity_client.users, parsed_args.user) info = {} info.update(user._info) |
