openstack/api-site
Code Issues Proposed changes

Merge "Add trust object to token for identity v2 API"

Browse Source
This commit is contained in:
Jenkins 2015-10-08 17:37:38 +00:00 committed by Gerrit Code Review
commit 9cd20e87b0
5 changed files with 75 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api-ref/src/wadls/identity-api/src/v2.0/samples/auth.json
View File

@ -173,6 +173,12 @@
"7598ac3c634d4c3da4b9126a5f67ca2b",
"f95c0ab82d6045d9805033ee1fbc80d4"
]
},
"trust": {
"id": "394998fa61f14736b1f0c1f322882949",
"trustee_user_id": "269348fdd9374b8885da1418e0730af1",
"trustor_user_id": "3ec3164f750146be97f21559ee4d9c51",
"impersonation": false
}
}
}

5
api-ref/src/wadls/identity-api/src/v2.0/samples/auth.xml
View File

@ -117,4 +117,9 @@
<role>f95c0ab82d6045d9805033ee1fbc80d4</role>
</roles>
</metadata>
<trust id="394998fa61f14736b1f0c1f322882949"
trustee_user_id="269348fdd9374b8885da1418e0730af1"
trustor_user_id= "3ec3164f750146be97f21559ee4d9c51"
impersonation="false">
</trust>
</access>

6
api-ref/src/wadls/identity-api/src/v2.0/samples/auth_admin.json
View File

@ -173,6 +173,12 @@
"8341d3603a1d4d5985bff09f10704d4d",
"2e66d57df76946fdbe034bc4da6fdec0"
]
},
"trust": {
"id": "394998fa61f14736b1f0c1f322882949",
"trustee_user_id": "269348fdd9374b8885da1418e0730af1",
"trustor_user_id": "3ec3164f750146be97f21559ee4d9c51",
"impersonation": false
}
}
}

28
api-ref/src/wadls/identity-api/src/v2.0/wadl/identity-admin.wadl
View File

@ -371,6 +371,10 @@
<para>
The deployment determines how long expired tokens are stored.
</para>
<para>
To view the <code>trust</code> object, you need to set
<code>trust</code> enable on the keystone configuration.
</para>
</wadl:doc>
<request>
<representation mediaType="application/json" element="identity:auth">
@ -487,6 +491,30 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"><para>A <code>metadata</code>
object.</para></wadl:doc>
</param>
<param name="trust" style="plain" required="false" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook"><para>A <code>trust</code>
object.</para></wadl:doc>
</param>
<param name="trustee_user_id" style="plain" required="false" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook">
<para>The trustee user ID.</para>
</wadl:doc>
</param>
<param name="id" style="plain" required="false" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook">
<para>The ID of the trust.</para>
</wadl:doc>
</param>
<param name="trustor_user_id" style="plain" required="false" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook">
<para>The trustor user ID.</para>
</wadl:doc>
</param>
<param name="impersonation" style="plain" required="false" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook">
<para>The impersonation flag.</para>
</wadl:doc>
</param>
</representation>
</response>
<response status="403">

32
api-ref/src/wadls/identity-api/src/v2.0/wadl/identity.wadl
View File

@ -175,6 +175,10 @@
<para>
The deployment determines how long expired tokens are stored.
</para>
<para>
To view the <code>trust</code> object, you need to set
<code>trust</code> enable on the keystone configuration.
</para>
</wadl:doc>
<request>
<representation mediaType="application/json" element="identity:auth">
@ -241,8 +245,8 @@
</wadl:doc>
</representation>
</request>
<response status="200 203"> <representation mediaType="application/json"
element="identity:access">
<response status="200 203">
<representation mediaType="application/json" element="identity:access">
<wadl:doc xmlns="http://docbook.org/ns/docbook">
<xsdxt:sample
title="Authenticate with user name and password credentials: JSON response">
@ -324,6 +328,30 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"><para>A <code>metadata</code>
object.</para></wadl:doc>
</param>
<param name="trust" style="plain" required="false" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook"><para>A <code>trust</code>
object.</para></wadl:doc>
</param>
<param name="trustee_user_id" style="plain" required="false" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook">
<para>The trustee user ID.</para>
</wadl:doc>
</param>
<param name="id" style="plain" required="false" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook">
<para>The ID of the trust.</para>
</wadl:doc>
</param>
<param name="trustor_user_id" style="plain" required="false" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook">
<para>The trustor user ID.</para>
</wadl:doc>
</param>
<param name="impersonation" style="plain" required="false" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook">
<para>The impersonation flag.</para>
</wadl:doc>
</param>
</representation>
</response>
<response status="403">