diff --git a/openstack-compute-api-1.1/src/samples/addip.json b/openstack-compute-api-1.1/src/samples/addip.json deleted file mode 100644 index 5aeb925..0000000 --- a/openstack-compute-api-1.1/src/samples/addip.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "addIp" : { - "configureServer" : true - } -} diff --git a/openstack-compute-api-1.1/src/samples/addip.xml b/openstack-compute-api-1.1/src/samples/addip.xml deleted file mode 100644 index b00defa..0000000 --- a/openstack-compute-api-1.1/src/samples/addip.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/openstack-compute-api-1.1/src/samples/backup.json b/openstack-compute-api-1.1/src/samples/backup.json deleted file mode 100644 index 824e549..0000000 --- a/openstack-compute-api-1.1/src/samples/backup.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "backupSchedule" : { - "enabled" : true, - "weekly" : "THURSDAY", - "daily" : "H_0400_0600" - } -} diff --git a/openstack-compute-api-1.1/src/samples/backup.xml b/openstack-compute-api-1.1/src/samples/backup.xml deleted file mode 100644 index 9cb61e9..0000000 --- a/openstack-compute-api-1.1/src/samples/backup.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/openstack-compute-api-1.1/src/samples/ipgroup.json b/openstack-compute-api-1.1/src/samples/ipgroup.json deleted file mode 100644 index b381552..0000000 --- a/openstack-compute-api-1.1/src/samples/ipgroup.json +++ /dev/null @@ -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" - } - ] - } -} diff --git a/openstack-compute-api-1.1/src/samples/ipgroup.xml b/openstack-compute-api-1.1/src/samples/ipgroup.xml deleted file mode 100644 index d11328a..0000000 --- a/openstack-compute-api-1.1/src/samples/ipgroup.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - diff --git a/openstack-compute-api-1.1/src/samples/ipgroup2.json b/openstack-compute-api-1.1/src/samples/ipgroup2.json deleted file mode 100644 index 3dcd661..0000000 --- a/openstack-compute-api-1.1/src/samples/ipgroup2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "sharedIpGroup" : { - "name" : "Shared IP Group 1", - "server" : "52415800-8b69-11e0-9b19-734f0272444a" - } -} diff --git a/openstack-compute-api-1.1/src/samples/ipgroup2.xml b/openstack-compute-api-1.1/src/samples/ipgroup2.xml deleted file mode 100644 index f193ee8..0000000 --- a/openstack-compute-api-1.1/src/samples/ipgroup2.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/openstack-compute-api-1.1/src/samples/ipgroups-page1.json b/openstack-compute-api-1.1/src/samples/ipgroups-page1.json deleted file mode 100644 index fb88f95..0000000 --- a/openstack-compute-api-1.1/src/samples/ipgroups-page1.json +++ /dev/null @@ -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" - } - ] - } -} diff --git a/openstack-compute-api-1.1/src/samples/ipgroups-page1.xml b/openstack-compute-api-1.1/src/samples/ipgroups-page1.xml deleted file mode 100644 index c6b7820..0000000 --- a/openstack-compute-api-1.1/src/samples/ipgroups-page1.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/openstack-compute-api-1.1/src/samples/ipgroups.json b/openstack-compute-api-1.1/src/samples/ipgroups.json deleted file mode 100644 index 4f62932..0000000 --- a/openstack-compute-api-1.1/src/samples/ipgroups.json +++ /dev/null @@ -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" - } - ] - } - ] -} diff --git a/openstack-compute-api-1.1/src/samples/ipgroups.xml b/openstack-compute-api-1.1/src/samples/ipgroups.xml deleted file mode 100644 index 0dd64eb..0000000 --- a/openstack-compute-api-1.1/src/samples/ipgroups.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/openstack-compute-api-1.1/src/samples/ipv6AddressRange.json b/openstack-compute-api-1.1/src/samples/ipv6AddressRange.json deleted file mode 100644 index e54143c..0000000 --- a/openstack-compute-api-1.1/src/samples/ipv6AddressRange.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "ipv6AddressRange": - { - "value":"2001:4800:7800:0500:DA39:A3EE:FF00:0000/96" - } -} diff --git a/openstack-compute-api-1.1/src/samples/ipv6AddressRange.xml b/openstack-compute-api-1.1/src/samples/ipv6AddressRange.xml deleted file mode 100644 index c7909de..0000000 --- a/openstack-compute-api-1.1/src/samples/ipv6AddressRange.xml +++ /dev/null @@ -1,3 +0,0 @@ - - \ No newline at end of file diff --git a/openstack-compute-api-1.1/src/samples/shareip.json b/openstack-compute-api-1.1/src/samples/shareip.json deleted file mode 100644 index 7b475e4..0000000 --- a/openstack-compute-api-1.1/src/samples/shareip.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "RS-SIPE:shareIp" : { - "sharedIpGroupId" : 1234, - "configureServer" : true - } -} diff --git a/openstack-compute-api-1.1/src/samples/shareip.xml b/openstack-compute-api-1.1/src/samples/shareip.xml deleted file mode 100644 index 43f47aa..0000000 --- a/openstack-compute-api-1.1/src/samples/shareip.xml +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/openstack-compute-api-1.1/src/samples/snapshot.json b/openstack-compute-api-1.1/src/samples/snapshot.json deleted file mode 100644 index 9866849..0000000 --- a/openstack-compute-api-1.1/src/samples/snapshot.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "snapshot" : { - "imageName" : "Just in case" - } -} diff --git a/openstack-compute-api-1.1/src/samples/snapshot.xml b/openstack-compute-api-1.1/src/samples/snapshot.xml deleted file mode 100644 index 9e8820f..0000000 --- a/openstack-compute-api-1.1/src/samples/snapshot.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/openstack-compute-api-1.1/src/samples/version2.xml b/openstack-compute-api-1.1/src/samples/version2.xml deleted file mode 100644 index 8cdd65d..0000000 --- a/openstack-compute-api-1.1/src/samples/version2.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/openstack-compute-api-1.1/pom.xml b/openstack-compute-api-2/pom.xml similarity index 92% rename from openstack-compute-api-1.1/pom.xml rename to openstack-compute-api-2/pom.xml index cecb5d9..94999a7 100644 --- a/openstack-compute-api-1.1/pom.xml +++ b/openstack-compute-api-2/pom.xml @@ -50,7 +50,7 @@ com.rackspace.cloud.api clouddocs-maven-plugin - 1.0.7 + 1.0.9 goal1 @@ -100,37 +100,37 @@ - + - + - + - + - + - + + todir="${basedir}/target/docbkx/webhelp/api/openstack-compute/2/"> @@ -146,7 +146,7 @@ + tofile="${basedir}/target/docbkx/webhelp/api/openstack-compute/2/os-compute-devguide-2.pdf"/> @@ -164,7 +164,7 @@ os-compute-devguide.xml - http://docs.openstack.org/api/openstack-compute/1.1/content/ + http://docs.openstack.org/api/openstack-compute/2/content/ reviewer openstack diff --git a/openstack-compute-api-1.1/src/common.ent b/openstack-compute-api-2/src/common.ent similarity index 100% rename from openstack-compute-api-1.1/src/common.ent rename to openstack-compute-api-2/src/common.ent diff --git a/openstack-compute-api-1.1/src/figures/Arrow_east.png b/openstack-compute-api-2/src/figures/Arrow_east.png similarity index 100% rename from openstack-compute-api-1.1/src/figures/Arrow_east.png rename to openstack-compute-api-2/src/figures/Arrow_east.png diff --git a/openstack-compute-api-1.1/src/figures/Arrow_east.svg b/openstack-compute-api-2/src/figures/Arrow_east.svg similarity index 100% rename from openstack-compute-api-1.1/src/figures/Arrow_east.svg rename to openstack-compute-api-2/src/figures/Arrow_east.svg diff --git a/openstack-compute-api-1.1/src/figures/Check_mark_23x20_02.png b/openstack-compute-api-2/src/figures/Check_mark_23x20_02.png similarity index 100% rename from openstack-compute-api-1.1/src/figures/Check_mark_23x20_02.png rename to openstack-compute-api-2/src/figures/Check_mark_23x20_02.png diff --git a/openstack-compute-api-1.1/src/figures/Check_mark_23x20_02.svg b/openstack-compute-api-2/src/figures/Check_mark_23x20_02.svg similarity index 100% rename from openstack-compute-api-1.1/src/figures/Check_mark_23x20_02.svg rename to openstack-compute-api-2/src/figures/Check_mark_23x20_02.svg diff --git a/openstack-compute-api-1.1/src/js/shjs/sh_java.js b/openstack-compute-api-2/src/js/shjs/sh_java.js similarity index 100% rename from openstack-compute-api-1.1/src/js/shjs/sh_java.js rename to openstack-compute-api-2/src/js/shjs/sh_java.js diff --git a/openstack-compute-api-1.1/src/js/shjs/sh_javascript.js b/openstack-compute-api-2/src/js/shjs/sh_javascript.js similarity index 100% rename from openstack-compute-api-1.1/src/js/shjs/sh_javascript.js rename to openstack-compute-api-2/src/js/shjs/sh_javascript.js diff --git a/openstack-compute-api-1.1/src/js/shjs/sh_main.js b/openstack-compute-api-2/src/js/shjs/sh_main.js similarity index 100% rename from openstack-compute-api-1.1/src/js/shjs/sh_main.js rename to openstack-compute-api-2/src/js/shjs/sh_main.js diff --git a/openstack-compute-api-1.1/src/js/shjs/sh_xml.js b/openstack-compute-api-2/src/js/shjs/sh_xml.js similarity index 100% rename from openstack-compute-api-1.1/src/js/shjs/sh_xml.js rename to openstack-compute-api-2/src/js/shjs/sh_xml.js diff --git a/openstack-compute-api-1.1/src/js/trc/schema/controller.js b/openstack-compute-api-2/src/js/trc/schema/controller.js similarity index 100% rename from openstack-compute-api-1.1/src/js/trc/schema/controller.js rename to openstack-compute-api-2/src/js/trc/schema/controller.js diff --git a/openstack-compute-api-1.1/src/js/trc/schema/layoutManager.js b/openstack-compute-api-2/src/js/trc/schema/layoutManager.js similarity index 100% rename from openstack-compute-api-1.1/src/js/trc/schema/layoutManager.js rename to openstack-compute-api-2/src/js/trc/schema/layoutManager.js diff --git a/openstack-compute-api-1.1/src/js/trc/schema/sampleManager.js b/openstack-compute-api-2/src/js/trc/schema/sampleManager.js similarity index 100% rename from openstack-compute-api-1.1/src/js/trc/schema/sampleManager.js rename to openstack-compute-api-2/src/js/trc/schema/sampleManager.js diff --git a/openstack-compute-api-1.1/src/js/trc/util.js b/openstack-compute-api-2/src/js/trc/util.js similarity index 100% rename from openstack-compute-api-1.1/src/js/trc/util.js rename to openstack-compute-api-2/src/js/trc/util.js diff --git a/openstack-compute-api-1.1/src/os-compute-1.1.wadl b/openstack-compute-api-2/src/os-compute-2.wadl similarity index 99% rename from openstack-compute-api-1.1/src/os-compute-1.1.wadl rename to openstack-compute-api-2/src/os-compute-2.wadl index 1be63d3..f2aee9b 100644 --- a/openstack-compute-api-1.1/src/os-compute-1.1.wadl +++ b/openstack-compute-api-2/src/os-compute-2.wadl @@ -7,7 +7,7 @@ - + %common;]> @@ -32,11 +32,11 @@ - + - + diff --git a/openstack-compute-api-1.1/src/os-compute-devguide.xml b/openstack-compute-api-2/src/os-compute-devguide.xml similarity index 98% rename from openstack-compute-api-1.1/src/os-compute-devguide.xml rename to openstack-compute-api-2/src/os-compute-devguide.xml index d58232c..3076e39 100644 --- a/openstack-compute-api-1.1/src/os-compute-devguide.xml +++ b/openstack-compute-api-2/src/os-compute-devguide.xml @@ -59,11 +59,12 @@ 2009 2010 2011 + 2012 Rackspace US, Inc. - API v1.1 + API v2 OpenStack Compute - 2011-11-08 + 2012-02-14 Copyright details are filled in by the template. @@ -75,15 +76,27 @@ (API). + + 2012-02-14 + + + + Changed the name of the API version + from v1.1 to v2. + + + No longer use mimetype parameters to + denote version. + + + - 2011-11-08 Removed DRAFT designation. - @@ -649,7 +662,7 @@ Request with Headers: JSON -POST /v1.1/214412/servers HTTP/1.1 +POST /v2/214412/servers HTTP/1.1 Host: servers.api.openstack.org Content-Type: application/json Accept: application/xml @@ -681,7 +694,7 @@ Content-Type: application/xml; charset=UTF-8 Request with Extension: JSON -POST /v1.1/214412/servers.xml HTTP/1.1 +POST /v2/214412/servers.xml HTTP/1.1 Host: servers.api.openstack.org Content-Type: application/json X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb @@ -786,21 +799,19 @@ X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb an empty collection. - - For convenience, collections are required to contain - atom "next" links. They may optionally also contain - "previous" links. The last page in the list will not - contain a "next" link. The following examples - illustrate three pages in a collection of images. The + For convenience, collections are required to + contain atom "next" links. They may optionally also + contain "previous" links. The last page in the list + will not contain a "next" link. The following examples + illustrate three pages in a collection of images. The 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 limit parameter sets the page size to a single item. Subsequent links will honor the initial page size. Thus, a client may follow links to traverse a paginated collection without having to input the - marker parameter. - + marker parameter. Images Collection, First Page: XML @@ -873,33 +884,31 @@ X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb
Efficient Polling with the <parameter>Changes-Since</parameter> Parameter - - 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 elements. Rather than re-downloading and re-parsing the full status at each polling interval, your ReST client may use the - changes-since parameter to + changes-since parameter to check for changes since a previous request. The - changes-since time is specified - as an ISO - 8601 dateTime (2011-01-24T17:08Z). The form - for the timestamp is CCYY-MM-DDThh:mm:ss. An optional - time zone may be written in by appending the form - ±hh:mm which describes the timezone as an + changes-since time is + specified as an ISO 8601 dateTime (2011-01-24T17:08Z). The + form for the timestamp is CCYY-MM-DDThh:mm:ss. An + optional time zone may be written in by appending the + form ±hh:mm which describes the timezone as an offset from UTC. When the timezone is not specified (2011-01-24T17:08), the UTC timezone will be assumed. If nothing has changed since the - changes-since time, an empty - list will be returned. If data has changed, only the - items changed since the specified time will be + changes-since time, an + empty list will be returned. If data has changed, only + the items changed since the specified time will be returned in the response. For example, performing a &GET; against - https://api.servers.openstack.org/v1.1/224532/servers?changes-since=2011-01-24T17:08Z + https://api.servers.openstack.org/v2/224532/servers?changes-since=2011-01-24T17:08Z would list all servers that have changed since Mon, 24 - Jan 2011 17:08:00 UTC. - + Jan 2011 17:08:00 UTC. In order to allow clients to keep track of changes, 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 directly by client applications. - - The regular expression boundary matcher "^" for + The regular expression boundary matcher "^" for the rate limit takes effect after the root URI path. For example, the regular expression ^/servers would match the bolded portion of the following URI: - https://servers.api.openstack.org/v1.1/3542812/servers. - + https://servers.api.openstack.org/v2/3542812/servers. @@ -1124,34 +1131,32 @@ X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb
Versions - - The OpenStack Compute API uses both a URI and a MIME - type versioning scheme. In the URI scheme, the first - element of the path contains the target version + The OpenStack Compute API uses both a URI and a + MIME type versioning scheme. In the URI scheme, the + first element of the path contains the target version identifier (e.g. https://servers.api.openstack.org/ v1.0/…). The MIME type versioning scheme uses HTTP content negotiation where the Accept or Content-Type headers contains a MIME 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 (application/xml or application/json). If conflicting versions are specified using both an HTTP header and a - URI, the URI takes precedence. - + URI, the URI takes precedence. Request with MIME type versioning GET /214412/images HTTP/1.1 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 Request with URI versioning -GET /v1.1/214412/images HTTP/1.1 +GET /v2/214412/images HTTP/1.1 Host: servers.api.openstack.org Accept: application/xml X-Auth-Token: eaaafd18-0fed-4b3a-81b4-663c99ec1cbb @@ -1250,27 +1255,25 @@ Host: servers.api.openstack.org - - 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 - version URL - (e.g. https://servers.api.openstack.org/v1.1/). - Version request URLs should always end with a trailing - slash (/). If the slash is omitted, the server may - respond with a 302 - redirection request. Format extensions may be placed - after the slash - (e.g. https://servers.api.openstack.org/v1.1/.xml). Note + version URL (e.g. + https://servers.api.openstack.org/v2/). Version + request URLs should always end with a trailing slash + (/). If the slash is omitted, the server may respond + with a 302 redirection + request. Format extensions may be placed after the + slash (e.g. + https://servers.api.openstack.org/v2/.xml). Note that this is a special case that does not hold true for other API requests. In general, requests such as /servers.xml and /servers/.xml are handled - equivalently. - + equivalently. Version Details Request GET HTTP/1.1 -Host: servers.api.openstack.org/v1.1/ +Host: servers.api.openstack.org/v2/ @@ -1304,8 +1307,7 @@ Host: servers.api.openstack.org/v1.1/ Version Details Response: JSON - + The detailed version response contains pointers to diff --git a/openstack-compute-api-1.1/src/samples/address.json b/openstack-compute-api-2/src/samples/address.json similarity index 100% rename from openstack-compute-api-1.1/src/samples/address.json rename to openstack-compute-api-2/src/samples/address.json diff --git a/openstack-compute-api-1.1/src/samples/address.xml b/openstack-compute-api-2/src/samples/address.xml similarity index 100% rename from openstack-compute-api-1.1/src/samples/address.xml rename to openstack-compute-api-2/src/samples/address.xml diff --git a/openstack-compute-api-1.1/src/samples/addresses.json b/openstack-compute-api-2/src/samples/addresses.json similarity index 100% rename from openstack-compute-api-1.1/src/samples/addresses.json rename to openstack-compute-api-2/src/samples/addresses.json diff --git a/openstack-compute-api-1.1/src/samples/addresses.xml b/openstack-compute-api-2/src/samples/addresses.xml similarity index 100% rename from openstack-compute-api-1.1/src/samples/addresses.xml rename to openstack-compute-api-2/src/samples/addresses.xml diff --git a/openstack-compute-api-1.1/src/samples/backupInProgress.json b/openstack-compute-api-2/src/samples/backupInProgress.json similarity index 100% rename from openstack-compute-api-1.1/src/samples/backupInProgress.json rename to openstack-compute-api-2/src/samples/backupInProgress.json diff --git a/openstack-compute-api-1.1/src/samples/backupInProgress.xml b/openstack-compute-api-2/src/samples/backupInProgress.xml similarity index 100% rename from openstack-compute-api-1.1/src/samples/backupInProgress.xml rename to openstack-compute-api-2/src/samples/backupInProgress.xml diff --git a/openstack-compute-api-1.1/src/samples/badmediatype.json b/openstack-compute-api-2/src/samples/badmediatype.json similarity index 100% rename from openstack-compute-api-1.1/src/samples/badmediatype.json rename to openstack-compute-api-2/src/samples/badmediatype.json diff --git a/openstack-compute-api-1.1/src/samples/badmediatype.xml b/openstack-compute-api-2/src/samples/badmediatype.xml similarity index 100% rename from openstack-compute-api-1.1/src/samples/badmediatype.xml rename to openstack-compute-api-2/src/samples/badmediatype.xml diff --git a/openstack-compute-api-1.1/src/samples/badmethod.json b/openstack-compute-api-2/src/samples/badmethod.json similarity index 100% rename from openstack-compute-api-1.1/src/samples/badmethod.json rename to openstack-compute-api-2/src/samples/badmethod.json diff --git a/openstack-compute-api-1.1/src/samples/badmethod.xml b/openstack-compute-api-2/src/samples/badmethod.xml similarity index 100% rename from openstack-compute-api-1.1/src/samples/badmethod.xml rename to openstack-compute-api-2/src/samples/badmethod.xml diff --git a/openstack-compute-api-1.1/src/samples/badrequest.json b/openstack-compute-api-2/src/samples/badrequest.json similarity index 100% rename from openstack-compute-api-1.1/src/samples/badrequest.json rename to openstack-compute-api-2/src/samples/badrequest.json diff --git a/openstack-compute-api-1.1/src/samples/badrequest.xml b/openstack-compute-api-2/src/samples/badrequest.xml similarity index 100% rename from openstack-compute-api-1.1/src/samples/badrequest.xml rename to openstack-compute-api-2/src/samples/badrequest.xml diff --git a/openstack-compute-api-1.1/src/samples/build.json b/openstack-compute-api-2/src/samples/build.json similarity index 100% rename from openstack-compute-api-1.1/src/samples/build.json rename to openstack-compute-api-2/src/samples/build.json diff --git a/openstack-compute-api-1.1/src/samples/build.xml b/openstack-compute-api-2/src/samples/build.xml similarity index 100% rename from openstack-compute-api-1.1/src/samples/build.xml rename to openstack-compute-api-2/src/samples/build.xml diff --git a/openstack-compute-api-1.1/src/samples/changepassword.json b/openstack-compute-api-2/src/samples/changepassword.json similarity index 100% rename from openstack-compute-api-1.1/src/samples/changepassword.json rename to openstack-compute-api-2/src/samples/changepassword.json diff --git a/openstack-compute-api-1.1/src/samples/changepassword.xml b/openstack-compute-api-2/src/samples/changepassword.xml similarity index 100% rename from openstack-compute-api-1.1/src/samples/changepassword.xml rename to openstack-compute-api-2/src/samples/changepassword.xml diff --git a/openstack-compute-api-1.1/src/samples/choices.json b/openstack-compute-api-2/src/samples/choices.json similarity index 66% rename from openstack-compute-api-1.1/src/samples/choices.json rename to openstack-compute-api-2/src/samples/choices.json index 77ab359..9ce8a4b 100644 --- a/openstack-compute-api-1.1/src/samples/choices.json +++ b/openstack-compute-api-2/src/samples/choices.json @@ -12,31 +12,31 @@ "media-types": [ { "base": "application/xml", - "type": "application/vnd.openstack.compute+xml;version=1.0" + "type": "application/vnd.openstack.compute.v1.0+xml" }, { "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", "links": [ { "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": [ { "base": "application/xml", - "type": "application/vnd.openstack.compute+xml;version=1.0" + "type": "application/vnd.openstack.compute.v2+xml" }, { "base": "application/json", - "type": "application/vnd.openstack.compute+json;version=1.0" + "type": "application/vnd.openstack.compute.v2+json" } ] } diff --git a/openstack-compute-api-1.1/src/samples/choices.xml b/openstack-compute-api-2/src/samples/choices.xml similarity index 60% rename from openstack-compute-api-1.1/src/samples/choices.xml rename to openstack-compute-api-2/src/samples/choices.xml index 54eff12..8ce868c 100644 --- a/openstack-compute-api-1.1/src/samples/choices.xml +++ b/openstack-compute-api-2/src/samples/choices.xml @@ -5,24 +5,24 @@ + type="application/vnd.openstack.compute.v1.0+xml"/> + type="application/vnd.openstack.compute.v1.0+json"/> - + + type="application/vnd.openstack.compute.v2+xml"/> + type="application/vnd.openstack.compute.v2+xml"/> + href="http://servers.api.openstack.org/v2/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"/> diff --git a/openstack-compute-api-1.1/src/samples/confirmresize.json b/openstack-compute-api-2/src/samples/confirmresize.json similarity index 100% rename from openstack-compute-api-1.1/src/samples/confirmresize.json rename to openstack-compute-api-2/src/samples/confirmresize.json diff --git a/openstack-compute-api-1.1/src/samples/confirmresize.xml b/openstack-compute-api-2/src/samples/confirmresize.xml similarity index 100% rename from openstack-compute-api-1.1/src/samples/confirmresize.xml rename to openstack-compute-api-2/src/samples/confirmresize.xml diff --git a/openstack-compute-api-1.1/src/samples/createimage.json b/openstack-compute-api-2/src/samples/createimage.json similarity index 100% rename from openstack-compute-api-1.1/src/samples/createimage.json rename to openstack-compute-api-2/src/samples/createimage.json diff --git a/openstack-compute-api-1.1/src/samples/createimage.xml b/openstack-compute-api-2/src/samples/createimage.xml similarity index 100% rename from openstack-compute-api-1.1/src/samples/createimage.xml rename to openstack-compute-api-2/src/samples/createimage.xml diff --git a/openstack-compute-api-1.1/src/samples/ext-action.json b/openstack-compute-api-2/src/samples/ext-action.json similarity index 100% rename from openstack-compute-api-1.1/src/samples/ext-action.json rename to openstack-compute-api-2/src/samples/ext-action.json diff --git a/openstack-compute-api-1.1/src/samples/ext-action.xml b/openstack-compute-api-2/src/samples/ext-action.xml similarity index 100% rename from openstack-compute-api-1.1/src/samples/ext-action.xml rename to openstack-compute-api-2/src/samples/ext-action.xml diff --git a/openstack-compute-api-1.1/src/samples/ext-server.json b/openstack-compute-api-2/src/samples/ext-server.json similarity index 79% rename from openstack-compute-api-1.1/src/samples/ext-server.json rename to openstack-compute-api-2/src/samples/ext-server.json index d60aae3..8f69def 100644 --- a/openstack-compute-api-1.1/src/samples/ext-server.json +++ b/openstack-compute-api-2/src/samples/ext-server.json @@ -2,8 +2,8 @@ "server": { "id": "52415800-8b69-11e0-9b19-734f000004d2", "name": "sample-server", - "imageRef": "https://servers.api.rackspacecloud.com/v1.1/32278/images/52415800-8b69-11e0-9b19-734f5736d2a2", - "flavorRef": "https://servers.api.rackspacecloud.com/v1.1/32278/flavors/52415800-8b69-11e0-9b19-734f1195ff37", + "imageRef": "https://servers.api.rackspacecloud.com/v2/32278/images/52415800-8b69-11e0-9b19-734f5736d2a2", + "flavorRef": "https://servers.api.rackspacecloud.com/v2/32278/flavors/52415800-8b69-11e0-9b19-734f1195ff37", "updated": "2010-10-10T12:00:00Z", "created": "2010-08-10T12:00:00Z", "hostId": "e4d909c290d0fb1ca068ffaddf22cbd0", @@ -53,16 +53,16 @@ "links": [ { "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", - "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" }, { "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" } ] diff --git a/openstack-compute-api-1.1/src/samples/ext-server.xml b/openstack-compute-api-2/src/samples/ext-server.xml similarity index 74% rename from openstack-compute-api-1.1/src/samples/ext-server.xml rename to openstack-compute-api-2/src/samples/ext-server.xml index e170dba..df96d0c 100644 --- a/openstack-compute-api-1.1/src/samples/ext-server.xml +++ b/openstack-compute-api-2/src/samples/ext-server.xml @@ -3,13 +3,13 @@ xmlns:atom="http://www.w3.org/2005/Atom" xmlns:aide="http://docs.rackspacecloud.com/servers/api/ext/aide/v1.0" 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" updated="2010-10-10T12:00:00Z" created="2010-08-10T12:00:00Z" progress="60" hostId="e4d909c290d0fb1ca068ffaddf22cbd0" 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"> Web Head 1 2.1 @@ -28,13 +28,13 @@ + href="http://servers.api.openstack.org/v2/1234/servers/52415800-8b69-11e0-9b19-734f000004d2"/> diff --git a/openstack-compute-api-1.1/src/samples/ext-servers.json b/openstack-compute-api-2/src/samples/ext-servers.json similarity index 93% rename from openstack-compute-api-1.1/src/samples/ext-servers.json rename to openstack-compute-api-2/src/samples/ext-servers.json index b03a86b..a35764e 100644 --- a/openstack-compute-api-1.1/src/samples/ext-servers.json +++ b/openstack-compute-api-2/src/samples/ext-servers.json @@ -17,7 +17,7 @@ "links": [ { "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", @@ -30,7 +30,7 @@ "links": [ { "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", @@ -75,7 +75,7 @@ "links": [ { "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", diff --git a/openstack-compute-api-1.1/src/samples/ext-servers.xml b/openstack-compute-api-2/src/samples/ext-servers.xml similarity index 86% rename from openstack-compute-api-1.1/src/samples/ext-servers.xml rename to openstack-compute-api-2/src/samples/ext-servers.xml index dd41d4d..d91fc52 100644 --- a/openstack-compute-api-1.1/src/samples/ext-servers.xml +++ b/openstack-compute-api-2/src/samples/ext-servers.xml @@ -12,7 +12,7 @@ + href="http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"/> @@ -20,7 +20,7 @@ + href="http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/> @@ -43,7 +43,7 @@ + href="http://servers.api.openstack.org/v2/1234/servers/52415800-8b69-11e0-9b19-734f6af67565"/> diff --git a/openstack-compute-api-1.1/src/samples/extension.json b/openstack-compute-api-2/src/samples/extension.json similarity index 100% rename from openstack-compute-api-1.1/src/samples/extension.json rename to openstack-compute-api-2/src/samples/extension.json diff --git a/openstack-compute-api-1.1/src/samples/extension.xml b/openstack-compute-api-2/src/samples/extension.xml similarity index 100% rename from openstack-compute-api-1.1/src/samples/extension.xml rename to openstack-compute-api-2/src/samples/extension.xml diff --git a/openstack-compute-api-1.1/src/samples/extension2.json b/openstack-compute-api-2/src/samples/extension2.json similarity index 100% rename from openstack-compute-api-1.1/src/samples/extension2.json rename to openstack-compute-api-2/src/samples/extension2.json diff --git a/openstack-compute-api-1.1/src/samples/extension2.xml b/openstack-compute-api-2/src/samples/extension2.xml similarity index 100% rename from openstack-compute-api-1.1/src/samples/extension2.xml rename to openstack-compute-api-2/src/samples/extension2.xml diff --git a/openstack-compute-api-1.1/src/samples/extension3.json b/openstack-compute-api-2/src/samples/extension3.json similarity index 100% rename from openstack-compute-api-1.1/src/samples/extension3.json rename to openstack-compute-api-2/src/samples/extension3.json diff --git a/openstack-compute-api-1.1/src/samples/extension3.xml b/openstack-compute-api-2/src/samples/extension3.xml similarity index 100% rename from openstack-compute-api-1.1/src/samples/extension3.xml rename to openstack-compute-api-2/src/samples/extension3.xml diff --git a/openstack-compute-api-1.1/src/samples/extension4.json b/openstack-compute-api-2/src/samples/extension4.json similarity index 100% rename from openstack-compute-api-1.1/src/samples/extension4.json rename to openstack-compute-api-2/src/samples/extension4.json diff --git a/openstack-compute-api-1.1/src/samples/extension4.xml b/openstack-compute-api-2/src/samples/extension4.xml similarity index 100% rename from openstack-compute-api-1.1/src/samples/extension4.xml rename to openstack-compute-api-2/src/samples/extension4.xml diff --git a/openstack-compute-api-1.1/src/samples/extensions.json b/openstack-compute-api-2/src/samples/extensions.json similarity index 100% rename from openstack-compute-api-1.1/src/samples/extensions.json rename to openstack-compute-api-2/src/samples/extensions.json diff --git a/openstack-compute-api-1.1/src/samples/extensions.xml b/openstack-compute-api-2/src/samples/extensions.xml similarity index 100% rename from openstack-compute-api-1.1/src/samples/extensions.xml rename to openstack-compute-api-2/src/samples/extensions.xml diff --git a/openstack-compute-api-1.1/src/samples/fault.json b/openstack-compute-api-2/src/samples/fault.json similarity index 100% rename from openstack-compute-api-1.1/src/samples/fault.json rename to openstack-compute-api-2/src/samples/fault.json diff --git a/openstack-compute-api-1.1/src/samples/fault.xml b/openstack-compute-api-2/src/samples/fault.xml similarity index 100% rename from openstack-compute-api-1.1/src/samples/fault.xml rename to openstack-compute-api-2/src/samples/fault.xml diff --git a/openstack-compute-api-1.1/src/samples/flavor.json b/openstack-compute-api-2/src/samples/flavor.json similarity index 79% rename from openstack-compute-api-1.1/src/samples/flavor.json rename to openstack-compute-api-2/src/samples/flavor.json index 280d0d1..d11d4b4 100644 --- a/openstack-compute-api-1.1/src/samples/flavor.json +++ b/openstack-compute-api-2/src/samples/flavor.json @@ -8,7 +8,7 @@ "links": [ { "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", diff --git a/openstack-compute-api-1.1/src/samples/flavor.xml b/openstack-compute-api-2/src/samples/flavor.xml similarity index 80% rename from openstack-compute-api-1.1/src/samples/flavor.xml rename to openstack-compute-api-2/src/samples/flavor.xml index 1c3bb3b..ab21b23 100644 --- a/openstack-compute-api-1.1/src/samples/flavor.xml +++ b/openstack-compute-api-2/src/samples/flavor.xml @@ -6,7 +6,7 @@ name="256 MB Server" ram="256" disk="10" vcpus="1"> + href="http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/> diff --git a/openstack-compute-api-1.1/src/samples/flavors-page1-sp.xml b/openstack-compute-api-2/src/samples/flavors-page1-sp.xml similarity index 72% rename from openstack-compute-api-1.1/src/samples/flavors-page1-sp.xml rename to openstack-compute-api-2/src/samples/flavors-page1-sp.xml index aad8e1f..73a4bf0 100644 --- a/openstack-compute-api-1.1/src/samples/flavors-page1-sp.xml +++ b/openstack-compute-api-2/src/samples/flavors-page1-sp.xml @@ -8,7 +8,7 @@ name="256 MB Server"> + href="http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f1195ff37"/> @@ -17,12 +17,12 @@ name="512 MB Server"> + href="http://servers.api.openstack.org/v2/1234/flavors/52415800-8b69-11e0-9b19-734f216543fd"/> + href="http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"/> diff --git a/openstack-compute-api-1.1/src/samples/image-simple.json b/openstack-compute-api-2/src/samples/image-simple.json similarity index 84% rename from openstack-compute-api-1.1/src/samples/image-simple.json rename to openstack-compute-api-2/src/samples/image-simple.json index 734d731..695e465 100644 --- a/openstack-compute-api-1.1/src/samples/image-simple.json +++ b/openstack-compute-api-2/src/samples/image-simple.json @@ -5,7 +5,7 @@ "links": [ { "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", diff --git a/openstack-compute-api-1.1/src/samples/image-simple.xml b/openstack-compute-api-2/src/samples/image-simple.xml similarity index 84% rename from openstack-compute-api-1.1/src/samples/image-simple.xml rename to openstack-compute-api-2/src/samples/image-simple.xml index f4732f2..0b43eaa 100644 --- a/openstack-compute-api-1.1/src/samples/image-simple.xml +++ b/openstack-compute-api-2/src/samples/image-simple.xml @@ -6,7 +6,7 @@ name="My Server Backup"> + href="http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/> diff --git a/openstack-compute-api-1.1/src/samples/image.json b/openstack-compute-api-2/src/samples/image.json similarity index 81% rename from openstack-compute-api-1.1/src/samples/image.json rename to openstack-compute-api-2/src/samples/image.json index 1d81a51..be1122d 100644 --- a/openstack-compute-api-1.1/src/samples/image.json +++ b/openstack-compute-api-2/src/samples/image.json @@ -15,7 +15,7 @@ "links": [ { "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", @@ -26,7 +26,7 @@ "links": [ { "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", diff --git a/openstack-compute-api-1.1/src/samples/image.xml b/openstack-compute-api-2/src/samples/image.xml similarity index 79% rename from openstack-compute-api-1.1/src/samples/image.xml rename to openstack-compute-api-2/src/samples/image.xml index fd9d870..663cf25 100644 --- a/openstack-compute-api-1.1/src/samples/image.xml +++ b/openstack-compute-api-2/src/samples/image.xml @@ -13,14 +13,14 @@ + href="http://servers.api.openstack.org/v2/1234/servers/52415800-8b69-11e0-9b19-734f335aa7b3"/> + href="http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/> diff --git a/openstack-compute-api-1.1/src/samples/images-page1-sp.xml b/openstack-compute-api-2/src/samples/images-page1-sp.xml similarity index 71% rename from openstack-compute-api-1.1/src/samples/images-page1-sp.xml rename to openstack-compute-api-2/src/samples/images-page1-sp.xml index 108f576..474af3b 100644 --- a/openstack-compute-api-1.1/src/samples/images-page1-sp.xml +++ b/openstack-compute-api-2/src/samples/images-page1-sp.xml @@ -7,7 +7,7 @@ name="CentOS 5.2"> + href="http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f6f006e54"/> @@ -17,12 +17,12 @@ name="My Server Backup"> + href="http://servers.api.openstack.org/v2/1234/images/52415800-8b69-11e0-9b19-734f5736d2a2"/>
Sample Rate Limits