openstack-attic/compute-api
Code Issues Proposed changes

Rename v1.1 to v2

Browse Source 
Change-Id: I51dbc34a300e94a2f2b464a1a68011204ebf064f
This commit is contained in:
Diane Fleming 2012-01-27 13:58:55 -06:00 committed by Jorge L. Williams
parent 582f1f1fec
commit bbef14d8ac
269 changed files with 273 additions and 519 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openstack-compute-api-1.1/src/samples/addip.json
View File

@ -1,5 +0,0 @@
{
"addIp" : {
"configureServer" : true
}
}

2
openstack-compute-api-1.1/src/samples/addip.xml
View File

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<addIp xmlns="http://docs.openstack.org/compute/api/v1.1" configureServer="true"/>

7
openstack-compute-api-1.1/src/samples/backup.json
View File

@ -1,7 +0,0 @@
{
"backupSchedule" : {
"enabled" : true,
"weekly" : "THURSDAY",
"daily" : "H_0400_0600"
}
}

2
openstack-compute-api-1.1/src/samples/backup.xml
View File

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<backupSchedule xmlns="http://docs.openstack.org/compute/api/v1.1" enabled="true" weekly="THURSDAY" daily="H_0400_0600"/>

17
openstack-compute-api-1.1/src/samples/ipgroup.json
View File

@ -1,17 +0,0 @@
{
"sharedIpGroup" : {
"id" : "52415800-8b69-11e0-9b19-734f68ab4a9f",
"name" : "Shared IP Group 1",
"servers" : ["52415800-8b69-11e0-9b19-734f0272444a"],
"links": [
{
"rel" : "self",
"href" : "http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"
},
{
"rel" : "bookmark",
"href" : "http://servers.api.openstack.org/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"
}
]
}
}

16
openstack-compute-api-1.1/src/samples/ipgroup.xml
View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<sharedIpGroup
xmlns="http://docs.openstack.org/compute/api/v1.1"
xmlns:atom="http://www.w3.org/2005/Atom"
id="52415800-8b69-11e0-9b19-734f68ab4a9f"
name="Shared IP Group 1">
<servers>
<server id="52415800-8b69-11e0-9b19-734f0272444a"/>
</servers>
<atom:link
rel="self"
href="http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"/>
<atom:link
rel="bookmark"
href="http://servers.api.openstack.org/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"/>
</sharedIpGroup>

6
openstack-compute-api-1.1/src/samples/ipgroup2.json
View File

@ -1,6 +0,0 @@
{
"sharedIpGroup" : {
"name" : "Shared IP Group 1",
"server" : "52415800-8b69-11e0-9b19-734f0272444a"
}
}

6
openstack-compute-api-1.1/src/samples/ipgroup2.xml
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<sharedIpGroup
xmlns="http://docs.openstack.org/compute/api/v1.1"
name="Shared IP Group 1">
<server id="52415800-8b69-11e0-9b19-734f0272444a"/>
</sharedIpGroup>

49
openstack-compute-api-1.1/src/samples/ipgroups-page1.json
View File

@ -1,49 +0,0 @@
{
"sharedIpGroups": [
{
"id": "52415800-8b69-11e0-9b19-734f68ab4a9f",
"name": "Shared IP Group 1",
"servers": [
"52415800-8b69-11e0-9b19-734f0272444a",
"52415800-8b69-11e0-9b19-734f3b0d4465"
],
"links": [
{
"rel": "self",
"href": "http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"
},
{
"rel": "bookmark",
"href": "http://servers.api.openstack.org/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"
}
]
},
{
"id": "52415800-8b69-11e0-9b19-734f0e75433e",
"name": "Shared IP Group 2",
"servers": [
"52415800-8b69-11e0-9b19-734f10c97171",
"52415800-8b69-11e0-9b19-734f4306ea92",
"52415800-8b69-11e0-9b19-734f216543fd"
],
"links": [
{
"rel": "self",
"href": "http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f0e75433e"
},
{
"rel": "bookmark",
"href": "http://servers.api.openstack.org/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f0e75433e"
}
]
}
],
"sharedIpGroups_": {
"links": [
{
"rel": "next",
"href": "http://servers.api.openstack.org/v1.1/1234/shared_ip_groups?limit=2&marker=52415800-8b69-11e0-9b19-734f0e75433e"
}
]
}
}

37
openstack-compute-api-1.1/src/samples/ipgroups-page1.xml
View File

@ -1,37 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<sharedIpGroups
xmlns="http://docs.openstack.org/compute/api/v1.1"
xmlns:atom="http://www.w3.org/2005/Atom">
<sharedIpGroup
id="52415800-8b69-11e0-9b19-734f68ab4a9f"
name="Shared IP Group 1">
<servers>
<server id="52415800-8b69-11e0-9b19-734f0272444a"/>
<server id="52415800-8b69-11e0-9b19-734f3b0d4465"/>
</servers>
<atom:link
rel="self"
href="http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"/>
<atom:link
rel="bookmark"
href="http://servers.api.openstack.org/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"/>
</sharedIpGroup>
<sharedIpGroup
id="52415800-8b69-11e0-9b19-734f0e75433e"
name="Shared IP Group 2">
<servers>
<server id="52415800-8b69-11e0-9b19-734f10c97171"/>
<server id="52415800-8b69-11e0-9b19-734f4306ea92"/>
<server id="52415800-8b69-11e0-9b19-734f216543fd"/>
</servers>
<atom:link
rel="self"
href="http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f0e75433e"/>
<atom:link
rel="bookmark"
href="http://servers.api.openstack.org/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f0e75433e"/>
</sharedIpGroup>
<atom:link
rel="next"
href="http://servers.api.openstack.org/v1.1/1234/shared_ip_groups?limit=2&amp;marker=52415800-8b69-11e0-9b19-734f0e75433e"/>
</sharedIpGroups>

41
openstack-compute-api-1.1/src/samples/ipgroups.json
View File

@ -1,41 +0,0 @@
{
"sharedIpGroups": [
{
"id": "52415800-8b69-11e0-9b19-734f68ab4a9f",
"name": "Shared IP Group 1",
"servers": [
"52415800-8b69-11e0-9b19-734f0272444a",
"52415800-8b69-11e0-9b19-734f3b0d4465"
],
"links": [
{
"rel": "self",
"href": "http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"
},
{
"rel": "bookmark",
"href": "http://servers.api.openstack.org/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"
}
]
},
{
"id": "52415800-8b69-11e0-9b19-734f0e75433e",
"name": "Shared IP Group 2",
"servers": [
"52415800-8b69-11e0-9b19-734f10c97171",
"52415800-8b69-11e0-9b19-734f4306ea92",
"52415800-8b69-11e0-9b19-734f216543fd"
],
"links": [
{
"rel": "self",
"href": "http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f0e75433e"
},
{
"rel": "bookmark",
"href": "http://servers.api.openstack.org/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f0e75433e"
}
]
}
]
}

34
openstack-compute-api-1.1/src/samples/ipgroups.xml
View File

