Merge "Correct tenant update HTTP method."

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):
         """

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']))