openstack/api-site
Code Issues Proposed changes

Merge "Fix extensions for Identity v2.0"

Browse Source
This commit is contained in:
Jenkins 2016-01-26 01:08:35 +00:00 committed by Gerrit Code Review
commit 352c4c671d
22 changed files with 58 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api-ref/src/wadls/common_project.ent
View File

@ -31,6 +31,21 @@
<!ENTITY limitMarkerReqParameter '
&limitReqParameter;
&markerReqParameter;'>
<!ENTITY x-openstack-request-idHeader '
<param xmlns="http://wadl.dev.java.net/2009/02"
name="x-openstack-request-id" style="header" required="false"
type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>
A unique ID for tracking the request. The request ID associated with the
request appears in the log lines for that request. By default, the
middleware configuration ensures that the request ID appears in the log
files.
</para>
</wadl:doc>
</param>'>
<!-- Timestamp entities -->
<!-- ISO 8601 request parameters -->
<!ENTITY before_timestamp-QueryParameter '

29
api-ref/src/wadls/compute-api/src/v2.1/common.ent
View File

@ -69,19 +69,6 @@
<representation mediaType="application/xml" element="csapi:buildInProgress"/>
<representation mediaType="application/json"/>
</response>'>
<!-- For v2.1 x-openstack-request-id -->
<!ENTITY x-openstack-request-idHeader '
<param xmlns="http://wadl.dev.java.net/2009/02"
name="X-OpenStack-Request-ID" style="header" required="false"
type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
<para>
A unique request ID that provides tracking for the request. Provider
must configure middleware to provide the request ID.
</para>
</wadl:doc>
</param>'>
<!-- TEMPLATE PARAMETERS -->
<!ENTITY admin_tenant_idTemplateParameter '
<param name="admin_tenant_id" style="template" type="csapi:UUID"
@ -2964,22 +2951,6 @@
</para>
</wadl:doc>
</param>'>
<!-- For v2.1 x-compute-request-id -->
<!ENTITY x-compute-request-idHeader '
<param xmlns="http://wadl.dev.java.net/2009/02"
name="X-Compute-Request-ID" style="header" required="false"
type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>
A unique ID for tracking the request. The request ID associated with the
request appears in the log lines for that request. By default, the
middleware configuration ensures that the request ID appears in the log
files.
</para>
</wadl:doc>
</param>'>
<!ENTITY securityGroupRequestParameters '
<param xmlns:csapi="http://docs.openstack.org/compute/api/v2"
xmlns="http://wadl.dev.java.net/2009/02"

4
api-ref/src/wadls/compute-api/src/v2.1/wadl/extensions-v2.1.wadl
View File

@ -93,7 +93,7 @@
<xsdxt:code
href="../samples/extensions/extensions-list-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
<response status="203"/>
@ -111,7 +111,7 @@
xml:lang="EN">
<xsdxt:code href="../samples/extensions/extension-show-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
<response status="203"/>

6
api-ref/src/wadls/compute-api/src/v2.1/wadl/flavors-v2.1.wadl
View File

@ -47,7 +47,7 @@
<wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook">
<xsdxt:code
href="../samples/flavors/flavor-show-response.json"/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>
@ -65,7 +65,7 @@
<xsdxt:code
href="../samples/flavors/flavors-list-detail-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>
@ -83,7 +83,7 @@
<xsdxt:code
href="../samples/flavors/flavors-list-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>

10
api-ref/src/wadls/compute-api/src/v2.1/wadl/images-v2.1.wadl
View File