@ -1,34 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<sharedIpGroups
xmlns="http://docs.openstack.org/compute/api/v1.1"
xmlns:atom="http://www.w3.org/2005/Atom">
<sharedIpGroup
id="52415800-8b69-11e0-9b19-734f68ab4a9f"
name="Shared IP Group 1">
<servers>
<server id="52415800-8b69-11e0-9b19-734f0272444a"/>
<server id="52415800-8b69-11e0-9b19-734f3b0d4465"/>
</servers>
<atom:link
rel="self"
href="http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"/>
<atom:link
rel="bookmark"
href="http://servers.api.openstack.org/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f68ab4a9f"/>
</sharedIpGroup>
<sharedIpGroup
id="52415800-8b69-11e0-9b19-734f0e75433e"
name="Shared IP Group 2">
<servers>
<server id="52415800-8b69-11e0-9b19-734f10c97171"/>
<server id="52415800-8b69-11e0-9b19-734f4306ea92"/>
<server id="52415800-8b69-11e0-9b19-734f216543fd"/>
</servers>
<atom:link
rel="self"
href="http://servers.api.openstack.org/v1.1/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f0e75433e"/>
<atom:link
rel="bookmark"
href="http://servers.api.openstack.org/1234/shared_ip_groups/52415800-8b69-11e0-9b19-734f0e75433e"/>
</sharedIpGroup>
</sharedIpGroups>

6
openstack-compute-api-1.1/src/samples/ipv6AddressRange.json
View File

@ -1,6 +0,0 @@
{
"ipv6AddressRange":
{
"value":"2001:4800:7800:0500:DA39:A3EE:FF00:0000/96"
}
}

3
openstack-compute-api-1.1/src/samples/ipv6AddressRange.xml
View File

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<aide:ipv6AddressRange xmlns:aide="http://docs.rackspacecloud.com/servers/api/ext/aide/v1.0"
value="2001:4800:7800:0500:DA39:A3EE:FF00:0000/96"/>

6
openstack-compute-api-1.1/src/samples/shareip.json
View File

@ -1,6 +0,0 @@
{
"RS-SIPE:shareIp" : {
"sharedIpGroupId" : 1234,
"configureServer" : true
}
}

4
openstack-compute-api-1.1/src/samples/shareip.xml
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<shareIp
xmlns="http://docs.rackspacecloud.com/servers/api/ext/sipe/v1.0"
sharedIpGroupId="1234" configureServer="true"/>

5
openstack-compute-api-1.1/src/samples/snapshot.json
View File

@ -1,5 +0,0 @@
{
"snapshot" : {
"imageName" : "Just in case"
}
}

2
openstack-compute-api-1.1/src/samples/snapshot.xml
View File

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<snapshot xmlns="http://docs.openstack.org/compute/api/v1.1" imageName="Just in case"/>

7
openstack-compute-api-1.1/src/samples/version2.xml
View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<version xmlns="http://docs.openstack.org/common/api/v1.0" xmlns:atom="http://www.w3.org/2005/Atom" id="v1.1" status="ALPHA" updated="2011-01-21T11:33:21-06:00">
<atom:link rel="describedby" type="application/pdf" href="http://docs.rackspacecloud.com/servers/api/v1.1/cs-devguide-20110125.pdf"/>
<atom:link rel="describedby" type="application/vnd.sun.wadl+xml" href="http://docs.rackspacecloud.com/servers/api/v1.1/application.wadl"/>
</version>

20
openstack-compute-api-1.1/pom.xml → openstack-compute-api-2/pom.xml
View File

@ -50,7 +50,7 @@
<plugin> <plugin>
<groupId>com.rackspace.cloud.api</groupId> <groupId>com.rackspace.cloud.api</groupId>
<artifactId>clouddocs-maven-plugin</artifactId> <artifactId>clouddocs-maven-plugin</artifactId>
<version>1.0.7</version> <version>1.0.9</version>
<executions> <executions>
<execution> <execution>
<id>goal1</id> <id>goal1</id>
@ -100,37 +100,37 @@
</copy> </copy>
<!-- New stuff --> <!-- New stuff -->
<mkdir dir="${basedir}/target/docbkx/webhelp/api/openstack-compute/1.1/"/> <mkdir dir="${basedir}/target/docbkx/webhelp/api/openstack-compute/2/"/>
<!-- Copies schema to a folder and styling for the schemas so a browser can display them --> <!-- Copies schema to a folder and styling for the schemas so a browser can display them -->
<copy todir="${basedir}/target/docbkx/webhelp/api/openstack-compute/1.1/xsd"> <copy todir="${basedir}/target/docbkx/webhelp/api/openstack-compute/2/xsd">
<fileset dir="${basedir}/src/xsd"> <fileset dir="${basedir}/src/xsd">
<include name="**/*.*" /> <include name="**/*.*" />
</fileset> </fileset>
</copy> </copy>
<copy todir="${basedir}/target/docbkx/webhelp/api/openstack-compute/1.1/xslt"> <copy todir="${basedir}/target/docbkx/webhelp/api/openstack-compute/2/xslt">
<fileset dir="${basedir}/src/xslt"> <fileset dir="${basedir}/src/xslt">
<include name="**/*.*" /> <include name="**/*.*" />
</fileset> </fileset>
</copy> </copy>
<copy todir="${basedir}/target/docbkx/webhelp/api/openstack-compute/1.1/style"> <copy todir="${basedir}/target/docbkx/webhelp/api/openstack-compute/2/style">
<fileset dir="${basedir}/src/style"> <fileset dir="${basedir}/src/style">
<include name="**/*.*" /> <include name="**/*.*" />
</fileset> </fileset>
</copy> </copy>
<copy todir="${basedir}/target/docbkx/webhelp/api/openstack-compute/1.1/js"> <copy todir="${basedir}/target/docbkx/webhelp/api/openstack-compute/2/js">
<fileset dir="${basedir}/src/js"> <fileset dir="${basedir}/src/js">
<include name="**/*.*" /> <include name="**/*.*" />
</fileset> </fileset>
</copy> </copy>
<copy todir="${basedir}/target/docbkx/webhelp/api/openstack-compute/1.1/samples"> <copy todir="${basedir}/target/docbkx/webhelp/api/openstack-compute/2/samples">
<fileset dir="${basedir}/src/samples"> <fileset dir="${basedir}/src/samples">
<include name="**/*.*" /> <include name="**/*.*" />
</fileset> </fileset>
</copy> </copy>
<copy <copy
todir="${basedir}/target/docbkx/webhelp/api/openstack-compute/1.1/"> todir="${basedir}/target/docbkx/webhelp/api/openstack-compute/2/">
<fileset <fileset
dir="${basedir}/target/docbkx/webhelp/os-compute-devguide/"> dir="${basedir}/target/docbkx/webhelp/os-compute-devguide/">
<include name="**/*" /> <include name="**/*" />
@ -146,7 +146,7 @@
<!--Moves PDFs to the needed placement --> <!--Moves PDFs to the needed placement -->
<move failonerror="false" <move failonerror="false"
file="${basedir}/target/docbkx/pdf/os-compute-devguide.pdf" file="${basedir}/target/docbkx/pdf/os-compute-devguide.pdf"
tofile="${basedir}/target/docbkx/webhelp/api/openstack-compute/1.1/os-compute-devguide-1.1.pdf"/> tofile="${basedir}/target/docbkx/webhelp/api/openstack-compute/2/os-compute-devguide-2.pdf"/>
<!--Deletes leftover uneeded directories --> <!--Deletes leftover uneeded directories -->
@ -164,7 +164,7 @@
<includes> <includes>
os-compute-devguide.xml os-compute-devguide.xml
</includes> </includes>
<canonicalUrlBase>http://docs.openstack.org/api/openstack-compute/1.1/content/</canonicalUrlBase> <canonicalUrlBase>http://docs.openstack.org/api/openstack-compute/2/content/</canonicalUrlBase>
<profileSecurity>reviewer</profileSecurity> <profileSecurity>reviewer</profileSecurity>
<branding>openstack</branding> <branding>openstack</branding>
</configuration> </configuration>

0
openstack-compute-api-1.1/src/common.ent → openstack-compute-api-2/src/common.ent
View File

