openstack/python-openstackclient
Code Issues Proposed changes

Merge "Pass in domain and project as positional args, not kwargs"

Browse Source
This commit is contained in:
Jenkins 2014-10-09 03:23:03 +00:00 committed by Gerrit Code Review
commit d87868720e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstackclient/identity/v3/user.py
View File

@ -308,11 +308,11 @@ class SetUser(command.Command):
if parsed_args.project: if parsed_args.project:
project_id = utils.find_resource( project_id = utils.find_resource(
identity_client.projects, parsed_args.project).id identity_client.projects, parsed_args.project).id
kwargs['projectId'] = project_id kwargs['project'] = project_id
if parsed_args.domain: if parsed_args.domain:
domain_id = utils.find_resource( domain_id = utils.find_resource(
identity_client.domains, parsed_args.domain).id identity_client.domains, parsed_args.domain).id
kwargs['domainId'] = domain_id kwargs['domain'] = domain_id
kwargs['enabled'] = user.enabled kwargs['enabled'] = user.enabled
if parsed_args.enable: if parsed_args.enable:
kwargs['enabled'] = True kwargs['enabled'] = True

4
openstackclient/tests/identity/v3/test_user.py
View File

@ -842,7 +842,7 @@ class TestUserSet(TestUser):
# Set expected values # Set expected values
kwargs = { kwargs = {
'enabled': True, 'enabled': True,
'domainId': identity_fakes.domain_id, 'domain': identity_fakes.domain_id,
} }
# UserManager.update(user, name=, domain=, project=, password=, # UserManager.update(user, name=, domain=, project=, password=,
# email=, description=, enabled=, default_project=) # email=, description=, enabled=, default_project=)
@ -874,7 +874,7 @@ class TestUserSet(TestUser):
# Set expected values # Set expected values
kwargs = { kwargs = {
'enabled': True, 'enabled': True,
'projectId': identity_fakes.project_id, 'project': identity_fakes.project_id,
} }
# UserManager.update(user, name=, domain=, project=, password=, # UserManager.update(user, name=, domain=, project=, password=,
# email=, description=, enabled=, default_project=) # email=, description=, enabled=, default_project=)