Skip to content

Commit

Permalink
Updates api.openstack.org to v2 instead of v1.1 for Compute API.
Browse files Browse the repository at this point in the history 
Adds some additional details to createServer.
 - Fix bug 933547 by adding imageRef, flavorRef to create Server
 - Adds metadata and personality to create Server command

Change-Id: I8970bec78164fec7bcab93960ca145273f858824
  • Loading branch information
@annegentle
annegentle committed Jul 23, 2012
1 parent d8a4df5 commit 335534e
Show file tree
Hide file tree
Showing 24 changed files with 47 additions and 3,772 deletions.
4 changes: 2 additions & 2 deletions doc/src/docbkx/openstack-api-site/pom.xml
View file
Expand Up @@ -8,7 +8,7 @@
<artifactId>docs</artifactId>
<version>1.0</version>
<packaging>jar</packaging>
<name>OpenStack API Page Test Project</name>
<name>OpenStack API Page Project</name>
<profiles>
<profile>
<id>Rackspace Research Repositories</id>
Expand Down Expand Up @@ -190,7 +190,7 @@
index.xml
</includes>
<profileSecurity>reviewer</profileSecurity>
<branding>rackspace</branding>
<branding>openstack</branding>
<trimWadlUriCount>1</trimWadlUriCount>
<showXslMessages>true</showXslMessages>
</configuration>
Expand Down
2 changes: 1 addition & 1 deletion doc/src/docbkx/openstack-api-site/src/docbkx/index.xml
View file
Expand Up @@ -55,7 +55,7 @@
server securely through SSH once it is started. The v1.1 API is
identical to the v2 API.</para>
<wadl:resources
href="../wadls/compute-api/src/os-compute-1.1.wadl"
href="../wadls/compute-api/src/os-compute-2.wadl"
xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
</chapter>
<chapter xml:id="compute-ext">
Expand Down
2 changes: 1 addition & 1 deletion doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/os-aggregates.wadl
View file
Expand Up @@ -8,7 +8,7 @@
xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">

<resources base="https://servers.api.openstack.com">
<resource id="version" path="v1.1/">
<resource id="version" path="v2/">
<resource id="tenantID" path="{tenant_id}">
<param name="tenant_id" style="template">
<doc><p xmlns="http://www.w3.org/1999/xhtml">
Expand Down
2 changes: 1 addition & 1 deletion doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/os-cloudpipe.wadl
View file
Expand Up @@ -7,7 +7,7 @@
xmlns:wadl="http://wadl.dev.java.net/2009/02">

<resources base="https://servers.api.openstack.com">
<resource id="version" type="#VersionDetails" path="v1.1/">
<resource id="version" type="#VersionDetails" path="v2/">
<resource id="tenantID" path="{tenant_id}">
<param name="tenant_id" style="template" type="xsd:string">
<doc><p xmlns="http://www.w3.org/1999/xhtml">
Expand Down
2 changes: 1 addition & 1 deletion doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/os-console-output.wadl
View file
Expand Up @@ -8,7 +8,7 @@
xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">

<resources base="https://servers.api.openstack.com">
<resource id="version" type="#VersionDetails" path="v1.1/">
<resource id="version" type="#VersionDetails" path="v2/">
<resource id="tenantID" path="{tenant_id}">
<param name="tenant_id" style="template" type="xsd:string">
<doc><p xmlns="http://www.w3.org/1999/xhtml">
Expand Down
2 changes: 1 addition & 1 deletion doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/os-consoles.wadl
View file
Expand Up @@ -7,7 +7,7 @@
xmlns:wadl="http://wadl.dev.java.net/2009/02">

<resources base="https://servers.api.openstack.com">
<resource id="version" type="#VersionDetails" path="v1.1/">
<resource id="version" type="#VersionDetails" path="v2/">
<resource id="tenantID" path="{tenant_id}">
<param name="tenant_id" style="template" type="xsd:string">
<doc><p xmlns="http://www.w3.org/1999/xhtml">
Expand Down
2 changes: 1 addition & 1 deletion doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/os-createserverext.wadl
View file
Expand Up @@ -7,7 +7,7 @@
xmlns:wadl="http://wadl.dev.java.net/2009/02">