0
openstack-compute-api-1.1/src/figures/Arrow_east.png → openstack-compute-api-2/src/figures/Arrow_east.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 433 B

After

Width:  |  Height:  |  Size: 433 B

0
openstack-compute-api-1.1/src/figures/Arrow_east.svg → openstack-compute-api-2/src/figures/Arrow_east.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

0
openstack-compute-api-1.1/src/figures/Check_mark_23x20_02.png → openstack-compute-api-2/src/figures/Check_mark_23x20_02.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 651 B

After

Width:  |  Height:  |  Size: 651 B

0
openstack-compute-api-1.1/src/figures/Check_mark_23x20_02.svg → openstack-compute-api-2/src/figures/Check_mark_23x20_02.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

0
openstack-compute-api-1.1/src/js/shjs/sh_java.js → openstack-compute-api-2/src/js/shjs/sh_java.js
View File

0
openstack-compute-api-1.1/src/js/shjs/sh_javascript.js → openstack-compute-api-2/src/js/shjs/sh_javascript.js
View File

0
openstack-compute-api-1.1/src/js/shjs/sh_main.js → openstack-compute-api-2/src/js/shjs/sh_main.js
View File

0
openstack-compute-api-1.1/src/js/shjs/sh_xml.js → openstack-compute-api-2/src/js/shjs/sh_xml.js
View File

0
openstack-compute-api-1.1/src/js/trc/schema/controller.js → openstack-compute-api-2/src/js/trc/schema/controller.js
View File

0
openstack-compute-api-1.1/src/js/trc/schema/layoutManager.js → openstack-compute-api-2/src/js/trc/schema/layoutManager.js
View File

0
openstack-compute-api-1.1/src/js/trc/schema/sampleManager.js → openstack-compute-api-2/src/js/trc/schema/sampleManager.js
View File

0
openstack-compute-api-1.1/src/js/trc/util.js → openstack-compute-api-2/src/js/trc/util.js
View File

6
openstack-compute-api-1.1/src/os-compute-1.1.wadl → openstack-compute-api-2/src/os-compute-2.wadl
View File

@ -7,7 +7,7 @@
<!-- --> <!-- -->
<!-- You can resolve the entites with xmllint --> <!-- You can resolve the entites with xmllint -->
<!-- --> <!-- -->
<!-- xmllint -noent os-compute-1.1.wadl --> <!-- xmllint -noent os-compute-2.wadl -->
<!--*******************************************************--> <!--*******************************************************-->
<!DOCTYPE application [<!ENTITY % common SYSTEM "common.ent"> <!DOCTYPE application [<!ENTITY % common SYSTEM "common.ent">
%common;]> %common;]>
@ -32,11 +32,11 @@
</grammars> </grammars>
<!--*******************************************************--> <!--*******************************************************-->
<!-- All Resoruces --> <!-- All Resources -->
<!--*******************************************************--> <!--*******************************************************-->
<resources base="https://servers.api.openstack.com"> <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="extensions" type="#ExtensionList" path="extensions">
<resource id="extension" path="{alias}"> <resource id="extension" path="{alias}">
<param name="alias" style="template" type="xsd:string"/> <param name="alias" style="template" type="xsd:string"/>

122
openstack-compute-api-1.1/src/os-compute-devguide.xml → openstack-compute-api-2/src/os-compute-devguide.xml
View File

