From d972b8364c891b8275434c231bcb76e56172f573 Mon Sep 17 00:00:00 2001 From: Steve Martinelli Date: Thu, 2 Oct 2014 13:12:41 -0400 Subject: [PATCH] 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 --- openstackclient/identity/v3/user.py | 4 ++-- openstackclient/tests/identity/v3/test_user.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py index 6ba54368a8..e4eb7526c2 100644 --- a/openstackclient/identity/v3/user.py +++ b/openstackclient/identity/v3/user.py @@ -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 diff --git a/openstackclient/tests/identity/v3/test_user.py b/openstackclient/tests/identity/v3/test_user.py index 42df57736e..bb59ebe568 100644 --- a/openstackclient/tests/identity/v3/test_user.py +++ b/openstackclient/tests/identity/v3/test_user.py @@ -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=)