summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2011-08-23 18:36:18 +0000
committerGerrit Code Review <review@openstack.org>2011-08-23 18:36:18 +0000
commit4f16376c2db0e55d94a606f6443a3f89ecfccaf9 (patch)
treece1c43106c4074327f1e7f99f48cb7d893f34872
parent78232aacd984290408c4ec8aadf38d016c6b8e05 (diff)
parent2a7181cc2405dc8ee9bb7ef0ed0ea6d846c76735 (diff)
Merge "Fixed error where endpoints returned for tenant instead of token"
-rw-r--r--keystone/content/admin/identity-admin.wadl13
1 files changed, 6 insertions, 7 deletions
diff --git a/keystone/content/admin/identity-admin.wadl b/keystone/content/admin/identity-admin.wadl
index d57dbcd3..492916c9 100644
--- a/keystone/content/admin/identity-admin.wadl
+++ b/keystone/content/admin/identity-admin.wadl
@@ -51,6 +51,9 @@
<param name="belongsTo" style="query" type="xsd:string" required="false"/>
<method href="#validateToken"/>
<method href="#checkToken"/>
+ <resource id="endpointsForToken" path="endpoints">
+ <method href="#listEndpointsForToken"/>
+ </resource>
</resource>
</resource>
@@ -76,10 +79,6 @@
<param name="tenantId" style="template" type="xsd:string"/>
<method href="#getTenant"/>
- <resource id="endpointsForTenant" path="endpoints">
- <method href="#listEndpointsForTenant"/>
- </resource>
-
<resource id="usersForTenant" path="users">
<resource id="getTenantUser" path="{user_id}">
<param name="user_id" style="template" type="xsd:string"/>
@@ -314,10 +313,10 @@
&commonFaults;
&getFaults;
</method>
- <method name="GET" id="getEndpointsForTenant">
- <doc xml:lang="EN" title="/tenants/{tenant_id}/endpoints">
+ <method name="GET" id="listEndpointsForToken">
+ <doc xml:lang="EN" title="/tokens/{token_id}/endpoints">
<p xmlns="http://www.w3.org/1999/xhtml">
- Returns a list of endpoints associated with a specific tenant.
+ Returns a list of endpoints associated with a specific token.
</p>
</doc>
<response status="200 203">