openstack
/
python-keystoneclient
Code Issues Proposed changes

Merge "Do not send user ids as payload"

This commit is contained in:
Jenkins 2016-08-22 19:06:14 +00:00 committed by Gerrit Code Review
parent 1b5c8bad80 2b3258dcd0
commit 39373aa40b
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
keystoneclient/tests/unit/v2_0/test_users.py
View File

@ -191,7 +191,6 @@ class UserTests(utils.ClientTestCase):
def test_update(self):
req_1 = {
"user": {
"id": self.DEMO_USER_ID,
"email": "gabriel@example.com",
"name": "gabriel",
}
@ -199,20 +198,17 @@ class UserTests(utils.ClientTestCase):
password = uuid.uuid4().hex
req_2 = {
"user": {
"id": self.DEMO_USER_ID,
"password": password,
}
}
tenant_id = uuid.uuid4().hex
req_3 = {
"user": {
"id": self.DEMO_USER_ID,
"tenantId": tenant_id,
}
}
req_4 = {
"user": {
"id": self.DEMO_USER_ID,
"enabled": False,
}
}

10
keystoneclient/v2_0/users.py
View File

@ -53,22 +53,19 @@ class UserManager(base.ManagerWithFind):
# FIXME(gabriel): "tenantId" seems to be accepted by the API but
# fails to actually update the default tenant.
params = {"user": kwargs}
params['user']['id'] = base.getid(user)
url = "/users/%s" % base.getid(user)
return self._update(url, params, "user")
def update_enabled(self, user, enabled):
"""Update enabled-ness."""
params = {"user": {"id": base.getid(user),
"enabled": enabled}}
params = {"user": {"enabled": enabled}}
self._update("/users/%s/OS-KSADM/enabled" % base.getid(user), params,
"user")
def update_password(self, user, password):
"""Update password."""
params = {"user": {"id": base.getid(user),
"password": password}}
params = {"user": {"password": password}}
return self._update("/users/%s/OS-KSADM/password" % base.getid(user),
params, "user", log=False)
@ -87,8 +84,7 @@ class UserManager(base.ManagerWithFind):
def update_tenant(self, user, tenant):
"""Update default tenant."""
params = {"user": {"id": base.getid(user),
"tenantId": base.getid(tenant)}}
params = {"user": {"tenantId": base.getid(tenant)}}
# FIXME(ja): seems like a bad url - default tenant is an attribute
# not a subresource!???