Add minRam and minDisk as filter

minRam and minDisk filter is missing, add it.

(df) Cleaned up language for query (filter) parameters

Change-Id: I092bd9a592e74b6a80ca9e46469a8997b06e5080
Partial-Bug: #1515222
This commit is contained in:
jichenjc 2015-11-17 03:33:45 +08:00 committed by Diane Fleming
parent a5a4252d1a
commit 9d5ef6b75f
2 changed files with 98 additions and 52 deletions

View File

@ -91,7 +91,9 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>Filters the results by a server name in URL format.</para>
<para>
Filters the response by a server, as a URL.
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02"
@ -99,7 +101,9 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>Filters the results by a server name in string format.</para>
<para>
Filters the response by a server name, as a string.
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02"
@ -108,8 +112,8 @@
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>
Filters the results by an image status. For example,
<code>ACTIVE</code>.
Filters the response by an image status, as a string. For example,
<code>ACTIVE</code>.
</para>
</wadl:doc>
</param>
@ -120,8 +124,8 @@
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>
Filters the results by an image type. For example,
<code>BASE</code>, <code>SERVER</code>, or <code>ALL</code>.
Filters the response by an image type, as a string. For example,
<code>BASE</code>, <code>SERVER</code>, or <code>ALL</code>.
</para>
</wadl:doc>
<option value="BASE"/>
@ -1053,7 +1057,8 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>A time/date stamp for when the server last
<para>
Filters the response by a date and time stamp when the server last
changed status.
</para>
</wadl:doc>
@ -1064,7 +1069,9 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>The UUID for the image.</para>
<para>
Filters the response by an image, as a UUID.
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02"
@ -1073,7 +1080,8 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>The UUID for the specific flavor, which is a combination
<para>
Filters the response by a flavor, as a UUID. A flavor is a combination
of memory, disk size, and CPUs.
</para>
</wadl:doc>
@ -1085,9 +1093,12 @@
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>
Name of the server as a string. Can be queried with regular expressions.
The regular expression <code>?name=bob</code> returns both bob and bobb.
If you must match on only bob, you can use a regular expression that
Filters the response by a server name, as a string.
</para>
<para>
You can use regular expressions in the query. For example, the
<code>?name=bob</code> regular expression returns both bob and bobb. If
you must match on only bob, you can use a regular expression that
matches the syntax of the underlying database server that is implemented
for Compute, such as MySQL or PostgreSQL.
</para>
@ -1099,9 +1110,9 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>Value of the status of the server so that
you can filter on "ACTIVE" for
example.
<para>
Filters the response by a server status, as a string. For example,
<code>ACTIVE</code>.
</para>
</wadl:doc>
</param>
@ -1112,7 +1123,7 @@
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>
Name of the host as a string.
Filters the response by a host name, as a string.
</para>
</wadl:doc>
</param>'>
@ -1485,8 +1496,10 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN"
xmlns:wadl="http://wadl.dev.java.net/2009/02">
<para>Filters the results by a server status. For example,
<code>ACTIVE</code>.</para>
<para>
Filters the response by a server status. For example,
<code>ACTIVE</code>.
</para>
</wadl:doc>
</param>'>
<!-- flavorIdRequestParameter -->
@ -1509,7 +1522,7 @@
<para>The keypair name.</para>
</wadl:doc>
</param>'>
<!ENTITY keypairQueryRequestParameter '
<!ENTITY user_idQueryRequestParameter '
<param name="user_id" style="query" type="xsd:string"
required="false"
xmlns="http://wadl.dev.java.net/2009/02">
@ -1517,7 +1530,7 @@
xml:lang="EN"
xmlns:wadl="http://wadl.dev.java.net/2009/02">
<para>
The user ID of the user who runs the operation.
Filters the response by a user, by ID.
</para>
</wadl:doc>
</param>'>
@ -1698,7 +1711,9 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>Filters the results by an image name in URL format.</para>
<para>
Filters the response by an image name, as a URL.
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02"
@ -1706,7 +1721,9 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>Filters the results by a flavor name in URL format.</para>
<para>
Filters the response by a flavor name, as a URL.
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02"
@ -1714,7 +1731,9 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>Filters the results by a server name in string format.</para>
<para>
Filters the response by a server name, as a string.
</para>
</wadl:doc>
</param>
&limitMarkerReqParameter;
@ -1724,7 +1743,7 @@
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>
Filters the results by a server status. For example,
Filters the response by a server status, as a string. For example,
<code>ACTIVE</code>.
</para>
</wadl:doc>
@ -1734,7 +1753,9 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>Filters the results by a host name in string format.</para>
<para>
Filters the response by a host name, as a string.
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02" name="sort_key"
@ -1742,11 +1763,11 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
<para>
Sorts by the requested server attribute. Default is
<code>created</code>. You can specify multiple pairs of sort key and
sort direction query parameters. If you omit the sort direction in a
pair, the API uses the natural sorting direction of the server attribute
that is provided as the <code>sort_key</code>.
Sorts by a server attribute. Default is <code>created</code>. You can
specify multiple pairs of sort key and sort direction query parameters.
If you omit the sort direction in a pair, the API uses the natural
sorting direction of the server attribute that is provided as the
<code>sort_key</code>.
</para>
</wadl:doc>
</param>
@ -1771,11 +1792,11 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02" xml:lang="EN">
<para>
Sorts by the requested server attribute. Default is
<code>created</code>. You can specify multiple pairs of sort key and
sort direction query parameters. If you omit the sort direction in a
pair, the API uses the natural sorting direction of the server attribute
that is provided as the <code>sort_key</code>.
Sorts by a server attribute. Default is <code>created</code>. You can
specify multiple pairs of sort key and sort direction query parameters.
If you omit the sort direction in a pair, the API uses the natural
sorting direction of the server attribute that is provided as the
<code>sort_key</code>.
</para>
</wadl:doc>
</param>
@ -1945,7 +1966,9 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>Filters the results by a minimum disk space in GB.</para>
<para>
Filters the response by a minimum disk space, in GB.
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02"
@ -1953,7 +1976,9 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>Filters the results by a minimum RAM in MB.</para>
<para>
Filters the response by a minimum RAM, in MB.
</para>
</wadl:doc>
</param>
&limitMarkerReqParameter;'>
@ -2671,7 +2696,8 @@
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>
The date and time when the image last changed status.
Filters the response by a date and time when the image last changed
status.
</para>
<para>
Use this query parameter to check for changes since a previous request
@ -2705,8 +2731,8 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>Name of the server in URL
format.
<para>
Filters the response by a server, as a URL.
</para>
</wadl:doc>
</param>
@ -2716,7 +2742,8 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>Name of the image as a
<para>
Filters the response by an image name, as a
string.
</para>
</wadl:doc>
@ -2727,8 +2754,33 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>Value of the image statuses.
For example, you can filter on <code>ACTIVE</code>.
<para>
Filters the response by an image status, as a string.
For example, <code>ACTIVE</code>.
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02"
name="minDisk" style="query" required="false"
type="xsd:int">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>
Filters the response by a minimum disk size.
For example, <code>100</code>.
</para>
</wadl:doc>
</param>
<param xmlns="http://wadl.dev.java.net/2009/02"
name="minRam" style="query" required="false"
type="xsd:int">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>
Filters the response by a minimum RAM size.
For example, <code>512</code>.
</para>
</wadl:doc>
</param>
@ -2738,8 +2790,9 @@
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xml:lang="EN">
<para>Value of the type of image, such as snapshot
or backup.
<para>
Filters the response by an image type. For example,
<code>snapshot</code> or <code>backup</code>.
</para>
</wadl:doc>
<option value="snapshot"/>

View File

@ -21,7 +21,6 @@
<method href="#createKeypair"/>
<resource path="{keypair_name}" id="keypair_name">
&keypairNameRequestParameter;
&keypairQueryRequestParameter;
<method href="#deleteKeypair"/>
<method href="#showKeypair"/>
</resource>
@ -36,11 +35,6 @@
Lists keypairs that are associated with the account.
</para>
</wadl:doc>
<request>
<representation mediaType="application/json">
&keypairQueryRequestParameter;
</representation>
</request>
<response status="200">
<representation mediaType="application/json">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
@ -128,7 +122,6 @@
</para>
</wadl:doc>
</param>
&keypairQueryRequestParameter;
</representation>
</request>
<response status="201">