@ -104,7 +104,7 @@
</wadl:doc>
</representation>
<representation mediaType="application/xml">
&x-compute-request-idHeader;
&x-openstack-request-idHeader;
<param name="next" style="plain" type="xsd:anyURI"
path="/csapi:images/atom:link[@rel='next']/@href">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
@ -148,7 +148,7 @@
</wadl:doc>
</representation>
<representation mediaType="application/xml">
&x-compute-request-idHeader;
&x-openstack-request-idHeader;
<param name="images" style="plain" required="true"
type="csapi:ImagesWithOnlyIDsNamesLinks" path="/csapi:images">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
@ -191,7 +191,7 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
<xsdxt:code href="../samples/images/image-show-response.json"/>
</wadl:doc>
&x-compute-request-idHeader;
&x-openstack-request-idHeader;
</representation>
</response>
<response status="203">
@ -221,7 +221,7 @@
</wadl:doc>
</representation>
<representation mediaType="application/xml">
&x-compute-request-idHeader;
&x-openstack-request-idHeader;
<param name="next" style="plain" type="xsd:anyURI"
path="/csapi:metadata/atom:link[@rel='next']/@href">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
@ -354,7 +354,7 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
<xsdxt:code href="../samples/images/image-metadata-item-show-response.json"/>
</wadl:doc>
&x-compute-request-idHeader;
&x-openstack-request-idHeader;
</representation>
</response>
<response status="203">

2
api-ref/src/wadls/compute-api/src/v2.1/wadl/limits-v2.1.wadl
View File

@ -38,7 +38,7 @@
href="../samples/limits/limits-get-response.json"
/>
</wadl:doc>
&x-openstack-request-idHeader;
&x-openstack-request-idResponseHeader;
</representation>
</response>
</method>

4
api-ref/src/wadls/compute-api/src/v2.1/wadl/metadata-v2.1.wadl
View File

@ -53,7 +53,7 @@
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
<xsdxt:code href="../samples/metadata/server-metadata-list-response.json"/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>
@ -140,7 +140,7 @@
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
<xsdxt:code href="../samples/metadata/server-metadata-show-response.json"/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>

2
api-ref/src/wadls/compute-api/src/v2.1/wadl/os-agents-v2.1.wadl
View File

@ -68,7 +68,7 @@
<xsdxt:code
href="../samples/os-agents/agents-list-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>

6
api-ref/src/wadls/compute-api/src/v2.1/wadl/os-cells-v2.1.wadl
View File

@ -72,7 +72,7 @@
<xsdxt:code
href="../samples/os-cells/cell-show-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response> &fault501; </method>
<method name="GET" id="listCellssDetail">
@ -91,7 +91,7 @@
<xsdxt:code
href="../samples/os-cells/cells-list-empty-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response> &fault501; </method>
<method name="GET" id="listCells">
@ -110,7 +110,7 @@
<xsdxt:code
href="../samples/os-cells/cells-list-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response> &fault501; </method>
</application>

2
api-ref/src/wadls/compute-api/src/v2.1/wadl/os-certificates-v2.1.wadl
View File

@ -54,7 +54,7 @@
<xsdxt:code
href="../samples/os-certificates/certificate-show-root-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>

2
api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavor-access-v2.1.wadl
View File

@ -75,7 +75,7 @@
<xsdxt:code
href="../samples/os-flavor-access/flavor-access-list-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>

4
api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavor-extra-specs-v2.1.wadl
View File

@ -77,7 +77,7 @@
href="../samples/os-flavor-extra-specs/flavor-extra-spec-show-response.json"
/>
</wadl:doc>
&x-openstack-request-idHeader;
&x-openstack-request-idResponseHeader;
</representation>
</response>
</method>
@ -104,7 +104,7 @@
href="../samples/os-flavor-extra-specs/flavor-extra-specs-list-response.json"
/>
</wadl:doc>
&x-openstack-request-idHeader;
&x-openstack-request-idResponseHeader;
</representation>
</response>
</method>

10
api-ref/src/wadls/compute-api/src/v2.1/wadl/os-hosts-v2.1.wadl
View File

@ -50,7 +50,7 @@
<xsdxt:code
href="../samples/os-hosts/host-reboot-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>
@ -66,7 +66,7 @@
<xsdxt:code
href="../samples/os-hosts/host-show-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>
@ -81,7 +81,7 @@
<xsdxt:code
href="../samples/os-hosts/host-shutdown-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>
@ -96,7 +96,7 @@
<xsdxt:code
href="../samples/os-hosts/host-start-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>
@ -137,7 +137,7 @@
<xsdxt:code
href="../samples/os-hosts/hosts-list-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>

