diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-30 19:52:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-30 19:52:09 +0000 |
| commit | d497e65e67324fcb27228acfa0ca883607b0ee07 (patch) | |
| tree | 6402c0fd4e9a3152b2b849d07521a5287d914f50 | |
| parent | d29168fa3fe656ba4f2322226e4ae511c89dfed2 (diff) | |
| parent | deb3d999856e03d5fd213b81d7c6cf84c86433ca (diff) | |
| download | python-keystoneclient-d497e65e67324fcb27228acfa0ca883607b0ee07.tar.gz | |
Merge "Enabling/disabling users should use OS-KSADM extension (bug 922394)"
| -rw-r--r-- | keystoneclient/v2_0/users.py | 3 | ||||
| -rw-r--r-- | tests/v2_0/test_users.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/keystoneclient/v2_0/users.py b/keystoneclient/v2_0/users.py index ec97d94..9e6fc6c 100644 --- a/keystoneclient/v2_0/users.py +++ b/keystoneclient/v2_0/users.py @@ -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): """ diff --git a/tests/v2_0/test_users.py b/tests/v2_0/test_users.py index 7b9ab3b..34ae344 100644 --- a/tests/v2_0/test_users.py +++ b/tests/v2_0/test_users.py @@ -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) \ |