@ -59,11 +59,12 @@
<year>2009</year> <year>2009</year>
<year>2010</year> <year>2010</year>
<year>2011</year> <year>2011</year>
<year>2012</year>
<holder>Rackspace US, Inc.</holder> <holder>Rackspace US, Inc.</holder>
</copyright> </copyright>
<releaseinfo>API v1.1</releaseinfo> <releaseinfo>API v2</releaseinfo>
<productname>OpenStack Compute</productname> <productname>OpenStack Compute</productname>
<pubdate>2011-11-08</pubdate> <pubdate>2012-02-14</pubdate>
<legalnotice role="apache2"> <legalnotice role="apache2">
<annotation> <annotation>
<remark>Copyright details are filled in by the template.</remark> <remark>Copyright details are filled in by the template.</remark>
@ -75,15 +76,27 @@
(<abbrev>API</abbrev>). </para> (<abbrev>API</abbrev>). </para>
</abstract> </abstract>
<revhistory> <revhistory>
<revision><!-- ... continue addding more revisions here as you change this document using the markup shown below... -->
<date>2012-02-14</date>
<revdescription>
<itemizedlist spacing="compact">
<listitem>
<para>Changed the name of the API version
from v1.1 to v2.</para>
</listitem>
<listitem>
<para>No longer use mimetype parameters to
denote version.</para>
</listitem>
</itemizedlist>
</revdescription></revision>
<revision> <revision>
<!-- ... continue addding more revisions here as you change this document using the markup shown below... -->
<date>2011-11-08</date> <date>2011-11-08</date>
<revdescription> <revdescription>
<itemizedlist spacing="compact"> <itemizedlist spacing="compact">
<listitem> <listitem>
<para>Removed DRAFT designation.</para> <para>Removed DRAFT designation.</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</revdescription> </revdescription>
</revision> </revision>
@ -649,7 +662,7 @@
<example> <example>
<title>Request with Headers: JSON</title> <title>Request with Headers: JSON</title>
<literallayout class="monospaced"> <literallayout class="monospaced">
POST /v1.1/214412/servers HTTP/1.1 POST /v2/214412/servers HTTP/1.1
Host: servers.api.openstack.org Host: servers.api.openstack.org
Content-Type: application/json Content-Type: application/json
Accept: application/xml Accept: application/xml
@ -681,7 +694,7 @@ Content-Type: application/xml; charset=UTF-8
<example> <example>
<title>Request with Extension: JSON</title> <title>Request with Extension: JSON</title>
<literallayout class="monospaced"> <literallayout class="monospaced">
POST /v1.1/214412/servers.xml HTTP/1.1 POST /v2/214412/servers.xml HTTP/1.1
Host: servers.api.openstack.org Host: servers.api.openstack.org
Content-Type: application/json Content-Type: application/json
X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb
@ -786,21 +799,19 @@ X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb
an empty collection. an empty collection.
</para> </para>
</note> </note>
<para> <para> For convenience, collections are required to
For convenience, collections are required to contain contain atom "next" links. They may optionally also
atom "next" links. They may optionally also contain contain "previous" links. The last page in the list
"previous" links. The last page in the list will not will not contain a "next" link. The following examples
contain a "next" link. The following examples illustrate three pages in a collection of images. The
illustrate three pages in a collection of images. The
first page was retrieved via a &GET; to first page was retrieved via a &GET; to
http://servers.api.openstack.org/v1.1/1234/images?limit=1. http://servers.api.openstack.org/v2/1234/images?limit=1.
In these examples, the <parameter>limit</parameter> In these examples, the <parameter>limit</parameter>
parameter sets the page size to a single item. parameter sets the page size to a single item.
Subsequent links will honor the initial page size. Subsequent links will honor the initial page size.
Thus, a client may follow links to traverse a Thus, a client may follow links to traverse a
paginated collection without having to input the paginated collection without having to input the
<parameter>marker</parameter> parameter. <parameter>marker</parameter> parameter. </para>
</para>
<?hard-pagebreak?> <?hard-pagebreak?>
<example> <example>
<title>Images Collection, First Page: XML</title> <title>Images Collection, First Page: XML</title>
@ -873,33 +884,31 @@ X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb
<section xml:id="ChangesSince"> <section xml:id="ChangesSince">
<title>Efficient Polling with the <title>Efficient Polling with the
<parameter>Changes-Since</parameter> Parameter</title> <parameter>Changes-Since</parameter> Parameter</title>
<para> <para> The ReST API allows you to poll for the status of
The ReST API allows you to poll for the status of
certain operations by performing a &GET; on various certain operations by performing a &GET; on various
elements. Rather than re-downloading and re-parsing elements. Rather than re-downloading and re-parsing
the full status at each polling interval, your ReST the full status at each polling interval, your ReST
client may use the client may use the
<parameter>changes-since</parameter> parameter to <parameter>changes-since</parameter> parameter to
check for changes since a previous request. The check for changes since a previous request. The
<parameter>changes-since</parameter> time is specified <parameter>changes-since</parameter> time is
as an <link specified as an <link
xlink:href="http://en.wikipedia.org/wiki/ISO_8601">ISO xlink:href="http://en.wikipedia.org/wiki/ISO_8601"
8601</link> dateTime (2011-01-24T17:08Z). The form >ISO 8601</link> dateTime (2011-01-24T17:08Z). The
for the timestamp is CCYY-MM-DDThh:mm:ss. An optional form for the timestamp is CCYY-MM-DDThh:mm:ss. An
time zone may be written in by appending the form optional time zone may be written in by appending the
&plusmn;hh:mm which describes the timezone as an form &plusmn;hh:mm which describes the timezone as an
offset from UTC. When the timezone is not specified offset from UTC. When the timezone is not specified
(2011-01-24T17:08), the UTC timezone will be assumed. (2011-01-24T17:08), the UTC timezone will be assumed.
If nothing has changed since the If nothing has changed since the
<parameter>changes-since</parameter> time, an empty <parameter>changes-since</parameter> time, an
list will be returned. If data has changed, only the empty list will be returned. If data has changed, only
items changed since the specified time will be the items changed since the specified time will be
returned in the response. For example, performing a returned in the response. For example, performing a
&GET; against &GET; against
https://api.servers.openstack.org/v1.1/224532/servers?<parameter>changes-since</parameter>=2011-01-24T17:08Z https://api.servers.openstack.org/v2/224532/servers?<parameter>changes-since</parameter>=2011-01-24T17:08Z
would list all servers that have changed since Mon, 24 would list all servers that have changed since Mon, 24
Jan 2011 17:08:00 UTC. Jan 2011 17:08:00 UTC. </para>
</para>
<para> <para>
In order to allow clients to keep track of changes, In order to allow clients to keep track of changes,
the changes-since filter displays items that have been the changes-since filter displays items that have been
@ -942,15 +951,13 @@ X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb
machine-processable form is intended to be used machine-processable form is intended to be used
directly by client applications. directly by client applications.
</para> </para>
<para> <para> The regular expression boundary matcher "^" for
The regular expression boundary matcher "^" for
the rate limit takes effect after the root URI the rate limit takes effect after the root URI
path. For example, the regular expression path. For example, the regular expression
^/servers would match the bolded portion of the ^/servers would match the bolded portion of the
following URI: following URI:
https://servers.api.openstack.org/v1.1/3542812<emphasis https://servers.api.openstack.org/v2/3542812<emphasis
role="bold">/servers</emphasis>. role="bold">/servers</emphasis>. </para>
</para>
<table rules="all"> <table rules="all">
<caption>Sample Rate Limits</caption> <caption>Sample Rate Limits</caption>
<thead> <thead>
@ -1124,34 +1131,32 @@ X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb
</section> </section>
<section xml:id="Versions-d1e1193"> <section xml:id="Versions-d1e1193">
<title>Versions</title> <title>Versions</title>
<para> <para> The OpenStack Compute API uses both a URI and a
The OpenStack Compute API uses both a URI and a MIME MIME type versioning scheme. In the URI scheme, the
type versioning scheme. In the URI scheme, the first first element of the path contains the target version
element of the path contains the target version
identifier (e.g. https://servers.api.openstack.org/ identifier (e.g. https://servers.api.openstack.org/
v1.0/&hellip;). The MIME type versioning scheme uses v1.0/&hellip;). The MIME type versioning scheme uses
HTTP content negotiation where the <code>Accept</code> HTTP content negotiation where the <code>Accept</code>
or <code>Content-Type</code> headers contains a MIME or <code>Content-Type</code> headers contains a MIME
type that identifies the version type that identifies the version
(application/vnd.openstack.compute+xml;version=1.1). A (application/vnd.openstack.compute.v2+xml). A
version MIME type is always linked to a base MIME type version MIME type is always linked to a base MIME type
(application/xml or application/json). If conflicting (application/xml or application/json). If conflicting
versions are specified using both an HTTP header and a versions are specified using both an HTTP header and a
URI, the URI takes precedence. URI, the URI takes precedence. </para>
</para>
<example> <example>
<title>Request with MIME type versioning</title> <title>Request with MIME type versioning</title>
<literallayout class="monospaced"> <literallayout class="monospaced">
GET /214412/images HTTP/1.1 GET /214412/images HTTP/1.1
Host: servers.api.openstack.org Host: servers.api.openstack.org
Accept: application/vnd.openstack.compute+xml;version=1.1 Accept: application/vnd.openstack.compute.v2+xml
X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb
</literallayout> </literallayout>
</example> </example>
<example> <example>
<title>Request with URI versioning</title> <title>Request with URI versioning</title>
<literallayout class="monospaced"> <literallayout class="monospaced">
GET /v1.1/214412/images HTTP/1.1 GET /v2/214412/images HTTP/1.1
Host: servers.api.openstack.org Host: servers.api.openstack.org
Accept: application/xml Accept: application/xml
X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb
@ -1250,27 +1255,25 @@ Host: servers.api.openstack.org
<programlisting language="javascript"><?db-font-size 80% ?><xi:include href="samples/versions.json" parse="text"/></programlisting> <programlisting language="javascript"><?db-font-size 80% ?><xi:include href="samples/versions.json" parse="text"/></programlisting>
</example> </example>
<?hard-pagebreak?> <?hard-pagebreak?>
<para> <para> You can also obtain additional information about a
You can also obtain additional information about a
specific version by performing a &GET; on the base specific version by performing a &GET; on the base
version URL version URL (e.g.
(e.g. https://servers.api.openstack.org/v1.1/). https://servers.api.openstack.org/v2/). Version
Version request URLs should always end with a trailing request URLs should always end with a trailing slash
slash (/). If the slash is omitted, the server may (/). If the slash is omitted, the server may respond
respond with a <returnvalue>302</returnvalue> with a <returnvalue>302</returnvalue> redirection
redirection request. Format extensions may be placed request. Format extensions may be placed after the
after the slash slash (e.g.
(e.g. https://servers.api.openstack.org/v1.1/.xml). Note https://servers.api.openstack.org/v2/.xml). Note
that this is a special case that does not hold true that this is a special case that does not hold true
for other API requests. In general, requests such as for other API requests. In general, requests such as
/servers.xml and /servers/.xml are handled /servers.xml and /servers/.xml are handled
equivalently. equivalently. </para>
</para>
<example> <example>
<title>Version Details Request</title> <title>Version Details Request</title>
<literallayout class="monospaced"> <literallayout class="monospaced">
GET HTTP/1.1 GET HTTP/1.1
Host: servers.api.openstack.org/v1.1/ Host: servers.api.openstack.org/v2/
</literallayout> </literallayout>
</example> </example>
<simpara> <simpara>
@ -1304,8 +1307,7 @@ Host: servers.api.openstack.org/v1.1/
<?hard-pagebreak?> <?hard-pagebreak?>
<example> <example>
<title>Version Details Response: JSON</title> <title>Version Details Response: JSON</title>
<programlisting language="javascript"><?db-font-size 90%?><xi:include <programlisting language="javascript"><?db-font-size 90%?><xi:include href="samples/version.json" parse="text"/></programlisting>
href="samples/version.json" parse="text"/></programlisting>
</example> </example>
<para> <para>
The detailed version response contains pointers to The detailed version response contains pointers to

0
openstack-compute-api-1.1/src/samples/address.json → openstack-compute-api-2/src/samples/address.json
View File

0
openstack-compute-api-1.1/src/samples/address.xml → openstack-compute-api-2/src/samples/address.xml
View File

0
openstack-compute-api-1.1/src/samples/addresses.json → openstack-compute-api-2/src/samples/addresses.json
View File

0
openstack-compute-api-1.1/src/samples/addresses.xml → openstack-compute-api-2/src/samples/addresses.xml
View File

0
openstack-compute-api-1.1/src/samples/backupInProgress.json → openstack-compute-api-2/src/samples/backupInProgress.json
View File

0
openstack-compute-api-1.1/src/samples/backupInProgress.xml → openstack-compute-api-2/src/samples/backupInProgress.xml
View File

0
openstack-compute-api-1.1/src/samples/badmediatype.json → openstack-compute-api-2/src/samples/badmediatype.json
View File

0
openstack-compute-api-1.1/src/samples/badmediatype.xml → openstack-compute-api-2/src/samples/badmediatype.xml
View File

0
openstack-compute-api-1.1/src/samples/badmethod.json → openstack-compute-api-2/src/samples/badmethod.json
View File

0
openstack-compute-api-1.1/src/samples/badmethod.xml → openstack-compute-api-2/src/samples/badmethod.xml
View File

0
openstack-compute-api-1.1/src/samples/badrequest.json → openstack-compute-api-2/src/samples/badrequest.json
View File

0
openstack-compute-api-1.1/src/samples/badrequest.xml → openstack-compute-api-2/src/samples/badrequest.xml
View File

0
openstack-compute-api-1.1/src/samples/build.json → openstack-compute-api-2/src/samples/build.json
View File

0
openstack-compute-api-1.1/src/samples/build.xml → openstack-compute-api-2/src/samples/build.xml
View File

0
openstack-compute-api-1.1/src/samples/changepassword.json → openstack-compute-api-2/src/samples/changepassword.json
View File

0
openstack-compute-api-1.1/src/samples/changepassword.xml → openstack-compute-api-2/src/samples/changepassword.xml
View File

12
openstack-compute-api-1.1/src/samples/choices.json → openstack-compute-api-2/src/samples/choices.json
View File

@ -12,31 +12,31 @@
"media-types": [ "media-types": [
{ {
"base": "application/xml", "base": "application/xml",
"type": "application/vnd.openstack.compute+xml;version=1.0" "type": "application/vnd.openstack.compute.v1.0+xml"
}, },
{ {
"base": "application/json", "base": "application/json",
"type": "application/vnd.openstack.compute+json;version=1.0" "type": "application/vnd.openstack.compute.v1.0+json"
} }
] ]
}, },
{ {
"id": "v1.1", "id": "v2",
"status": "CURRENT", "status": "CURRENT",
"links": [ "links": [
{ {
"rel": "self", "rel": "self",
"href": "http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f6af67565" "href": "http://servers.api.openstack.org/v2/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"
} }
], ],
"media-types": [ "media-types": [
{ {
"base": "application/xml", "base": "application/xml",
"type": "application/vnd.openstack.compute+xml;version=1.0" "type": "application/vnd.openstack.compute.v2+xml"
}, },
{ {
"base": "application/json", "base": "application/json",
"type": "application/vnd.openstack.compute+json;version=1.0" "type": "application/vnd.openstack.compute.v2+json"
} }
] ]
} }

12
openstack-compute-api-1.1/src/samples/choices.xml → openstack-compute-api-2/src/samples/choices.xml
View File

@ -5,24 +5,24 @@
<version id="v1.0" status="DEPRECATED"> <version id="v1.0" status="DEPRECATED">
<media-types> <media-types>
<media-type base="application/xml" <media-type base="application/xml"
type="application/vnd.openstack.compute+xml;version=1.0"/> type="application/vnd.openstack.compute.v1.0+xml"/>
<media-type base="application/json" <media-type base="application/json"
type="application/vnd.openstack.compute+json;version=1.0"/> type="application/vnd.openstack.compute.v1.0+json"/>
</media-types> </media-types>
<atom:link rel="self" <atom:link rel="self"
href="http://servers.api.openstack.org/v1.0/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"/> href="http://servers.api.openstack.org/v1.0/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"/>
</version> </version>
<version id="v1.1" status="CURRENT"> <version id="v2" status="CURRENT">
<media-types> <media-types>
<media-type base="application/xml" <media-type base="application/xml"
type="application/vnd.openstack.compute+xml;version=1.1"/> type="application/vnd.openstack.compute.v2+xml"/>
<media-type base="application/json" <media-type base="application/json"
type="application/vnd.openstack.compute+json;version=1.1"/> type="application/vnd.openstack.compute.v2+xml"/>
</media-types> </media-types>
<atom:link rel="self" <atom:link rel="self"
href="http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"/> href="http://servers.api.openstack.org/v2/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"/>
</version> </version>
</choices> </choices>

0
openstack-compute-api-1.1/src/samples/confirmresize.json → openstack-compute-api-2/src/samples/confirmresize.json
View File

0
openstack-compute-api-1.1/src/samples/confirmresize.xml → openstack-compute-api-2/src/samples/confirmresize.xml
View File

0
openstack-compute-api-1.1/src/samples/createimage.json → openstack-compute-api-2/src/samples/createimage.json
View File

0
openstack-compute-api-1.1/src/samples/createimage.xml → openstack-compute-api-2/src/samples/createimage.xml
View File

0
openstack-compute-api-1.1/src/samples/ext-action.json → openstack-compute-api-2/src/samples/ext-action.json
View File

0
openstack-compute-api-1.1/src/samples/ext-action.xml → openstack-compute-api-2/src/samples/ext-action.xml
View File

10
openstack-compute-api-1.1/src/samples/ext-server.json → openstack-compute-api-2/src/samples/ext-server.json
View File

@ -2,8 +2,8 @@
"server": { "server": {
"id": "52415800-8b69-11e0-9b19-734f000004d2", "id": "52415800-8b69-11e0-9b19-734f000004d2",
"name": "sample-server", "name": "sample-server",
"imageRef": "https://servers.api.rackspacecloud.com/v1.1/32278/images/52415800-8b69-11e0-9b19-734f5736d2a2", "imageRef": "https://servers.api.rackspacecloud.com/v2/32278/images/52415800-8b69-11e0-9b19-734f5736d2a2",
"flavorRef": "https://servers.api.rackspacecloud.com/v1.1/32278/flavors/52415800-8b69-11e0-9b19-734f1195ff37", "flavorRef": "https://servers.api.rackspacecloud.com/v2/32278/flavors/52415800-8b69-11e0-9b19-734f1195ff37",
"updated": "2010-10-10T12:00:00Z", "updated": "2010-10-10T12:00:00Z",
"created": "2010-08-10T12:00:00Z", "created": "2010-08-10T12:00:00Z",
"hostId": "e4d909c290d0fb1ca068ffaddf22cbd0", "hostId": "e4d909c290d0fb1ca068ffaddf22cbd0",
@ -53,16 +53,16 @@
"links": [ "links": [
{ {
"rel": "self", "rel": "self",
"href": "http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f000004d2" "href": "http://servers.api.openstack.org/v2/1234/servers/52415800-8b69-11e0-9b19-734f000004d2"
}, },
{ {
"rel": "bookmark", "rel": "bookmark",
"type": "application/vnd.openstack.compute-v1.1+xml", "type": "application/vnd.openstack.compute-v2+xml",
"href": "http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f000004d2" "href": "http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f000004d2"
}, },
{ {
"rel": "bookmark", "rel": "bookmark",
"type": "application/vnd.openstack.compute-v1.1+json", "type": "application/vnd.openstack.compute-v2+json",
"href": "http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f000004d2" "href": "http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f000004d2"
} }
] ]

10
openstack-compute-api-1.1/src/samples/ext-server.xml → openstack-compute-api-2/src/samples/ext-server.xml
View File

@ -3,13 +3,13 @@
xmlns:atom="http://www.w3.org/2005/Atom" xmlns:atom="http://www.w3.org/2005/Atom"
xmlns:aide="http://docs.rackspacecloud.com/servers/api/ext/aide/v1.0" xmlns:aide="http://docs.rackspacecloud.com/servers/api/ext/aide/v1.0"
id="52415800-8b69-11e0-9b19-734f000004d2" name="sample-server" id="52415800-8b69-11e0-9b19-734f000004d2" name="sample-server"
flavorRef="https://servers.api.rackspacecloud.com/v1.1/32278/flavors/52415800-8b69-11e0-9b19-734f1195ff37" flavorRef="https://servers.api.rackspacecloud.com/v2/32278/flavors/52415800-8b69-11e0-9b19-734f1195ff37"
status="BUILD" status="BUILD"
updated="2010-10-10T12:00:00Z" updated="2010-10-10T12:00:00Z"
created="2010-08-10T12:00:00Z" created="2010-08-10T12:00:00Z"
progress="60" hostId="e4d909c290d0fb1ca068ffaddf22cbd0" progress="60" hostId="e4d909c290d0fb1ca068ffaddf22cbd0"
aide:affinityId="1fdfe1e2-03f0-102f-b7ae-005056bb5f9e" aide:affinityId="1fdfe1e2-03f0-102f-b7ae-005056bb5f9e"
imageRef="https://servers.api.rackspacecloud.com/v1.1/32278/images/52415800-8b69-11e0-9b19-734f5736d2a2"> imageRef="https://servers.api.rackspacecloud.com/v2/32278/images/52415800-8b69-11e0-9b19-734f5736d2a2">
<metadata> <metadata>
<meta key="Server Label">Web Head 1</meta> <meta key="Server Label">Web Head 1</meta>
<meta key="Image Version">2.1</meta> <meta key="Image Version">2.1</meta>
@ -28,13 +28,13 @@
</addresses> </addresses>
<atom:link <atom:link
rel="self" rel="self"
href="http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f000004d2"/> href="http://servers.api.openstack.org/v2/1234/servers/52415800-8b69-11e0-9b19-734f000004d2"/>
<atom:link <atom:link
rel="bookmark" rel="bookmark"
type="application/vnd.openstack.compute-v1.1+xml" type="application/vnd.openstack.compute-v2+xml"
href="http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f000004d2"/> href="http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f000004d2"/>
<atom:link <atom:link
rel="bookmark" rel="bookmark"
type="application/vnd.openstack.compute-v1.1+json" type="application/vnd.openstack.compute-v2+json"
href="http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f000004d2"/> href="http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f000004d2"/>
</server> </server>

6
openstack-compute-api-1.1/src/samples/ext-servers.json → openstack-compute-api-2/src/samples/ext-servers.json
View File

@ -17,7 +17,7 @@
"links": [ "links": [
{ {
"rel": "self", "rel": "self",
"href": "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54" "href": "http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"
}, },
{ {
"rel": "bookmark", "rel": "bookmark",
@ -30,7 +30,7 @@
"links": [ "links": [
{ {
"rel": "self", "rel": "self",
"href": "http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd" "href": "http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"
}, },
{ {
"rel": "bookmark", "rel": "bookmark",
@ -75,7 +75,7 @@
"links": [ "links": [
{ {
"rel": "self", "rel": "self",
"href": "http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f6af67565" "href": "http://servers.api.openstack.org/v2/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"
}, },
{ {
"rel": "bookmark", "rel": "bookmark",

6
openstack-compute-api-1.1/src/samples/ext-servers.xml → openstack-compute-api-2/src/samples/ext-servers.xml
View File

@ -12,7 +12,7 @@
<image id="52415800-8b69-11e0-9b19-734f6f006e54"> <image id="52415800-8b69-11e0-9b19-734f6f006e54">
<atom:link <atom:link
rel="self" rel="self"
href="http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"/> href="http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"/>
<atom:link <atom:link
rel="bookmark" rel="bookmark"
href="http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"/> href="http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"/>
@ -20,7 +20,7 @@
<flavor id="52415800-8b69-11e0-9b19-734f216543fd"> <flavor id="52415800-8b69-11e0-9b19-734f216543fd">
<atom:link <atom:link
rel="self" rel="self"
href="http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/> href="http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/>
<atom:link <atom:link
rel="bookmark" rel="bookmark"
href="http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/> href="http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/>
@ -43,7 +43,7 @@
</addresses> </addresses>
<atom:link <atom:link
rel="self" rel="self"
href="http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"/> href="http://servers.api.openstack.org/v2/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"/>
<atom:link <atom:link
rel="bookmark" rel="bookmark"
href="http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"/> href="http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"/>

0
openstack-compute-api-1.1/src/samples/extension.json → openstack-compute-api-2/src/samples/extension.json
View File

0
openstack-compute-api-1.1/src/samples/extension.xml → openstack-compute-api-2/src/samples/extension.xml
View File

0
openstack-compute-api-1.1/src/samples/extension2.json → openstack-compute-api-2/src/samples/extension2.json
View File

0
openstack-compute-api-1.1/src/samples/extension2.xml → openstack-compute-api-2/src/samples/extension2.xml
View File

0
openstack-compute-api-1.1/src/samples/extension3.json → openstack-compute-api-2/src/samples/extension3.json
View File

0
openstack-compute-api-1.1/src/samples/extension3.xml → openstack-compute-api-2/src/samples/extension3.xml
View File

0
openstack-compute-api-1.1/src/samples/extension4.json → openstack-compute-api-2/src/samples/extension4.json
View File

0
openstack-compute-api-1.1/src/samples/extension4.xml → openstack-compute-api-2/src/samples/extension4.xml
View File

0
openstack-compute-api-1.1/src/samples/extensions.json → openstack-compute-api-2/src/samples/extensions.json
View File

0
openstack-compute-api-1.1/src/samples/extensions.xml → openstack-compute-api-2/src/samples/extensions.xml
View File

0
openstack-compute-api-1.1/src/samples/fault.json → openstack-compute-api-2/src/samples/fault.json
View File

0
openstack-compute-api-1.1/src/samples/fault.xml → openstack-compute-api-2/src/samples/fault.xml
View File

2
openstack-compute-api-1.1/src/samples/flavor.json → openstack-compute-api-2/src/samples/flavor.json
View File

@ -8,7 +8,7 @@
"links": [ "links": [
{ {
"rel" : "self", "rel" : "self",
"href" : "http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37" "href" : "http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"
}, },
{ {
"rel" : "bookmark", "rel" : "bookmark",

2
openstack-compute-api-1.1/src/samples/flavor.xml → openstack-compute-api-2/src/samples/flavor.xml
View File

@ -6,7 +6,7 @@
name="256 MB Server" ram="256" disk="10" vcpus="1"> name="256 MB Server" ram="256" disk="10" vcpus="1">
<atom:link <atom:link
rel="self" rel="self"
href="http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/> href="http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/>
<atom:link <atom:link
rel="bookmark" rel="bookmark"
href="http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/> href="http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/>

6
openstack-compute-api-1.1/src/samples/flavors-page1-sp.xml → openstack-compute-api-2/src/samples/flavors-page1-sp.xml
View File

@ -8,7 +8,7 @@
name="256 MB Server"> name="256 MB Server">
<atom:link <atom:link
rel="self" rel="self"
href="http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/> href="http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/>
<atom:link <atom:link
rel="bookmark" rel="bookmark"
href="http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/> href="http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/>
@ -17,12 +17,12 @@
name="512 MB Server"> name="512 MB Server">
<atom:link <atom:link
rel="self" rel="self"
href="http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/> href="http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/>
<atom:link <atom:link
rel="bookmark" rel="bookmark"
href="http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/> href="http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/>
</flavor> </flavor>
<atom:link <atom:link
rel="next" rel="next"
href="http://servers.api.openstack.org/v1.1/1234/flavors?limit=2&amp;marker=52415800-8b69-11e0-9b19-734f216543fd"/> href="http://servers.api.openstack.org/v2/1234/flavors?limit=2&amp;marker=52415800-8b69-11e0-9b19-734f216543fd"/>
</flavors> </flavors>

6
openstack-compute-api-1.1/src/samples/flavors-page1.json → openstack-compute-api-2/src/samples/flavors-page1.json
View File

@ -9,7 +9,7 @@
"links": [ "links": [
{ {
"rel": "self", "rel": "self",
"href": "http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37" "href": "http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"
}, },
{ {
"rel": "bookmark", "rel": "bookmark",
@ -26,7 +26,7 @@
"links": [ "links": [
{ {
"rel": "self", "rel": "self",
"href": "http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd" "href": "http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"
}, },
{ {
"rel": "bookmark", "rel": "bookmark",
@ -38,7 +38,7 @@
"flavors_links": [ "flavors_links": [
{ {
"rel": "next", "rel": "next",
"href": "http://servers.api.openstack.org/v1.1/1234/flavors?limit=2&marker=52415800-8b69-11e0-9b19-734f216543fd" "href": "http://servers.api.openstack.org/v2/1234/flavors?limit=2&marker=52415800-8b69-11e0-9b19-734f216543fd"
} }
] ]
} }

6
openstack-compute-api-1.1/src/samples/flavors-page1.xml → openstack-compute-api-2/src/samples/flavors-page1.xml
View File

@ -5,7 +5,7 @@
name="256 MB Server" ram="256" disk="10" vcpus="1"> name="256 MB Server" ram="256" disk="10" vcpus="1">
<atom:link <atom:link
rel="self" rel="self"
href="http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/> href="http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/>
<atom:link <atom:link
rel="bookmark" rel="bookmark"
href="http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/> href="http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/>
@ -14,12 +14,12 @@
name="512 MB Server" ram="512" disk="20" vcpus="2"> name="512 MB Server" ram="512" disk="20" vcpus="2">
<atom:link <atom:link
rel="self" rel="self"
href="http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/> href="http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/>
<atom:link <atom:link
rel="bookmark" rel="bookmark"
href="http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/> href="http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/>
</flavor> </flavor>
<atom:link <atom:link
rel="next" rel="next"
href="http://servers.api.openstack.org/v1.1/1234/flavors?limit=2&amp;marker=52415800-8b69-11e0-9b19-734f216543fd"/> href="http://servers.api.openstack.org/v2/1234/flavors?limit=2&amp;marker=52415800-8b69-11e0-9b19-734f216543fd"/>
</flavors> </flavors>

4
openstack-compute-api-1.1/src/samples/flavors.json → openstack-compute-api-2/src/samples/flavors.json
View File

@ -9,7 +9,7 @@
"links": [ "links": [
{ {
"rel": "self", "rel": "self",
"href": "http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37" "href": "http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"
}, },
{ {
"rel": "bookmark", "rel": "bookmark",
@ -26,7 +26,7 @@
"links": [ "links": [
{ {
"rel": "self", "rel": "self",
"href": "http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd" "href": "http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"
}, },
{ {
"rel": "bookmark", "rel": "bookmark",

4
openstack-compute-api-1.1/src/samples/flavors.xml → openstack-compute-api-2/src/samples/flavors.xml
View File

@ -5,7 +5,7 @@
name="256 MB Server" ram="256" disk="10" vcpus="1"> name="256 MB Server" ram="256" disk="10" vcpus="1">
<atom:link <atom:link
rel="self" rel="self"
href="http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/> href="http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/>
<atom:link <atom:link
rel="bookmark" rel="bookmark"
href="http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/> href="http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/>
@ -14,7 +14,7 @@
name="512 MB Server" ram="512" disk="20" vcpus="2"> name="512 MB Server" ram="512" disk="20" vcpus="2">
<atom:link <atom:link
rel="self" rel="self"
href="http://servers.api.openstack.org/v1.1/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/> href="http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/>
<atom:link <atom:link
rel="bookmark" rel="bookmark"
href="http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/> href="http://servers.api.openstack.org/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/>

0
openstack-compute-api-1.1/src/samples/forbidden.json → openstack-compute-api-2/src/samples/forbidden.json
View File

0
openstack-compute-api-1.1/src/samples/forbidden.xml → openstack-compute-api-2/src/samples/forbidden.xml
View File

2
openstack-compute-api-1.1/src/samples/image-fault.json → openstack-compute-api-2/src/samples/image-fault.json
View File

@ -16,7 +16,7 @@
"links": [ "links": [
{ {
"rel" : "self", "rel" : "self",
"href" : "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2" "href" : "http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
}, },
{ {
"rel" : "bookmark", "rel" : "bookmark",

2
openstack-compute-api-1.1/src/samples/image-fault.xml → openstack-compute-api-2/src/samples/image-fault.xml
View File

@ -13,7 +13,7 @@
</fault> </fault>
<atom:link <atom:link
rel="self" rel="self"
href="http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/> href="http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/>
<atom:link <atom:link
rel="bookmark" rel="bookmark"
href="http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/> href="http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/>

4
openstack-compute-api-1.1/src/samples/image-meta-page1.json → openstack-compute-api-2/src/samples/image-meta-page1.json
View File

@ -9,13 +9,13 @@
"metadata_links": [ "metadata_links": [
{ {
"rel": "next", "rel": "next",
"href": "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54/meta?marker=ImageType" "href": "http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f6f006e54/meta?marker=ImageType"
} }
], ],
"links": [ "links": [
{ {
"rel": "self", "rel": "self",
"href": "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54" "href": "http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"
} }
] ]
} }

4
openstack-compute-api-1.1/src/samples/image-meta-page1.xml → openstack-compute-api-2/src/samples/image-meta-page1.xml
View File

@ -9,9 +9,9 @@
<meta key="ImageType">Gold</meta> <meta key="ImageType">Gold</meta>
<atom:link <atom:link
rel="next" rel="next"
href="http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54/meta?marker=ImageType"/> href="http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f6f006e54/meta?marker=ImageType"/>
</metadata> </metadata>
<atom:link <atom:link
rel="self" rel="self"
href="http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"/> href="http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"/>
</image> </image>

2
openstack-compute-api-1.1/src/samples/image-simple.json → openstack-compute-api-2/src/samples/image-simple.json
View File

@ -5,7 +5,7 @@
"links": [ "links": [
{ {
"rel" : "self", "rel" : "self",
"href" : "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2" "href" : "http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
}, },
{ {
"rel" : "bookmark", "rel" : "bookmark",

2
openstack-compute-api-1.1/src/samples/image-simple.xml → openstack-compute-api-2/src/samples/image-simple.xml
View File

@ -6,7 +6,7 @@
name="My Server Backup"> name="My Server Backup">
<atom:link <atom:link
rel="self" rel="self"
href="http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/> href="http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/>
<atom:link <atom:link
rel="bookmark" rel="bookmark"
href="http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/> href="http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/>

4
openstack-compute-api-1.1/src/samples/image.json → openstack-compute-api-2/src/samples/image.json
View File

@ -15,7 +15,7 @@
"links": [ "links": [
{ {
"rel": "self", "rel": "self",
"href": "http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3" "href": "http://servers.api.openstack.org/v2/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3"
}, },
{ {
"rel": "bookmark", "rel": "bookmark",
@ -26,7 +26,7 @@
"links": [ "links": [
{ {
"rel" : "self", "rel" : "self",
"href" : "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2" "href" : "http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
}, },
{ {
"rel" : "bookmark", "rel" : "bookmark",

4
openstack-compute-api-1.1/src/samples/image.xml → openstack-compute-api-2/src/samples/image.xml
View File

@ -13,14 +13,14 @@
<server id="52415800-8b69-11e0-9b19-734f335aa7b3"> <server id="52415800-8b69-11e0-9b19-734f335aa7b3">
<atom:link <atom:link
rel="self" rel="self"
href="http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3"/> href="http://servers.api.openstack.org/v2/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3"/>
<atom:link <atom:link
rel="bookmark" rel="bookmark"
href="http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3"/> href="http://servers.api.openstack.org/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3"/>
</server> </server>
<atom:link <atom:link
rel="self" rel="self"
href="http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/> href="http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/>
<atom:link <atom:link
rel="bookmark" rel="bookmark"
href="http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/> href="http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/>

6
openstack-compute-api-1.1/src/samples/images-page1-sp.xml → openstack-compute-api-2/src/samples/images-page1-sp.xml
View File

@ -7,7 +7,7 @@
name="CentOS 5.2"> name="CentOS 5.2">
<atom:link <atom:link
rel="self" rel="self"
href="http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"/> href="http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"/>
<atom:link <atom:link
rel="bookmark" rel="bookmark"
href="http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"/> href="http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"/>
@ -17,12 +17,12 @@
name="My Server Backup"> name="My Server Backup">
<atom:link <atom:link
rel="self" rel="self"
href="http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/> href="http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/>
<atom:link <atom:link
rel="bookmark" rel="bookmark"
href="http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/> href="http://servers.api.openstack.org/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/>
</image> </image>
<atom:link <atom:link
rel="next" rel="next"
href="http://servers.api.openstack.org/v1.1/1234/images?limit=1&amp;marker=52415800-8b69-11e0-9b19-734f6f006e54"/> href="http://servers.api.openstack.org/v2/1234/images?limit=1&amp;marker=52415800-8b69-11e0-9b19-734f6f006e54"/>
</images> </images>

4
openstack-compute-api-1.1/src/samples/images-page1.json → openstack-compute-api-2/src/samples/images-page1.json
View File

@ -6,7 +6,7 @@
"links": [ "links": [
{ {
"rel": "self", "rel": "self",
"href": "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54" "href": "http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"
} }
] ]
} }
@ -14,7 +14,7 @@
"images_links" : [ "images_links" : [
{ {
"rel": "next", "rel": "next",
"href": "http://servers.api.openstack.org/v1.1/1234/images?limit=1&marker=52415800-8b69-11e0-9b19-734f6f006e54" "href": "http://servers.api.openstack.org/v2/1234/images?limit=1&marker=52415800-8b69-11e0-9b19-734f6f006e54"
} }
] ]
} }

4
openstack-compute-api-1.1/src/samples/images-page1.xml → openstack-compute-api-2/src/samples/images-page1.xml
View File

@ -5,9 +5,9 @@
name="CentOS 5.2"> name="CentOS 5.2">
<atom:link <atom:link
rel="self" rel="self"
href="http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"/> href="http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"/>
</image> </image>
<atom:link <atom:link
rel="next" rel="next"
href="http://servers.api.openstack.org/v1.1/1234/images?limit=1&amp;marker=52415800-8b69-11e0-9b19-734f6f006e54"/> href="http://servers.api.openstack.org/v2/1234/images?limit=1&amp;marker=52415800-8b69-11e0-9b19-734f6f006e54"/>
</images> </images>

4
openstack-compute-api-1.1/src/samples/images-page2.json → openstack-compute-api-2/src/samples/images-page2.json
View File

@ -6,7 +6,7 @@
"links": [ "links": [
{ {
"rel" : "self", "rel" : "self",
"href" : "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2" "href" : "http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
} }
] ]
} }
@ -14,7 +14,7 @@
"images_links": [ "images_links": [
{ {
"rel" : "next", "rel" : "next",
"href" : "http://servers.api.openstack.org/v1.1/1234/images?limit=1&marker=52415800-8b69-11e0-9b19-734f5736d2a2" "href" : "http://servers.api.openstack.org/v2/1234/images?limit=1&marker=52415800-8b69-11e0-9b19-734f5736d2a2"
} }
] ]
} }

4
openstack-compute-api-1.1/src/samples/images-page2.xml → openstack-compute-api-2/src/samples/images-page2.xml
View File

@ -4,8 +4,8 @@
<image id="52415800-8b69-11e0-9b19-734f5736d2a2" name="My Server Backup"> <image id="52415800-8b69-11e0-9b19-734f5736d2a2" name="My Server Backup">
<atom:link <atom:link
rel="self" rel="self"
href="http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/> href="http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/>
</image> </image>
<atom:link rel="next" <atom:link rel="next"
href="http://servers.api.openstack.org/v1.1/1234/images?limit=1&amp;marker=52415800-8b69-11e0-9b19-734f5736d2a2"/> href="http://servers.api.openstack.org/v2/1234/images?limit=1&amp;marker=52415800-8b69-11e0-9b19-734f5736d2a2"/>
</images> </images>

2
openstack-compute-api-1.1/src/samples/images-page3.json → openstack-compute-api-2/src/samples/images-page3.json
View File

@ -6,7 +6,7 @@
"links": [ "links": [
{ {
"rel": "self", "rel": "self",
"href": "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6ff7c475" "href": "http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f6ff7c475"
} }
] ]
} }

2
openstack-compute-api-1.1/src/samples/images-page3.xml → openstack-compute-api-2/src/samples/images-page3.xml
View File

@ -5,6 +5,6 @@
name="Backup 2"> name="Backup 2">
<atom:link <atom:link
rel="self" rel="self"
href="http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6ff7c475"/> href="http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f6ff7c475"/>
</image> </image>
</images> </images>

6
openstack-compute-api-1.1/src/samples/images.json → openstack-compute-api-2/src/samples/images.json
View File

@ -15,7 +15,7 @@
"links": [ "links": [
{ {
"rel": "self", "rel": "self",
"href": "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f6f006e54" "href": "http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"
}, },
{ {
"rel": "bookmark", "rel": "bookmark",
@ -39,7 +39,7 @@
"links": [ "links": [
{ {
"rel": "self", "rel": "self",
"href": "http://servers.api.openstack.org/v1.1/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3" "href": "http://servers.api.openstack.org/v2/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3"
}, },
{ {
"rel": "bookmark", "rel": "bookmark",
@ -50,7 +50,7 @@
"links": [ "links": [
{ {
"rel" : "self", "rel" : "self",
"href" : "http://servers.api.openstack.org/v1.1/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2" "href" : "http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"
}, },
{ {
"rel" : "bookmark", "rel" : "bookmark",

Some files were not shown because too many files have changed in this diff Show More