<resources base="https://servers.api.openstack.com">
<resource id="version" type="#VersionDetails" path="v1.1/">
<resource id="version" type="#VersionDetails" path="v2/">
<resource id="tenantID" path="{tenant_id}">
<param name="tenant_id" style="template" type="xsd:string">
<doc><p xmlns="http://www.w3.org/1999/xhtml">
Expand Down
2 changes: 1 addition & 1 deletion doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/os-deferred-delete.wadl
View file
Expand Up @@ -7,7 +7,7 @@
xmlns:wadl="http://wadl.dev.java.net/2009/02">

<resources base="https://servers.api.openstack.com">
<resource id="version" type="#VersionDetails" path="v1.1/">
<resource id="version" type="#VersionDetails" path="v2/">
<resource id="tenantID" path="{tenant_id}">
<param name="tenant_id" style="template" type="xsd:string">
<doc><p xmlns="http://www.w3.org/1999/xhtml">
Expand Down
2 changes: 1 addition & 1 deletion doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/os-disk-config.wadl
View file
Expand Up @@ -18,7 +18,7 @@
">

<resources base="https://servers.api.openstack.com">
<resource id="version" type="#VersionDetails" path="v1.1/">
<resource id="version" type="#VersionDetails" path="v2/">
<resource id="tenantID" path="{tenant_id}">
<param name="tenant_id" style="template" type="xsd:string">
<doc><p xmlns="http://www.w3.org/1999/xhtml">
Expand Down
2 changes: 1 addition & 1 deletion ...ocbkx/openstack-api-site/src/wadls/compute-api/src/ext/os-extended-server-attributes.wadl
View file
Expand Up @@ -7,7 +7,7 @@
xmlns:wadl="http://wadl.dev.java.net/2009/02">

<resources base="https://servers.api.openstack.com">
<resource id="version" type="#VersionDetails" path="v1.1/">
<resource id="version" type="#VersionDetails" path="v2/">
<resource id="Servers" path="servers">
<method href="#extended_server_attributes_detail" />
<resource path="{server_id}">
Expand Down
2 changes: 1 addition & 1 deletion doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/os-extended-status.wadl
View file
Expand Up @@ -7,7 +7,7 @@
xmlns:wadl="http://wadl.dev.java.net/2009/02">

<resources base="https://servers.api.openstack.com">
<resource id="version" type="#VersionDetails" path="v1.1/">
<resource id="version" type="#VersionDetails" path="v2/">
<resource id="tenantID" path="{tenant_id}">
<param name="tenant_id" style="template" type="xsd:string">
<doc><p xmlns="http://www.w3.org/1999/xhtml">
Expand Down
2 changes: 1 addition & 1 deletion doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/os-flavorextradata.wadl
View file
Expand Up @@ -8,7 +8,7 @@
xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">

<resources base="https://servers.api.openstack.com">
<resource id="version" type="#VersionDetails" path="v1.1/">
<resource id="version" type="#VersionDetails" path="v2/">
<resource id="tenantID" path="{tenant_id}">
<param name="tenant_id" style="template" type="xsd:string">
<doc><p xmlns="http://www.w3.org/1999/xhtml">
Expand Down
2 changes: 1 addition & 1 deletion doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/os-hosts.wadl
View file
Expand Up @@ -7,7 +7,7 @@
xmlns:wadl="http://wadl.dev.java.net/2009/02">

<resources base="https://servers.api.openstack.com">
<resource id="version" type="#VersionDetails" path="v1.1/">
<resource id="version" type="#VersionDetails" path="v2/">
<resource id="tenantID" path="{tenant_id}">
<param name="tenant_id" style="template" type="xsd:string">
<doc><p xmlns="http://www.w3.org/1999/xhtml">
Expand Down
2 changes: 1 addition & 1 deletion doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/os-keypairs.wadl
View file
Expand Up @@ -7,7 +7,7 @@
xmlns:wadl="http://wadl.dev.java.net/2009/02">

