diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-09 03:23:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-09 03:23:03 +0000 |
| commit | d87868720ee4c6de60f7a2870f2667112cfb7232 (patch) | |
| tree | a156f0260c87a45ecd0ad91d0d81ae73ef920ff4 /openstackclient | |
| parent | d405b1b12d216e77b0e8341a8a81668cbb6a2429 (diff) | |
| parent | d972b8364c891b8275434c231bcb76e56172f573 (diff) | |
| download | python-openstackclient-d87868720ee4c6de60f7a2870f2667112cfb7232.tar.gz | |
Merge "Pass in domain and project as positional args, not kwargs"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/identity/v3/user.py | 4 | ||||
| -rw-r--r-- | 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 6ba54368..e4eb7526 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 42df5773..bb59ebe5 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=) |