Merge "Add server_id to Compute v2 action calls"

This commit is contained in:
Jenkins 2015-09-22 15:28:42 +00:00 committed by Gerrit Code Review
commit 213fe9864b
2 changed files with 99 additions and 81 deletions

View File

@ -243,8 +243,12 @@
network.
</para>
<wadl:resources xmlns:wadl="http://wadl.dev.java.net/2009/02">
<wadl:resource href="../wadls/compute-api/src/v2/wadl/os-compute-2.wadl#ips"/>
<wadl:resource href="../wadls/compute-api/src/v2/wadl/os-compute-2.wadl#network_label"/>
<wadl:resource href="../wadls/compute-api/src/v2/wadl/os-compute-2.wadl#ips">
<wadl:method href="#getServerAddresses" />
</wadl:resource>
<wadl:resource href="../wadls/compute-api/src/v2/wadl/os-compute-2.wadl#Network_label">
<wadl:method href="#getNetworkAddresses" />
</wadl:resource>
</wadl:resources>
</section>
<section xml:id="compute_server-actions">

View File

@ -30,23 +30,27 @@
<resource id="versions" path="/">
<method href="#listVersionsv2" />
<resource id="version" path="v2">
<resource id="extensions" type="#ExtensionList" path="extensions">
<resource id="extension" path="{alias}">
<param required="true" name="alias" style="template" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
<para>
An alias, which is a name for a pointer to a
resource. For example, a named extension.
</para>
</wadl:doc>
</param>
<method href="#getExtensionv2" />
</resource>
</resource>
<resource id="tenant_id" path="{tenant_id}">
<param name="tenant_id" style="template" type="csapi:UUID">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
<para>The tenant ID in a multi-tenancy cloud.</para>
<para>
The tenant ID in a multi-tenancy cloud.
</para>
</wadl:doc>
</param>
<resource id="extensions" type="#ExtensionList" path="extensions">
<resource id="extension" path="{alias}">
<param required="true" name="alias" style="template" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
<para>An alias, which is a name for a pointer to a resource. For
example, a named extension.</para>
</wadl:doc>
</param>
<method href="#getExtensionv2" />
</resource>
</resource>
<resource id="limits" path="limits">
<method href="#listLimits" />
</resource>
@ -56,88 +60,98 @@
<resource id="server_id" path="{server_id}">
<param name="server_id" style="template" type="csapi:UUID">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN">
<para>The UUID for the server.</para>
<para>
The UUID for the server.
</para>
</wadl:doc>
</param>
<method href="#getServer" />
<method href="#updateServer" />
<method href="#deleteServer" />
<resource id="ips" path="ips">
<method href="#getServerAddresses" />
<resource id="Network_label" path="{network_label}" type="#NetworkAddressList">
<param name="network_label" style="template" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="network_label">
<resource id="server_metadata" path="metadata" type="#ServerMetadataDetails">
<resource id="ServerMetadataKey" path="{key}">
<param name="key" style="template" type="csapi:MetadataKey">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Server metadata item key">
<para>
The network label, such as
<literal>public</literal>
or
<literal>private</literal>
.
A string. Maximum length is 255 characters.
</para>
</wadl:doc>
</param>
<method href="#getServerMetadataItem" />
<method href="#setServerMetadataItem" />
<method href="#deleteServerMetadataItem" />
</resource>
<method href="#getNetworkAddresses" />
</resource>
</resource>
<resource id="server_metadata" path="metadata" type="#ServerMetadataDetails">
<resource id="ServerMetadataKey" path="{key}">
<param name="key" style="template" type="csapi:MetadataKey">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Server metadata item key">
<para>A string. Maximum length is 255 characters.</para>
</wadl:doc>
</param>
<method href="#getServerMetadataItem" />
<method href="#setServerMetadataItem" />
<method href="#deleteServerMetadataItem" />
<resource id="action" path="action">
<method href="#changePassword" />
<method href="#rebootServer" />
<method href="#rebuildServer" />
<method href="#resizeServer" />
<method href="#confirmServer" />
<method href="#revertServer" />
<method href="#associateSecGroup" />
<method href="#createImage" />
</resource>
</resource>
<resource id="action" path="action">
<method href="#changePassword" />
<method href="#rebootServer" />
<method href="#rebuildServer" />
<method href="#resizeServer" />
<method href="#confirmServer" />
<method href="#revertServer" />
<method href="#associateSecGroup" />
<method href="#createImage" />
</resource>
</resource>
</resource>
<resource id="Images" type="#ImageList" path="images">
<resource id="image_detail" path="detail" type="#DetailImageList" />
<resource id="image_id" path="{image_id}">
<param name="image_id" style="template" type="csapi:UUID">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="image_id">
<para>The UUID for the image.</para>
</wadl:doc>
</param>
<method href="#getImage" />
<method href="#deleteImage" />
<resource id="image_metadata" path="metadata" type="#ImageMetadataDetails">
<resource id="imageMetadataKey" path="{key}">
<param name="key" style="template" type="csapi:imageMetadataKey">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Metadata item key">
<para>A string. Maximum length is 255 characters.</para>
</wadl:doc>
</param>
<method href="#getImageMetadataItem" />
<method href="#setImageMetadataItem" />
<method href="#deleteImageMetadataItem" />
<resource id="ips" path="ips">
<method href="#getServerAddresses" />
<resource id="Network_label" path="{network_label}">
<param name="network_label" style="template" type="xsd:string">
<wadl:doc xmlns="http://docbook.org/ns/docbook"
xml:lang="EN" title="network_label">
<para>
The network label, such as
<literal>public</literal> or
<literal>private</literal>.
</para>
</wadl:doc>
</param>
<method href="#getNetworkAddresses" />
</resource>
</resource>
</resource>
</resource>
</resource>
<resource id="Flavors" type="#FlavorList" path="flavors">
<resource id="flavor_detail" path="detail" type="#DetailFlavorList" />
<resource id="flavor_id" path="{flavor_id}">
<param name="flavor_id" style="template" type="csapi:UUID">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="flavor_id">
<para>UUID for the specific flavor (combination of memory, disk
size, and CPUs).</para>
</wadl:doc>
</param>
<method href="#getFlavor" />
<resource id="Images" type="#ImageList" path="images">
<resource id="image_detail" path="detail" type="#DetailImageList" />
<resource id="image_id" path="{image_id}">
<param name="image_id" style="template" type="csapi:UUID">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="image_id">
<para>
The UUID for the image.
</para>
</wadl:doc>
</param>
<method href="#getImage" />
<method href="#deleteImage" />
<resource id="image_metadata" path="metadata" type="#ImageMetadataDetails">
<resource id="imageMetadataKey" path="{key}">
<param name="key" style="template" type="csapi:imageMetadataKey">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="Metadata item key">
<para>
A string. Maximum length is 255 characters.
</para>
</wadl:doc>
</param>
<method href="#getImageMetadataItem" />
<method href="#setImageMetadataItem" />
<method href="#deleteImageMetadataItem" />
</resource>
</resource>
</resource>
</resource>
<resource id="Flavors" type="#FlavorList" path="flavors">
<resource id="flavor_detail" path="detail" type="#DetailFlavorList" />
<resource id="flavor_id" path="{flavor_id}">
<param name="flavor_id" style="template" type="csapi:UUID">
<wadl:doc xmlns="http://docbook.org/ns/docbook" xml:lang="EN" title="flavor_id">
<para>
UUID for the specific flavor
(combination of memory, disk size, and
CPUs).
</para>
</wadl:doc>
</param>
<method href="#getFlavor" />
</resource>
</resource>
</resource>
</resource>