8
api-ref/src/wadls/compute-api/src/v2.1/wadl/os-hypervisors-v2.1.wadl
View File

@ -46,7 +46,7 @@
<xsdxt:code
href="../samples/os-hypervisors/hypervisors-list-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>
@ -63,7 +63,7 @@
<xsdxt:code
href="../samples/os-hypervisors/hypervisor-show-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>
@ -82,7 +82,7 @@
<xsdxt:code
href="../samples/os-hypervisors/hypervisor-statistics-show-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>
@ -99,7 +99,7 @@
<xsdxt:code
href="../samples/os-hypervisors/hypervisor-uptime-show-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>

4
api-ref/src/wadls/compute-api/src/v2.1/wadl/os-instance-actions-v2.1.wadl
View File

@ -49,7 +49,7 @@
href="../samples/os-instance-actions/instance-action-show-response.json"
/>
</wadl:doc>
&x-openstack-request-idHeader;
&x-openstack-request-idResponseHeader;
</representation>
</response>
</method>
@ -67,7 +67,7 @@
href="../samples/os-instance-actions/instance-actions-list-response.json"
/>
</wadl:doc>
&x-openstack-request-idHeader;
&x-openstack-request-idResponseHeader;
</representation>
</response>
</method>

4
api-ref/src/wadls/compute-api/src/v2.1/wadl/os-instance-usage-audit-log-v2.1.wadl
View File

@ -43,7 +43,7 @@
<xsdxt:code
href="../samples/os-instance-usage-audit-log/usage-audits-list-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>
@ -65,7 +65,7 @@
<xsdxt:code
href="../samples/os-instance-usage-audit-log/usage-audits-log-list-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>

2
api-ref/src/wadls/compute-api/src/v2.1/wadl/os-migrations-v2.1.wadl
View File

@ -43,7 +43,7 @@
<xsdxt:code
href="../samples/os-migrations/migrations-list-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>

2
api-ref/src/wadls/compute-api/src/v2.1/wadl/os-quota-class-sets-v2.1.wadl
View File

@ -42,7 +42,7 @@
<xsdxt:code
href="../samples/os-quota-class-sets/quota-class-show-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>

4
api-ref/src/wadls/compute-api/src/v2.1/wadl/os-simple-tenant-usage-v2.1.wadl
View File

@ -41,7 +41,7 @@
<xsdxt:code
href="../samples/os-simple-tenant-usage/simple-tenant-usage-show-general-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>
@ -58,7 +58,7 @@
<xsdxt:code
href="../samples/os-simple-tenant-usage/simple-tenant-usage-show-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>

4
api-ref/src/wadls/compute-api/src/v2.1/wadl/servers-v2.1.wadl
View File

@ -306,7 +306,7 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
<xsdxt:code href="../samples/servers/servers-list-response.json"/>
</wadl:doc>
&x-compute-request-idHeader;
&x-openstack-request-idHeader;
</representation>
</response>
<!-- Common Faults and Header --> &commonFaults;
@ -413,7 +413,7 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
<xsdxt:code href="../samples/servers/server-show-response.json"/>
</wadl:doc>
&x-compute-request-idHeader;
&x-openstack-request-idHeader;
&serverObjectParameter;
&serverResponseParameters;
</representation>

2
api-ref/src/wadls/compute-api/src/v2.1/wadl/versions-v2.1.wadl
View File

@ -33,7 +33,7 @@
<xsdxt:code
href="../samples/versions/versions-list-response.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</wadl:doc> &x-openstack-request-idResponseHeader;
</representation>
</response>
</method>

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

@ -139,7 +139,8 @@
xml:lang="EN">
<xsdxt:code href="../samples/admin/extension-show-response.json"
/>
</wadl:doc> &x-openstack-request-idResponseHeader;
</wadl:doc>
&x-openstack-request-idResponseHeader;
</representation>
</response>
<response status="203"/>