summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-02-01 22:34:53 +0000
committerGerrit Code Review <review@openstack.org>2012-02-01 22:34:53 +0000
commitf13b06c028c664208ea6a296f1693529d3d7b065 (patch)
tree58a1ddf05c3ec1e6253952ea527ba77970e8cef4
parent14b09e824bca0c64ac8494e6a35c5dcbda13f70b (diff)
parent3016b2504af82b4892585a8fbae8211a2cc76fee (diff)
downloadpython-keystoneclient-f13b06c028c664208ea6a296f1693529d3d7b065.tar.gz
Merge "Correct tenant update HTTP method."
-rw-r--r--keystoneclient/v2_0/tenants.py4
-rw-r--r--tests/v2_0/test_tenants.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/keystoneclient/v2_0/tenants.py b/keystoneclient/v2_0/tenants.py
index 5723fb9..bcef77f 100644
--- a/keystoneclient/v2_0/tenants.py
+++ b/keystoneclient/v2_0/tenants.py
@@ -90,8 +90,8 @@ class TenantManager(base.ManagerWithFind):
body['tenant']['enabled'] = enabled
if description:
body['tenant']['description'] = description
-
- return self._update("/tenants/%s" % tenant_id, body, "tenant")
+ # Keystone's API uses a POST rather than a PUT here.
+ return self._create("/tenants/%s" % tenant_id, body, "tenant")
def delete(self, tenant):
"""
diff --git a/tests/v2_0/test_tenants.py b/tests/v2_0/test_tenants.py
index fb7a70b..a8e7add 100644
--- a/tests/v2_0/test_tenants.py
+++ b/tests/v2_0/test_tenants.py
@@ -180,7 +180,7 @@ class TenantTests(utils.TestCase):
httplib2.Http.request(urlparse.urljoin(self.TEST_URL,
'v2.0/tenants/4'),
- 'PUT',
+ 'POST',
body=json.dumps(req_body),
headers=self.TEST_POST_HEADERS) \
.AndReturn((resp, resp['body']))