Merge "Added conflictingRequest (409) fault code."

This commit is contained in:
Jenkins 2013-09-23 17:09:11 +00:00 committed by Gerrit Code Review
commit 72901657c5

View File

@ -1419,7 +1419,7 @@ Host: servers.api.openstack.org/v2/
<tr>
<td>Fault Element</td>
<td>Associated Error Codes</td>
<td>Expected in All Requests?</td>
<td>Expected in All Requests</td>
</tr>
</thead>
<tbody>
@ -1428,26 +1428,63 @@ Host: servers.api.openstack.org/v2/
<td>500, 400, other codes possible</td>
<td align="center">&CHECK;</td>
</tr>
<tr>
<td>notImplemented</td>
<td>501</td>
<td/>
</tr>
<tr>
<td>serverCapacityUnavailable</td>
<td>503</td>
<td/>
</tr>
<tr>
<td>serviceUnavailable</td>
<td>503</td>
<td align="center">&CHECK;</td>
</tr>
<tr>
<td>unauthorized</td>
<td>401</td>
<td align="center">&CHECK;</td>
</tr>
<tr>
<td>forbidden</td>
<td>403</td>
<td align="center">&CHECK;</td>
</tr>
<tr>
<td>badRequest</td>
<td>400</td>
<td align="center">&CHECK;</td>
</tr>
<tr>
<td>unauthorized</td>
<td>401</td>
<td align="center">&CHECK;</td>
</tr>
<tr>
<td>forbidden</td>
<td>403</td>
<td align="center">&CHECK;</td>
</tr>
<tr>
<td>resizeNotAllowed</td>
<td>403</td>
<td/>
</tr>
<tr>
<td>itemNotFound</td>
<td>404</td>
<td/>
</tr>
<tr>
<td>badMethod</td>
<td>405</td>
<td/>
</tr>
<tr>
<td>backupOrResizeInProgress</td>
<td>409</td>
<td/>
</tr>
<tr>
<td>buildInProgress</td>
<td>409</td>
<td/>
</tr>
<tr><td>conflictingRequest</td><td>409</td><td/></tr>
<tr>
<td>overLimit</td>
<td>413</td>
@ -1458,52 +1495,17 @@ Host: servers.api.openstack.org/v2/
<td>415</td>
<td/>
</tr>
<tr>
<td>badMethod</td>
<td>405</td>
<td/>
</tr>
<tr>
<td>itemNotFound</td>
<td>404</td>
<td/>
</tr>
<tr>
<td>buildInProgress</td>
<td>409</td>
<td/>
</tr>
<tr>
<td>serverCapacityUnavailable</td>
<td>503</td>
<td/>
</tr>
<tr>
<td>backupOrResizeInProgress</td>
<td>409</td>
<td/>
</tr>
<tr>
<td>resizeNotAllowed</td>
<td>403</td>
<td/>
</tr>
<tr>
<td>notImplemented</td>
<td>501</td>
<td/>
</tr>
</tbody>
</table>
<example>
<title>Fault Response, Item Not Found: XML</title>
<programlisting language="xml"><xi:include href="samples/notfound.xml" parse="text"/></programlisting>
</example>
<example>
<title>Fault Response, Item Not Found:
JSON</title>
<programlisting language="json"><xi:include href="samples/notfound.json" parse="text"/></programlisting>
</example>
<example>
<title>Fault Response, Item Not Found: XML</title>
<programlisting language="xml"><xi:include href="samples/notfound.xml" parse="text"/></programlisting>
</example>
<para>From an XML schema perspective, all API faults
are extensions of the base fault type
ComputeAPIFault. When working with a system that
@ -3328,7 +3330,7 @@ Host: servers.api.openstack.org/v2/
server. Once complete, a new image will be
available that can be used to rebuild or create
servers. The full URL to the newly created image
is returned via the <code>Location</code> header,
is returned through the <code>Location</code> header,
additional attributes for the image including
creation status may be retrieved by performing a
subsequent &GET; on that URL. See <xref
@ -3966,9 +3968,9 @@ Host: servers.api.openstack.org/v2/
thrown if the maximum number of metadata items is
exceeded. The maximum number of key-value pairs
that can be supplied per server is determined by
the compute provider and may be queried via the
the compute provider and may be queried through the
maxServerMeta absolute limit. The maximum number
of key-value pairs for an image may be queried via
of key-value pairs for an image may be queried through
the maxImageMeta absolute limit.</para>
<example>
<title>Set Metadata Request: XML </title>
@ -4073,9 +4075,9 @@ Host: servers.api.openstack.org/v2/
of metadata items to be exceeded. The maximum
number of key-value pairs that can be supplied per
server is determined by the compute provider and
may be queried via the maxServerMeta absolute
may be queried through the maxServerMeta absolute
limit. The maximum number of key-value pairs for
an image may be queried via the maxImageMeta
an image may be queried through the maxImageMeta
absolute limit.</para>
<example>
<title>Update Metadata Request: XML </title>
@ -4231,9 +4233,9 @@ Host: servers.api.openstack.org/v2/
maximum number of metadata items to be exceeded.
The maximum number of key-value pairs that can be
supplied per server is determined by the compute
provider and may be queried via the maxServerMeta
provider and may be queried through the maxServerMeta
absolute limit. The maximum number of key-value
pairs for an image may be queried via the
pairs for an image may be queried through the
maxImageMeta absolute limit.</para>
<example>
<title>Set Metadata Item Request: XML </title>
@ -4307,12 +4309,10 @@ Host: servers.api.openstack.org/v2/
<?hard-pagebreak?>
<section xml:id="NetworksSection">
<title>Networks</title>
<para>Networks is a collection of attributes. The section
below outlines the list of attributes that can be
specified for each network.</para>
<section xml:id="NetworkAttributes-d1e5090">
<title>Network Attributes</title>
<informaltable rules="all">
<para>You can specify the following attributes for a
network.</para>
<table rules="all" xml:id="NetworkAttributes-d1e5090">
<caption>Network Attributes</caption>
<thead>
<tr>
<td colspan="1">Name</td>
@ -4339,20 +4339,17 @@ Host: servers.api.openstack.org/v2/
<td colspan="3">The uuid of the port.</td>
</tr>
</tbody>
</informaltable>
</table>
<note>
<para>The parameter fixed_ip is used only when
network uuid is specified; also, when port is
specified, network uuid and fixed_ip are
properties of the port and therefore will be
ignored. A fix for LP bug #1190777 may alter
this behavior, therefore if the request
specifies the port, it is recommended that
fixed_ip and (network) uuid are omitted to
avoid incurring in validation errors.</para>
properties of the port and are
ignored. Omit
fixed_ip and (network) uuid to
avoid validation errors.</para>
</note>
</section>
</section>
</chapter>
<chapter xml:id="ext-compute" role="api-reference"
xmlns="http://docbook.org/ns/docbook"