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

This commit is contained in:
Jenkins
2012-01-30 19:52:09 +00:00
committed by Gerrit Code Review
2 changed files with 3 additions and 2 deletions

View File

@@ -50,7 +50,8 @@ class UserManager(base.ManagerWithFind):
params = {"user": {"id": base.getid(user),
"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):
"""

View File

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