<resources base="https://servers.api.openstack.com">
<resource id="version" type="#VersionDetails" path="v1.1/">
<resource id="version" type="#VersionDetails" path="v2/">
<resource id="tenantID" path="{tenant_id}">
<param name="tenant_id" style="template" type="xsd:string">
<doc><p xmlns="http://www.w3.org/1999/xhtml">
Expand Down
2 changes: 1 addition & 1 deletion doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/os-rescue.wadl
View file
Expand Up @@ -8,7 +8,7 @@
xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">

<resources base="https://servers.api.openstack.com">
<resource id="version" type="#VersionDetails" path="v1.1/">
<resource id="version" type="#VersionDetails" path="v2/">
<resource id="tenantID" path="{tenant_id}">
<param name="tenant_id" style="template" type="xsd:string">
<doc><p xmlns="http://www.w3.org/1999/xhtml">
Expand Down
2 changes: 1 addition & 1 deletion doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/os-scheduler-hints.wadl
View file
Expand Up @@ -7,7 +7,7 @@
xmlns:wadl="http://wadl.dev.java.net/2009/02">

<resources base="https://servers.api.openstack.com">
<resource id="version" type="#VersionDetails" path="v1.1/">
<resource id="version" type="#VersionDetails" path="v2/">
<resource id="tenantID" path="{tenant_id}">
<param name="tenant_id" style="template" type="xsd:string">
<doc><p xmlns="http://www.w3.org/1999/xhtml">
Expand Down
2 changes: 1 addition & 1 deletion doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/os-server-start-stop.wadl
View file
Expand Up @@ -8,7 +8,7 @@
xmlns:csapi="http://docs.openstack.org/compute/api/v1.1">

<resources base="https://servers.api.openstack.com">
<resource id="version" type="#VersionDetails" path="v1.1/">
<resource id="version" type="#VersionDetails" path="v2/">
<resource id="tenantID" path="{tenant_id}">
<param name="tenant_id" style="template" type="xsd:string">
<doc><p xmlns="http://www.w3.org/1999/xhtml">
Expand Down
2 changes: 1 addition & 1 deletion doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/os-simple-tenant-usage.wadl
View file
Expand Up @@ -7,7 +7,7 @@
xmlns:wadl="http://wadl.dev.java.net/2009/02">

<resources base="https://servers.api.openstack.com">
<resource id="version" type="#VersionDetails" path="v1.1/">
<resource id="version" type="#VersionDetails" path="v2/">
<resource id="tenantID" path="{tenant_id}">
<param name="tenant_id" style="template" type="xsd:string">
<doc><p xmlns="http://www.w3.org/1999/xhtml">
Expand Down
6 changes: 3 additions & 3 deletions doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/os-used-limits.wadl
View file
Expand Up @@ -7,11 +7,11 @@
xmlns:wadl="http://wadl.dev.java.net/2009/02">

<resources base="https://servers.api.openstack.com">
<resource id="version" type="#VersionDetails" path="v1.1/">
<resource id="version" path="v2/">
<resource id="tenantID" path="{tenant_id}">
<param name="tenant_id" style="template" type="xsd:string">
<param name="tenant_id" style="template">
<doc><p xmlns="http://www.w3.org/1999/xhtml">
The ID for the tenant or account in a multi-tenancy cloud.
The ID for the tenant or account in a multi-tenancy cloud.
</p></doc>
</param>
<resource id="Limits" path="limits">
Expand Down
2 changes: 1 addition & 1 deletion doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/os-virtual-interfaces.wadl
View file
Expand Up @@ -7,7 +7,7 @@
xmlns:wadl="http://wadl.dev.java.net/2009/02">

<resources base="https://servers.api.openstack.com">
<resource id="version" type="#VersionDetails" path="v1.1/">
<resource id="version" type="#VersionDetails" path="v2/">
<resource id="tenantID" path="{tenant_id}">
<param name="tenant_id" style="template" type="xsd:string">
<doc><p xmlns="http://www.w3.org/1999/xhtml">
Expand Down
2 changes: 1 addition & 1 deletion doc/src/docbkx/openstack-api-site/src/wadls/compute-api/src/ext/os-volume_attachments.wadl
View file
Expand Up @@ -33,7 +33,7 @@
</grammars>

