Merge "Pass in domain and project as positional args, not kwargs"
This commit is contained in:
commit
d87868720e
@ -308,11 +308,11 @@ class SetUser(command.Command):
|
||||
if parsed_args.project:
|
||||
project_id = utils.find_resource(
|
||||
identity_client.projects, parsed_args.project).id
|
||||
kwargs['projectId'] = project_id
|
||||
kwargs['project'] = project_id
|
||||
if parsed_args.domain:
|
||||
domain_id = utils.find_resource(
|
||||
identity_client.domains, parsed_args.domain).id
|
||||
kwargs['domainId'] = domain_id
|
||||
kwargs['domain'] = domain_id
|
||||
kwargs['enabled'] = user.enabled
|
||||
if parsed_args.enable:
|
||||
kwargs['enabled'] = True
|
||||
|
@ -842,7 +842,7 @@ class TestUserSet(TestUser):
|
||||
# Set expected values
|
||||
kwargs = {
|
||||
'enabled': True,
|
||||
'domainId': identity_fakes.domain_id,
|
||||
'domain': identity_fakes.domain_id,
|
||||
}
|
||||
# UserManager.update(user, name=, domain=, project=, password=,
|
||||
# email=, description=, enabled=, default_project=)
|
||||
@ -874,7 +874,7 @@ class TestUserSet(TestUser):
|
||||
# Set expected values
|
||||
kwargs = {
|
||||
'enabled': True,
|
||||
'projectId': identity_fakes.project_id,
|
||||
'project': identity_fakes.project_id,
|
||||
}
|
||||
# UserManager.update(user, name=, domain=, project=, password=,
|
||||
# email=, description=, enabled=, default_project=)
|
||||
|
Loading…
Reference in New Issue
Block a user