openstack/api-site
Code Issues Proposed changes

Merge "Insert "tenant_id" into os-simple-tenant-usage-v2.1 again"

Browse Source
This commit is contained in:
Jenkins 2016-02-12 21:41:50 +00:00 committed by Gerrit Code Review
commit 8f3d841dcb
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2010,6 +2010,16 @@
The server status.</para>
</wadl:doc>
</param>'>
<!ENTITY tenantIdRequestParameter '
<param name="tenant_id" style="template" type="csapi:UUID" required="true"
xmlns="http://wadl.dev.java.net/2009/02">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN"
xmlns:wadl="http://wadl.dev.java.net/2009/02">
<para>
The UUID of the tenant in a multi-tenancy cloud.
</para>
</wadl:doc>
</param>'>
<!ENTITY tenantIdResponseParameter '
<param name="tenant_id" style="plain" type="csapi:UUID"
required="true"

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

@ -14,12 +14,15 @@
<resources base="https://servers.api.openstack.com"
xml:id="os-simple-tenant-usage-v2.1">
<resource id="v2.1" path="//v2.1">
<resource id="os-simple-tenant-usage"
path="os-simple-tenant-usage">
<method href="#listUsageInformation"/>
<resource id="tenant_id" path="{tenant_id}">
&tenant_idTemplateParameter;
<method href="#listUsageSpecific"/>
<resource id="tenant_id" path="{tenant_id}">
&tenantIdRequestParameter;
<resource id="os-simple-tenant-usage"
path="os-simple-tenant-usage">
<method href="#listUsageInformation"/>
<resource id="tenant_id2" path="{tenant_id}">
&tenantIdRequestParameter;
<method href="#listUsageSpecific"/>
</resource>
</resource>
</resource>
</resource>