diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-22 19:06:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-22 19:06:14 +0000 |
| commit | 39373aa40b085c3277fe393de0f638f12ac16d53 (patch) | |
| tree | c6873067c8e44af688ed3178c681503ba7d9eb8c | |
| parent | 1b5c8bad80319dd78104c148fd34b59a825a7a36 (diff) | |
| parent | 2b3258dcd0581e3a1291bd0e9277698b5631dced (diff) | |
| download | python-keystoneclient-39373aa40b085c3277fe393de0f638f12ac16d53.tar.gz | |
Merge "Do not send user ids as payload"3.5.0
| -rw-r--r-- | keystoneclient/tests/unit/v2_0/test_users.py | 4 | ||||
| -rw-r--r-- | keystoneclient/v2_0/users.py | 10 |
2 files changed, 3 insertions, 11 deletions
diff --git a/keystoneclient/tests/unit/v2_0/test_users.py b/keystoneclient/tests/unit/v2_0/test_users.py index da607f5..d650738 100644 --- a/keystoneclient/tests/unit/v2_0/test_users.py +++ b/keystoneclient/tests/unit/v2_0/test_users.py @@ -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, } } diff --git a/keystoneclient/v2_0/users.py b/keystoneclient/v2_0/users.py index b791166..f663626 100644 --- a/keystoneclient/v2_0/users.py +++ b/keystoneclient/v2_0/users.py @@ -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!??? |