openstack/api-site
Code Issues Proposed changes

Merge "Updates to quota sets extension"

Browse Source
This commit is contained in:
Jenkins 2015-04-24 03:54:09 +00:00 committed by Gerrit Code Review
commit d83ef58ffd
7 changed files with 46 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json
View File

@ -4,13 +4,16 @@
"fixed_ips": -1,
"floating_ips": 10,
"id": "fake_tenant",
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
"injected_files": 5,
"instances": 10,
"key_pairs": 100,
"metadata_items": 128,
"ram": 51200,
"security_group_rules": 20,
"security_groups": 10,
"server_group_members": 10,
"server_groups": 10
"server_groups": 10,
"server_group_members": 10
}
}

7
api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/quotas-show-get-resp.json
View File

@ -4,13 +4,16 @@
"fixed_ips": -1,
"floating_ips": 10,
"id": "fake_tenant",
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
"injected_files": 5,
"instances": 10,
"key_pairs": 100,
"metadata_items": 128,
"ram": 51200,
"security_group_rules": 20,
"security_groups": 10,
"server_group_members": 10,
"server_groups": 10
"server_groups": 10,
"server_group_members": 10
}
}

8
api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/quotas-update-force-post-resp.json
View File

@ -3,14 +3,16 @@
"cores": 20,
"fixed_ips": -1,
"floating_ips": 10,
"id": "fake_tenant",
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
"injected_files": 5,
"instances": 45,
"key_pairs": 100,
"metadata_items": 128,
"ram": 51200,
"security_group_rules": 20,
"security_groups": 10,
"server_group_members": 10,
"server_groups": 10
"server_groups": 10,
"server_group_members": 10
}
}

8
api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/quotas-update-post-resp.json
View File

@ -3,14 +3,16 @@
"cores": 20,
"fixed_ips": -1,
"floating_ips": 10,
"id": "fake_tenant",
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
"injected_files": 5,
"instances": 10,
"key_pairs": 100,
"metadata_items": 128,
"ram": 51200,
"security_group_rules": 20,
"security_groups": 45,
"server_group_members": 10,
"server_groups": 10
"server_groups": 10,
"server_group_members": 10
}
}

7
api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/user-quotas-show-get-resp.json
View File

@ -4,13 +4,16 @@
"fixed_ips": -1,
"floating_ips": 10,
"id": "fake_tenant",
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
"injected_files": 5,
"instances": 10,
"key_pairs": 100,
"metadata_items": 128,
"ram": 51200,
"security_group_rules": 20,
"security_groups": 10,
"server_group_members": 10,
"server_groups": 10
"server_groups": 10,
"server_group_members": 10
}
}

8
api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/user-quotas-update-post-resp.json
View File

@ -3,14 +3,16 @@
"cores": 20,
"fixed_ips": -1,
"floating_ips": 10,
"id": "fake_tenant",
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
"injected_files": 5,
"instances": 9,
"key_pairs": 100,
"metadata_items": 128,
"ram": 51200,
"security_group_rules": 20,
"security_groups": 10,
"server_group_members": 10,
"server_groups": 10
"server_groups": 10,
"server_group_members": 10
}
}

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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- (C) 2014 OpenStack Foundation, All Rights Reserved -->
<!-- (C) 2014-2015 OpenStack Foundation, All Rights Reserved -->
<!DOCTYPE application [<!ENTITY % common SYSTEM "../common.ent">
%common;]>
<application xmlns="http://wadl.dev.java.net/2009/02"
@ -12,12 +12,12 @@
<resource id="os-quota-sets" path="os-quota-sets">
<resource id="tenant_id " path="{tenant_id}">
<method href="#deletequota"/>
<method href="#showquotas"/>
<method href="#forceupdatequota"/>
<method href="#updatesquotatenant"/>
<resource id="defaults" path="defaults">
<method href="#showdefaultquotas"/>
</resource>
<resource id="quotas_detail" path="detail" type="#DetailQuotasList"/>
<resource id="user_id">
<param
xmlns="http://wadl.dev.java.net/2009/02"
@ -25,10 +25,11 @@
required="false" type="xsd:string">
<wadl:doc
xmlns="http://docbook.org/ns/docbook"
xml:lang="EN"><para>Specify the user
in the
<code>?user_id={user_id}</code>
query parameter.</para>
xml:lang="EN">
<para>
Specify the user in the
<code>?user_id={user_id}</code> query parameter.
</para>
</wadl:doc>
</param>
<method href="#updatesquotauser"/>
@ -38,6 +39,12 @@
</resource>
</resource>
</resources>
<resource_type id="DetailQuotasList">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Detail quotas list">
<para>A detailed quotas list.</para>
</wadl:doc>
<method href="#listDetailQuotas"/>
</resource_type>
<!-- *******************************************************-->
<!-- OS Quota sets -->
<!--*******************************************************-->
@ -65,10 +72,10 @@
</representation>
</response>
</method>
<method name="GET" id="showquotas">
<wadl:doc xml:lang="EN" title="Show quotas"
<method name="GET" id="listDetailQuotas">
<wadl:doc xml:lang="EN" title="Show quotas (detailed)"
xmlns="http://docbook.org/ns/docbook">
<para role="shortdesc">Shows quotas for tenant.</para>
<para role="shortdesc">Lists quotas with details for a tenant.</para>
</wadl:doc>
<response status="200">
<representation mediaType="application/json">
@ -142,22 +149,6 @@
</wadl:doc>
<response status="204"/>
</method>
<method name="GET" id="showquota">
<wadl:doc xml:lang="EN" title="Show quota for user"
xmlns="http://docbook.org/ns/docbook">
<para role="shortdesc">Shows quota for user.</para>
</wadl:doc>
<response status="200">
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN">
<xsdxt:code
href="../api_samples/os-quota-sets/user-quotas-show-get-resp.json"
/>
</wadl:doc> &x-openstack-request-idHeader;
</representation>
</response>
</method>
<method name="PUT" id="updatesquotauser">
<wadl:doc xml:lang="EN" title="Update quota for user"
xmlns="http://docbook.org/ns/docbook">