<resources base="https://servers.api.openstack.com">
<resource id="version" type="#VersionDetails" path="v1.1/">
<resource id="version" type="#VersionDetails" path="v2/">
<resource id="tenantID" path="{tenant_id}">
<param name="tenant_id" style="template" type="xsd:string">
<doc><p xmlns="http://www.w3.org/1999/xhtml">
Expand Down
0 ...t/samples/os-used-limits-limits-list.json → .../ext/samples/os-used-limits-response.json
View file
File renamed without changes.
27 changes: 23 additions & 4 deletions ...wadls/compute-api/src/os-compute-1.1.wadl → ...c/wadls/compute-api/src/os-compute-2.wadl
View file
Expand Up @@ -16,12 +16,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:db="http://docbook.org/ns/docbook"
xmlns:csapi="http://docs.openstack.org/compute/api/v1.1"
xmlns:csapi="http://docs.openstack.org/compute/api/v2"
xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
xmlns:common="http://docs.openstack.org/common/api/v1.0"
xmlns:wadl="http://wadl.dev.java.net/2009/02"
xmlns:atom="http://www.w3.org/2005/Atom"
xsi:schemaLocation="http://docs.openstack.org/compute/api/v1.1
xsi:schemaLocation="http://docs.openstack.org/compute/api/v2
xsd/api.xsd
http://docs.openstack.org/common/api/v1.0
xsd/api-common.xsd
Expand All @@ -37,7 +37,7 @@
<!--*******************************************************-->

<resources base="https://servers.api.openstack.com">
<resource id="version" type="#VersionDetails" path="v1.1/">
<resource id="version" type="#VersionDetails" path="v2/">
<resource id="extensions" type="#ExtensionList" path="extensions">
<resource id="extension" path="{alias}">
<param name="alias" style="template" type="xsd:string"><doc><p xmlns="http://www.w3.org/1999/xhtml">An alias is a name for a pointer to a resource, such as a named extension.</p></doc></param>
Expand Down Expand Up @@ -457,7 +457,26 @@
<p xmlns="http://www.w3.org/1999/xhtml"
>Server.</p>
</doc></param>
</representation>
<param name="imageRef" style="plain" required="true">
<doc xml:lang="EN" title="imageRef">
<p xmlns="http://www.w3.org/1999/xhtml">The image reference for the desired image for your server instance. </p>
<p xmlns="http://www.w3.org/1999/xhtml">Specify as an ID or full URL.</p></doc></param>
<param name="flavorRef" style="plain" required="true">
<doc xml:lang="EN" title="flavorRef">
<p xmlns="http://www.w3.org/1999/xhtml">The flavor reference for the desired flavor for your server instance.</p>
<p xmlns="http://www.w3.org/1999/xhtml">Specify as an ID or full URL.</p></doc></param>
<param name="name" style="plain" required="true">
<doc xml:lang="EN" title="name">
<p xmlns="http://www.w3.org/1999/xhtml">The name for your created server.</p></doc></param>
<param name="metadata" style="plain" required="false">
<doc xml:lang="EN" title="metadata">
<p xmlns="http://www.w3.org/1999/xhtml">Metadata key and value pairs. The maximum size of the metadata key and value is 255 bytes each.</p></doc></param>
<param name="personality" style="plain" required="false">
<doc xml:lang="EN" title="personality">
<p xmlns="http://www.w3.org/1999/xhtml">File path and contents (text only) to inject into the server at launch.
The maximum size of the file path data is 255 bytes. The maximum limit refers to the number of bytes in the
decoded data and not the number of characters in the encoded data.</p></doc></param>
</representation>
<representation mediaType="application/json">
<doc>
<xsdxt:code href="samples/server-post-req.json"/>
Expand Down

0 comments on commit 335534e

Please sign in to comment.