Pass in domain and project as positional args, not kwargs

The signature for users.set in keystoneclient dictates that
domain and project be sent in, not domainId and projectId,
which are being incorrectly sent in as 'extra' data.

Closes-Bug: #1376833

Change-Id: I44df3e492f61eab2241f3758dee622417bb6f399
This commit is contained in:
Steve Martinelli 2014-10-02 13:12:41 -04:00
parent 31018bf7c2
commit d972b8364c
2 changed files with 4 additions and 4 deletions

View File

@ -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

View File

@ -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=)