openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Enabling/disabling users should use OS-KSADM extension (bug 922394)"

Browse Source
This commit is contained in:
Jenkins
2012-01-30 19:52:09 +00:00
committed by Gerrit Code Review
parent d29168fa3f deb3d99985
commit d497e65e67
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
keystoneclient/v2_0/users.py
View File

@@ -50,7 +50,8 @@ class UserManager(base.ManagerWithFind):
params = {"user": {"id": base.getid(user), params = {"user": {"id": base.getid(user),
"enabled": enabled}} "enabled": enabled}}
self._update("/users/%s/enabled" % base.getid(user), params, "user") self._update("/users/%s/OS-KSADM/enabled" % base.getid(user), params,
"user")
def update_password(self, user, password): def update_password(self, user, password):
""" """

2
tests/v2_0/test_users.py
View File

@@ -191,7 +191,7 @@ class UserTests(utils.TestCase):
headers=self.TEST_POST_HEADERS) \ headers=self.TEST_POST_HEADERS) \
.AndReturn((resp_3, resp_3['body'])) .AndReturn((resp_3, resp_3['body']))
httplib2.Http.request(urlparse.urljoin(self.TEST_URL, httplib2.Http.request(urlparse.urljoin(self.TEST_URL,
'v2.0/users/2/enabled'), 'v2.0/users/2/OS-KSADM/enabled'),
'PUT', 'PUT',
body=json.dumps(req_4), body=json.dumps(req_4),
headers=self.TEST_POST_HEADERS) \ headers=self.TEST_POST_HEADERS) \