diff --git a/api-ref-guides/pom.xml b/api-ref-guides/pom.xml index 7c0162125..694a0b858 100644 --- a/api-ref-guides/pom.xml +++ b/api-ref-guides/pom.xml @@ -94,14 +94,14 @@ - os-api-ref-compute-v3 + os-api-ref-compute-v2.1 generate-pdf generate-sources - bk-api-ref-compute-v3.xml - api-ref-compute-v3 + bk-api-ref-compute-v2.1.xml + api-ref-compute-v2.1 diff --git a/api-ref-guides/src/bk-api-ref-compute-v3.xml b/api-ref-guides/src/bk-api-ref-compute-v3.xml deleted file mode 100644 index f7b15dc7e..000000000 --- a/api-ref-guides/src/bk-api-ref-compute-v3.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - OpenStack Compute API v3 Reference (EXPERIMENTAL) - API Reference (EXPERIMENTAL) - - - - - - - OpenStack Foundation - - - - 2010-2014 - OpenStack Foundation - - OpenStack Compute - - - - Copyright details are filled in by the - template. - - - - - diff --git a/api-ref-guides/src/bk-api-ref.xml b/api-ref-guides/src/bk-api-ref.xml index 2123e7d4a..b21dc438d 100644 --- a/api-ref-guides/src/bk-api-ref.xml +++ b/api-ref-guides/src/bk-api-ref.xml @@ -39,7 +39,7 @@ href="../../api-ref/src/docbkx/ch_blockstorage-api-v1.xml"/> - + diff --git a/api-ref/pom.xml b/api-ref/pom.xml index 1df3eadc0..5871261d7 100644 --- a/api-ref/pom.xml +++ b/api-ref/pom.xml @@ -93,14 +93,14 @@ - os-api-ref-compute-v3 + os-api-ref-compute-v2.1 generate-html generate-sources - api-ref-compute-v3.xml - bk-api-ref-compute-v3 + api-ref-compute-v2.1.xml + bk-api-ref-compute-v2.1 diff --git a/api-ref/src/docbkx/api-ref-compute-v3.xml b/api-ref/src/docbkx/api-ref-compute-v2.1.xml similarity index 79% rename from api-ref/src/docbkx/api-ref-compute-v3.xml rename to api-ref/src/docbkx/api-ref-compute-v2.1.xml index de5d4302f..a606a2bd7 100644 --- a/api-ref/src/docbkx/api-ref-compute-v3.xml +++ b/api-ref/src/docbkx/api-ref-compute-v2.1.xml @@ -6,9 +6,9 @@ xmlns:xref="http://www.w3.org/1999/xref" xmlns:wadl="http://wadl.dev.java.net/2009/02" version="5.0-extension RackBook-2.0" - xml:id="api.openstack.org-compute-v3-ext" status="EXPERIMENTAL"> + xml:id="api.openstack.org-compute-v2.1-ext" status="EXPERIMENTAL"> - OpenStack Compute API v3 + OpenStack Compute API v2.1 2010-2014 @@ -19,5 +19,5 @@ - + diff --git a/api-ref/src/docbkx/ch_compute-v3.xml b/api-ref/src/docbkx/ch_compute-v2.1.xml similarity index 66% rename from api-ref/src/docbkx/ch_compute-v3.xml rename to api-ref/src/docbkx/ch_compute-v2.1.xml index 01219efef..f8331ec2f 100644 --- a/api-ref/src/docbkx/ch_compute-v3.xml +++ b/api-ref/src/docbkx/ch_compute-v2.1.xml @@ -9,37 +9,37 @@ xmlns:linkend="http://www.w3.org/1999/linkend" xmlns:xref="http://www.w3.org/1999/xref" xmlns:wadl="http://wadl.dev.java.net/2009/02" - version="5.0-extension RackBook-2.0" xml:id="compute-ext-v3" + version="5.0-extension RackBook-2.0" xml:id="compute-ext-v2.1" role="api-reference"> - Compute API v3 (EXPERIMENTAL) - XML support in requests and responses has been - deprecated for the Compute API v3. - + Compute API v2.1 (EXPERIMENTAL) + XML support in requests and responses has been deprecated for the Compute + API v2.1 (originally referred to as v2.1). + -
+ &GET; request to v2.1/extensions.--> +
API versions List information for all API versions. - + href="../wadls/compute-api/src/v2.1/wadl/os-versions-v2.1.wadl#versions"> + - + href="../wadls/compute-api/src/v2.1/wadl/os-versions-v2.1.wadl#version"> +
-
+
Server admin actions (servers) Administrators only. Perform actions on a server. Specify the action in the request body.
-
+
Guest agents (os-agents) Creates, updates, and deletes guest agents. Use guest agents to access files on the disk, configure networking, or run other @@ -48,208 +48,208 @@ Use of guest agents is possible only if the underlying service provider uses the Xen driver.
-
+
Host aggregates (os-aggregates) Creates and manages host aggregates. An aggregate assigns metadata to groups of compute nodes. Aggregates are only visible to the cloud provider.
-
+
Cells (os-cells) Enables cells-related functionality such as adding neighbor cells, listing neighbor cells, and getting the capabilities of the local cell.
-
+
Root certificates (os-certificates) Creates and shows details for a root certificate.
-
+
Configuration drive (os-config-drive) Returns server details for a specific service ID or user.
-
+
Server deferred delete (os-deferred-delete) Force-deletes a server or restores a deleted server.
-
+
Evacuate (os-evacuate) Enables server evacuation.
-
+
Servers with extended availability zones (os-extended-availability-zone) Shows the instance availability zone for compute nodes (nova-compute). Internal services appear in their own internal availability zone.
-
+
Server extended attributes (os-extended-server-attributes) Shows metadata for servers.
-
+
Server extended status (os-extended-status) Shows extended status information, vm_state, task_state, and power_state, in detailed server responses.
-
+
Flavor access (os-flavor-access) Flavor access support.
-
+
Flavor extra-specs (flavor-extra-specs) Lists, creates, deletes, and updates the extra-specs or keys for a flavor.
-
+
Flavors manage (flavor-manage) Support for creating and deleting flavor.
-
+
Flavors with rxtx_factor extended attribute (os-flavor-rxtx) Support to show the rxtx status of a flavor.
-
+
Flavors with extended attributes (flavors) Returns information about Flavors.
-
+
Hosts (os-hosts) Manages physical hosts.
-
+
Hypervisors (os-hypervisors) Displays extra statistical information from the machine that hosts the hypervisor through the API for the hypervisor (XenAPI or KVM/libvirt).
-
+
Server actions (servers) Permits all users to list available actions for a specified server. Permits administrators to get details for a specified action for a specified server.
-
+
Instance usage audit log (os-instance-usage-audit-log) Admin-only task log monitoring.
-
+
Limits (limits) Provide all global and rate limit information.
-
+
Migrations (os-migrations) Provide data on migrations.
-
+
Multinic (os-multinic) Multiple network support.
-
+
Quota class (os-quota-class-sets) Quota classes management support.
-
+
Quota sets (os-quota-sets) Permits administrators, depending on policy settings, to view quotas for a tenant and view and update default quotas.
-
+
Server remote console (os-remote-consoles) Interactive console support.
-
+
Server usage (os-server-usage) Adds launched_at and terminated_at to servers.
-
+
Usage reports (os-simple-tenant-usage) Provide simple tenant usage for tenant.
diff --git a/api-ref/src/docbkx/itemizedlist-service-list.xml b/api-ref/src/docbkx/itemizedlist-service-list.xml index f98c9cdbc..a795aad47 100644 --- a/api-ref/src/docbkx/itemizedlist-service-list.xml +++ b/api-ref/src/docbkx/itemizedlist-service-list.xml @@ -25,8 +25,8 @@ API v2 extensions (CURRENT) - Compute API - v3 (EXPERIMENTAL) + Compute API + v2.1 (EXPERIMENTAL) Database diff --git a/api-ref/src/wadls/compute-api/src/v3/api_samples/agent-update-put-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/agent-update-put-req.json similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/api_samples/agent-update-put-req.json rename to api-ref/src/wadls/compute-api/src/v2.1/api_samples/agent-update-put-req.json diff --git a/api-ref/src/wadls/compute-api/src/v3/api_samples/agent-update-put-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/agent-update-put-resp.json similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/api_samples/agent-update-put-resp.json rename to api-ref/src/wadls/compute-api/src/v2.1/api_samples/agent-update-put-resp.json diff --git a/api-ref/src/wadls/compute-api/src/v3/api_samples/all_extensions/server-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-get-resp.json similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/api_samples/all_extensions/server-get-resp.json rename to api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-get-resp.json diff --git a/api-ref/src/wadls/compute-api/src/v3/api_samples/all_extensions/server-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-get-resp.xml similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/api_samples/all_extensions/server-get-resp.xml rename to api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-get-resp.xml diff --git a/api-ref/src/wadls/compute-api/src/v3/api_samples/all_extensions/server-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-post-req.json similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/api_samples/all_extensions/server-post-req.json rename to api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-post-req.json diff --git a/api-ref/src/wadls/compute-api/src/v3/api_samples/all_extensions/server-post-req.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-post-req.xml similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/api_samples/all_extensions/server-post-req.xml rename to api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-post-req.xml diff --git a/api-ref/src/wadls/compute-api/src/v3/api_samples/all_extensions/server-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-post-resp.json similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/api_samples/all_extensions/server-post-resp.json rename to api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-post-resp.json diff --git a/api-ref/src/wadls/compute-api/src/v3/api_samples/all_extensions/server-post-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-post-resp.xml similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/api_samples/all_extensions/server-post-resp.xml rename to api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/server-post-resp.xml diff --git a/api-ref/src/wadls/compute-api/src/v3/api_samples/all_extensions/servers-details-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/servers-details-resp.json similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/api_samples/all_extensions/servers-details-resp.json rename to api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/servers-details-resp.json diff --git a/api-ref/src/wadls/compute-api/src/v3/api_samples/all_extensions/servers-details-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/servers-details-resp.xml similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/api_samples/all_extensions/servers-details-resp.xml rename to api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/servers-details-resp.xml diff --git a/api-ref/src/wadls/compute-api/src/v3/api_samples/all_extensions/servers-list-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/servers-list-resp.json similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/api_samples/all_extensions/servers-list-resp.json rename to api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/servers-list-resp.json diff --git a/api-ref/src/wadls/compute-api/src/v3/api_samples/all_extensions/servers-list-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/servers-list-resp.xml similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/api_samples/all_extensions/servers-list-resp.xml rename to api-ref/src/wadls/compute-api/src/v2.1/api_samples/all_extensions/servers-list-resp.xml diff --git a/api-ref/src/wadls/compute-api/src/v3/api_samples/compute-versions-response.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/compute-versions-response.json similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/api_samples/compute-versions-response.json rename to api-ref/src/wadls/compute-api/src/v2.1/api_samples/compute-versions-response.json diff --git a/api-ref/src/wadls/compute-api/src/v3/api_samples/compute-versions-response.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/compute-versions-response.xml similarity index 95% rename from api-ref/src/wadls/compute-api/src/v3/api_samples/compute-versions-response.xml rename to api-ref/src/wadls/compute-api/src/v2.1/api_samples/compute-versions-response.xml index 243e6ac13..7af638d01 100644 --- a/api-ref/src/wadls/compute-api/src/v3/api_samples/compute-versions-response.xml +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/compute-versions-response.xml @@ -1,7 +1,7 @@ - + application/vnd.openstack.compute+json;version=3 - v3.0 + v2.1 http://23.253.228.211:8774/v3/ diff --git a/api-ref/src/wadls/compute-api/src/v3/common.ent b/api-ref/src/wadls/compute-api/src/v2.1/common.ent similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/common.ent rename to api-ref/src/wadls/compute-api/src/v2.1/common.ent diff --git a/api-ref/src/wadls/compute-api/src/v3/js/shjs/sh_java.js b/api-ref/src/wadls/compute-api/src/v2.1/js/shjs/sh_java.js similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/js/shjs/sh_java.js rename to api-ref/src/wadls/compute-api/src/v2.1/js/shjs/sh_java.js diff --git a/api-ref/src/wadls/compute-api/src/v3/js/shjs/sh_javascript.js b/api-ref/src/wadls/compute-api/src/v2.1/js/shjs/sh_javascript.js similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/js/shjs/sh_javascript.js rename to api-ref/src/wadls/compute-api/src/v2.1/js/shjs/sh_javascript.js diff --git a/api-ref/src/wadls/compute-api/src/v3/js/shjs/sh_main.js b/api-ref/src/wadls/compute-api/src/v2.1/js/shjs/sh_main.js similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/js/shjs/sh_main.js rename to api-ref/src/wadls/compute-api/src/v2.1/js/shjs/sh_main.js diff --git a/api-ref/src/wadls/compute-api/src/v3/js/shjs/sh_xml.js b/api-ref/src/wadls/compute-api/src/v2.1/js/shjs/sh_xml.js similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/js/shjs/sh_xml.js rename to api-ref/src/wadls/compute-api/src/v2.1/js/shjs/sh_xml.js diff --git a/api-ref/src/wadls/compute-api/src/v3/js/trc/schema/controller.js b/api-ref/src/wadls/compute-api/src/v2.1/js/trc/schema/controller.js similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/js/trc/schema/controller.js rename to api-ref/src/wadls/compute-api/src/v2.1/js/trc/schema/controller.js diff --git a/api-ref/src/wadls/compute-api/src/v3/js/trc/schema/layoutManager.js b/api-ref/src/wadls/compute-api/src/v2.1/js/trc/schema/layoutManager.js similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/js/trc/schema/layoutManager.js rename to api-ref/src/wadls/compute-api/src/v2.1/js/trc/schema/layoutManager.js diff --git a/api-ref/src/wadls/compute-api/src/v3/js/trc/schema/sampleManager.js b/api-ref/src/wadls/compute-api/src/v2.1/js/trc/schema/sampleManager.js similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/js/trc/schema/sampleManager.js rename to api-ref/src/wadls/compute-api/src/v2.1/js/trc/schema/sampleManager.js diff --git a/api-ref/src/wadls/compute-api/src/v3/js/trc/util.js b/api-ref/src/wadls/compute-api/src/v2.1/js/trc/util.js similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/js/trc/util.js rename to api-ref/src/wadls/compute-api/src/v2.1/js/trc/util.js diff --git a/api-ref/src/wadls/compute-api/src/v3/style/schema.css b/api-ref/src/wadls/compute-api/src/v2.1/style/schema.css similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/style/schema.css rename to api-ref/src/wadls/compute-api/src/v2.1/style/schema.css diff --git a/api-ref/src/wadls/compute-api/src/v3/style/shjs/sh_acid.css b/api-ref/src/wadls/compute-api/src/v2.1/style/shjs/sh_acid.css similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/style/shjs/sh_acid.css rename to api-ref/src/wadls/compute-api/src/v2.1/style/shjs/sh_acid.css diff --git a/api-ref/src/wadls/compute-api/src/v3/style/shjs/sh_darkblue.css b/api-ref/src/wadls/compute-api/src/v2.1/style/shjs/sh_darkblue.css similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/style/shjs/sh_darkblue.css rename to api-ref/src/wadls/compute-api/src/v2.1/style/shjs/sh_darkblue.css diff --git a/api-ref/src/wadls/compute-api/src/v3/style/shjs/sh_emacs.css b/api-ref/src/wadls/compute-api/src/v2.1/style/shjs/sh_emacs.css similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/style/shjs/sh_emacs.css rename to api-ref/src/wadls/compute-api/src/v2.1/style/shjs/sh_emacs.css diff --git a/api-ref/src/wadls/compute-api/src/v3/style/shjs/sh_night.css b/api-ref/src/wadls/compute-api/src/v2.1/style/shjs/sh_night.css similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/style/shjs/sh_night.css rename to api-ref/src/wadls/compute-api/src/v2.1/style/shjs/sh_night.css diff --git a/api-ref/src/wadls/compute-api/src/v3/style/shjs/sh_pablo.css b/api-ref/src/wadls/compute-api/src/v2.1/style/shjs/sh_pablo.css similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/style/shjs/sh_pablo.css rename to api-ref/src/wadls/compute-api/src/v2.1/style/shjs/sh_pablo.css diff --git a/api-ref/src/wadls/compute-api/src/v3/style/shjs/sh_print.css b/api-ref/src/wadls/compute-api/src/v2.1/style/shjs/sh_print.css similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/style/shjs/sh_print.css rename to api-ref/src/wadls/compute-api/src/v2.1/style/shjs/sh_print.css diff --git a/api-ref/src/wadls/compute-api/src/v3/style/shjs/sh_style.css b/api-ref/src/wadls/compute-api/src/v2.1/style/shjs/sh_style.css similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/style/shjs/sh_style.css rename to api-ref/src/wadls/compute-api/src/v2.1/style/shjs/sh_style.css diff --git a/api-ref/src/wadls/compute-api/src/v3/style/shjs/sh_whitengrey.css b/api-ref/src/wadls/compute-api/src/v2.1/style/shjs/sh_whitengrey.css similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/style/shjs/sh_whitengrey.css rename to api-ref/src/wadls/compute-api/src/v2.1/style/shjs/sh_whitengrey.css diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-admin-actions-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-admin-actions-v2.1.wadl similarity index 99% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-admin-actions-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-admin-actions-v2.1.wadl index 2ccc0d41d..d1a065579 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-admin-actions-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-admin-actions-v2.1.wadl @@ -8,8 +8,8 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:csapi="http://docs.openstack.org/compute/api/v1.1"> - + xml:id="os-admin-actions-v2.1"> + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-agents-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-agents-v2.1.wadl similarity index 98% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-agents-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-agents-v2.1.wadl index cca543e51..d7db2018a 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-agents-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-agents-v2.1.wadl @@ -8,8 +8,8 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:csapi="http://docs.openstack.org/compute/api/v1.1"> - + xml:id="os-agents-v2.1"> + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-aggregates-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-aggregates-v2.1.wadl similarity index 99% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-aggregates-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-aggregates-v2.1.wadl index c58377df8..c6aa647c2 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-aggregates-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-aggregates-v2.1.wadl @@ -8,8 +8,8 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:csapi="http://docs.openstack.org/compute/api/v1.1"> - + xml:id="os-aggregates-v2.1"> + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-cells-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-cells-v2.1.wadl similarity index 98% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-cells-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-cells-v2.1.wadl index f3cd530fc..1a7a80e41 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-cells-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-cells-v2.1.wadl @@ -8,8 +8,8 @@ xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:csapi="http://docs.openstack.org/compute/api/v1.1"> - + xml:id="os-cell-v2.1"> + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-certificates-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-certificates-v2.1.wadl similarity index 98% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-certificates-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-certificates-v2.1.wadl index 3f93372d2..73a29fbfb 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-certificates-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-certificates-v2.1.wadl @@ -6,8 +6,8 @@ xmlns:wadl="http://wadl.dev.java.net/2009/02" xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> - - + + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-config-drive-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-config-drive-v2.1.wadl similarity index 97% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-config-drive-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-config-drive-v2.1.wadl index 39e3f89b3..c13149f0d 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-config-drive-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-config-drive-v2.1.wadl @@ -7,8 +7,8 @@ xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> - + xml:id="os-config-drive-v2.1"> + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-deferred-delete-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-deferred-delete-v2.1.wadl similarity index 97% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-deferred-delete-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-deferred-delete-v2.1.wadl index b3e87495f..a106020e2 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-deferred-delete-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-deferred-delete-v2.1.wadl @@ -7,8 +7,8 @@ xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> - + xml:id="os-deferred-delete-v2.1"> + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-evacuate-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-evacuate-v2.1.wadl similarity index 97% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-evacuate-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-evacuate-v2.1.wadl index ae3587825..8ec71ce3e 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-evacuate-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-evacuate-v2.1.wadl @@ -6,8 +6,8 @@ xmlns:wadl="http://wadl.dev.java.net/2009/02" xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> - - + + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-extended-availability-zone-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-availability-zone-v2.1.wadl similarity index 97% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-extended-availability-zone-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-availability-zone-v2.1.wadl index d471e262c..c5eea526d 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-extended-availability-zone-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-availability-zone-v2.1.wadl @@ -7,8 +7,8 @@ xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> - + xml:id="os-extended-availability-zone-v2.1"> + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-extended-server-attributes-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-server-attributes-v2.1.wadl similarity index 97% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-extended-server-attributes-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-server-attributes-v2.1.wadl index f0a43f7cf..af334a944 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-extended-server-attributes-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-server-attributes-v2.1.wadl @@ -7,8 +7,8 @@ xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> - + xml:id="os-extended-server-attributes-v2.1"> + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-extended-status-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-status-v2.1.wadl similarity index 97% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-extended-status-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-status-v2.1.wadl index 98c78a9c3..2fdb1fa94 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-extended-status-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-status-v2.1.wadl @@ -6,8 +6,8 @@ xmlns:wadl="http://wadl.dev.java.net/2009/02" xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> - - + + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-extensions-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extensions-v2.1.wadl similarity index 94% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-extensions-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extensions-v2.1.wadl index d53ebd2ed..46ef73ef2 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-extensions-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extensions-v2.1.wadl @@ -5,7 +5,7 @@ - + %common;]> @@ -14,11 +14,11 @@ xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> + xml:id="os-extensions-v2.1"> - + @@ -84,7 +84,7 @@ @@ -93,7 +93,7 @@ --> @@ -112,7 +112,7 @@ - @@ -120,7 +120,7 @@ element="common:extension"> - --> diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavor-access-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavor-access-v2.1.wadl similarity index 99% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-flavor-access-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavor-access-v2.1.wadl index d013b9299..c1ffd0949 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavor-access-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavor-access-v2.1.wadl @@ -7,8 +7,8 @@ xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> - + xml:id="os-flavor-access-v2.1"> + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavor-manage-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavor-manage-v2.1.wadl similarity index 98% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-flavor-manage-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavor-manage-v2.1.wadl index 4e4fde021..66d12672c 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavor-manage-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavor-manage-v2.1.wadl @@ -6,8 +6,8 @@ xmlns:wadl="http://wadl.dev.java.net/2009/02" xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> - - + + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavor-rxtx-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavor-rxtx-v2.1.wadl similarity index 98% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-flavor-rxtx-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavor-rxtx-v2.1.wadl index 8c87625dd..8a71a1241 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavor-rxtx-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavor-rxtx-v2.1.wadl @@ -7,8 +7,8 @@ xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> - + xml:id="os-flavor-rxtx-v2.1"> + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavors-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavors-v2.1.wadl similarity index 98% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-flavors-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavors-v2.1.wadl index 0c5fbca46..64ebd185b 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavors-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavors-v2.1.wadl @@ -7,8 +7,8 @@ xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> - + xml:id="flavors_v2.1"> + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavorspecs-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavorspecs-v2.1.wadl similarity index 99% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-flavorspecs-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavorspecs-v2.1.wadl index c2b4cf7cc..a079391f4 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-flavorspecs-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-flavorspecs-v2.1.wadl @@ -6,8 +6,8 @@ xmlns:wadl="http://wadl.dev.java.net/2009/02" xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> - - + + - + xml:id="os-hosts-v2.1"> + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-hypervisors-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-hypervisors-v2.1.wadl similarity index 99% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-hypervisors-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-hypervisors-v2.1.wadl index f7d45257d..5f5b6cd76 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-hypervisors-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-hypervisors-v2.1.wadl @@ -7,8 +7,8 @@ xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> - + xml:id="os-hypervisors-v2.1"> + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-instance-actions-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-instance-actions-v2.1.wadl similarity index 97% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-instance-actions-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-instance-actions-v2.1.wadl index 18b1172bb..b74cdaae0 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-instance-actions-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-instance-actions-v2.1.wadl @@ -7,8 +7,8 @@ xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> - + xml:id="os-instance-actions-v2.1"> + - + xml:id="os-instance-usage-audit-log-v2.1"> + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-limits-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-limits-v2.1.wadl similarity index 96% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-limits-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-limits-v2.1.wadl index 913c26253..b22622c3f 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-limits-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-limits-v2.1.wadl @@ -4,8 +4,8 @@ xmlns:wadl="http://wadl.dev.java.net/2009/02" xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> - - + + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-migrations-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-migrations-v2.1.wadl similarity index 95% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-migrations-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-migrations-v2.1.wadl index df19190ab..f5361392d 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-migrations-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-migrations-v2.1.wadl @@ -7,8 +7,8 @@ xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> - + xml:id="os-migrations-v2.1"> + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-multinic-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-multinic-v2.1.wadl similarity index 97% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-multinic-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-multinic-v2.1.wadl index 89253cc68..4c32e35fc 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-multinic-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-multinic-v2.1.wadl @@ -5,8 +5,8 @@ xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> - + xml:id="os-multinic-v2.1"> + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-quota-class-sets-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-quota-class-sets-v2.1.wadl similarity index 97% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-quota-class-sets-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-quota-class-sets-v2.1.wadl index 78e292c09..6b32b28dc 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-quota-class-sets-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-quota-class-sets-v2.1.wadl @@ -7,8 +7,8 @@ xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> - + xml:id="os-quota-class-sets-v2.1"> + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-quota-sets-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-quota-sets-v2.1.wadl similarity index 99% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-quota-sets-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-quota-sets-v2.1.wadl index 9440005d0..fcd14402c 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-quota-sets-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-quota-sets-v2.1.wadl @@ -7,8 +7,8 @@ xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> - + xml:id="os-quota-sets-v2.1"> + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-remote-consoles-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-remote-consoles-v2.1.wadl similarity index 98% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-remote-consoles-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-remote-consoles-v2.1.wadl index dba430c53..d45ce03aa 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-remote-consoles-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-remote-consoles-v2.1.wadl @@ -7,8 +7,8 @@ xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> - + xml:id="os-remote-consoles-v2.1"> + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-server-usage-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-usage-v2.1.wadl similarity index 97% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-server-usage-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-usage-v2.1.wadl index 20cc2b817..f3ffd3f6e 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-server-usage-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-server-usage-v2.1.wadl @@ -7,8 +7,8 @@ xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> - + xml:id="os-server-usage-v2.1"> + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-simple-tenant-usage-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-simple-tenant-usage-v2.1.wadl similarity index 97% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-simple-tenant-usage-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-simple-tenant-usage-v2.1.wadl index 8e3ef71ef..8a1babd69 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-simple-tenant-usage-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-simple-tenant-usage-v2.1.wadl @@ -7,8 +7,8 @@ xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> - + xml:id="os-simple-tenant-usage-v2.1"> + diff --git a/api-ref/src/wadls/compute-api/src/v3/wadl/os-versions-v3.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-versions-v2.1.wadl similarity index 87% rename from api-ref/src/wadls/compute-api/src/v3/wadl/os-versions-v3.wadl rename to api-ref/src/wadls/compute-api/src/v2.1/wadl/os-versions-v2.1.wadl index d4c8e3cc0..d4071b51c 100644 --- a/api-ref/src/wadls/compute-api/src/v3/wadl/os-versions-v3.wadl +++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-versions-v2.1.wadl @@ -5,23 +5,23 @@ xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0" xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"> + xml:id="versions-v2.1"> - + - + Details for a version. - + - + Lists information about all Compute API @@ -46,18 +46,18 @@ - + + title="Show API v2.1 details"> Shows details for Compute API - v3. + v2.1. diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/.htaccess b/api-ref/src/wadls/compute-api/src/v2.1/xsd/.htaccess similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/.htaccess rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/.htaccess diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/actions.xsd b/api-ref/src/wadls/compute-api/src/v2.1/xsd/actions.xsd similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/actions.xsd rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/actions.xsd diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/affinity-id.xjb b/api-ref/src/wadls/compute-api/src/v2.1/xsd/affinity-id.xjb similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/affinity-id.xjb rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/affinity-id.xjb diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/affinity-id.xsd b/api-ref/src/wadls/compute-api/src/v2.1/xsd/affinity-id.xsd similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/affinity-id.xsd rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/affinity-id.xsd diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/api-common.xjb b/api-ref/src/wadls/compute-api/src/v2.1/xsd/api-common.xjb similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/api-common.xjb rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/api-common.xjb diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/api-common.xsd b/api-ref/src/wadls/compute-api/src/v2.1/xsd/api-common.xsd similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/api-common.xsd rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/api-common.xsd diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/api.xjb b/api-ref/src/wadls/compute-api/src/v2.1/xsd/api.xjb similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/api.xjb rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/api.xjb diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/api.xsd b/api-ref/src/wadls/compute-api/src/v2.1/xsd/api.xsd similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/api.xsd rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/api.xsd diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/atom.xjb b/api-ref/src/wadls/compute-api/src/v2.1/xsd/atom.xjb similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/atom.xjb rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/atom.xjb diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/atom/atom.xsd b/api-ref/src/wadls/compute-api/src/v2.1/xsd/atom/atom.xsd similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/atom/atom.xsd rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/atom/atom.xsd diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/atom/xml.xsd b/api-ref/src/wadls/compute-api/src/v2.1/xsd/atom/xml.xsd similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/atom/xml.xsd rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/atom/xml.xsd diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/backup.xsd b/api-ref/src/wadls/compute-api/src/v2.1/xsd/backup.xsd similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/backup.xsd rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/backup.xsd diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/common.xsd b/api-ref/src/wadls/compute-api/src/v2.1/xsd/common.xsd similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/common.xsd rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/common.xsd diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/ext/rax-dme/api.xsd b/api-ref/src/wadls/compute-api/src/v2.1/xsd/ext/rax-dme/api.xsd similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/ext/rax-dme/api.xsd rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/ext/rax-dme/api.xsd diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/ext/rax-dme/rax-dme.xsd b/api-ref/src/wadls/compute-api/src/v2.1/xsd/ext/rax-dme/rax-dme.xsd similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/ext/rax-dme/rax-dme.xsd rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/ext/rax-dme/rax-dme.xsd diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/extensions.xsd b/api-ref/src/wadls/compute-api/src/v2.1/xsd/extensions.xsd similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/extensions.xsd rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/extensions.xsd diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/faults.xsd b/api-ref/src/wadls/compute-api/src/v2.1/xsd/faults.xsd similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/faults.xsd rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/faults.xsd diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/flavor.xsd b/api-ref/src/wadls/compute-api/src/v2.1/xsd/flavor.xsd similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/flavor.xsd rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/flavor.xsd diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/image.xsd b/api-ref/src/wadls/compute-api/src/v2.1/xsd/image.xsd similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/image.xsd rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/image.xsd diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/ipgroup.xsd b/api-ref/src/wadls/compute-api/src/v2.1/xsd/ipgroup.xsd similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/ipgroup.xsd rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/ipgroup.xsd diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/limits.xsd b/api-ref/src/wadls/compute-api/src/v2.1/xsd/limits.xsd similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/limits.xsd rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/limits.xsd diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/metadata.xsd b/api-ref/src/wadls/compute-api/src/v2.1/xsd/metadata.xsd similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/metadata.xsd rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/metadata.xsd diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/server.xsd b/api-ref/src/wadls/compute-api/src/v2.1/xsd/server.xsd similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/server.xsd rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/server.xsd diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/shareip.xjb b/api-ref/src/wadls/compute-api/src/v2.1/xsd/shareip.xjb similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/shareip.xjb rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/shareip.xjb diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/shareip.xsd b/api-ref/src/wadls/compute-api/src/v2.1/xsd/shareip.xsd similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/shareip.xsd rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/shareip.xsd diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/txt.htaccess b/api-ref/src/wadls/compute-api/src/v2.1/xsd/txt.htaccess similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/txt.htaccess rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/txt.htaccess diff --git a/api-ref/src/wadls/compute-api/src/v3/xsd/version.xsd b/api-ref/src/wadls/compute-api/src/v2.1/xsd/version.xsd similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xsd/version.xsd rename to api-ref/src/wadls/compute-api/src/v2.1/xsd/version.xsd diff --git a/api-ref/src/wadls/compute-api/src/v3/xslt/schema.xsl b/api-ref/src/wadls/compute-api/src/v2.1/xslt/schema.xsl similarity index 100% rename from api-ref/src/wadls/compute-api/src/v3/xslt/schema.xsl rename to api-ref/src/wadls/compute-api/src/v2.1/xslt/schema.xsl diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/versions-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2/api_samples/versions-get-resp.xml index 1213677fc..146ceb48e 100644 --- a/api-ref/src/wadls/compute-api/src/v2/api_samples/versions-get-resp.xml +++ b/api-ref/src/wadls/compute-api/src/v2/api_samples/versions-get-resp.xml @@ -1,7 +1,7 @@ - + diff --git a/api-ref/src/wadls/compute-api/src/v2/wadl/samples/compute-versions-response.xml b/api-ref/src/wadls/compute-api/src/v2/wadl/samples/compute-versions-response.xml index 243e6ac13..7af638d01 100644 --- a/api-ref/src/wadls/compute-api/src/v2/wadl/samples/compute-versions-response.xml +++ b/api-ref/src/wadls/compute-api/src/v2/wadl/samples/compute-versions-response.xml @@ -1,7 +1,7 @@ - + + + + + + + + + + + + + + + + + .. + + + + + + XML Schema Documentation + application/xhtml+xml + http://www.w3.org/2001/XMLSchema + http://web4.w3.org/TR/2001/REC-xmlschema-2-20010502/# + + " + ' + + + + + + + + + + + + + + + + + + + + element_ + attrib_ + attgrp_ + grp_ + type_ + + + + http://yui.yahooapis.com/2.7.0/build/ + + + + + + + + + + + + + + + + + stylesheet + text/css + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <xslt:value-of select="xsd:annotation/xsd:appinfo/xsdxt:title"/> + + + <xslt:value-of select="$defaultTitle"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+ 
Loading...
+
+
+
+ + + +

+ + +

+ + + + + + + + + + + + + +
+ + + + + + + + + +

Namespaces

+ + + +
+

+ Your browser does not seem to have support for + namespace nodes in XPath. If you're a Firefox + user, please consider voting to get this issue + resolved: + + https://bugzilla.mozilla.org/show_bug.cgi?id=94270 + +

+
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + + + + + + + trc.schema.controller.links[' + + ']=[ + + + + + + + + + + + + + + + + + + + + + + + + + + , + + + ]; + + + + + + trc.schema.controller.index = + + + + + + index + + + Index Schema Document + + + ; + + + + + + + trc.schema.controller.links[' + + ']=[ + + + + # + + + + + + + + See definition of + + + + + , + + + ]; + + + + + + + + { href : + + + + + + , name : + + + + + + , title : + + + + + + } + + + + + + + + +

Imports

+ + + + + + + + + +
+ + +
+
+ + + Visit + + +
+
+ +
+
+
+ + + +

Includes

+ + + + + + + + +
+
+
+ + + Visit + + +
+
+ +
+
+
+ + + +

Elements

+ + + + + + + + + + + + + + + +
+
+ + + trc.schema.sampleManager.showSample( + + + + ); + + + + + + + + + + + + + + + + + + + + +
+
+ + + + Sample +
+ +
+ + + + + + + +
+ + + + + + + Loading... + + + + + + +
+ + + + + + + +

Complex Types

+ + + + + + + + + +

Simple Types

+ + + + + + + + + + + + + # + + + + + + + + + + + + + + + + + + +

+ +

+ + + + + +
+ extends: + + + + , + + +
+ + +
+ restricts: + + + + , + + +
+ + + + + + + + + + + + + + + + + SubAttributes + + + Attributes + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + SubDocumentation + + + Documentation + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Sequence + + +
+ + + + +
+
+
+ +
+ + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + <?> (Any Element) + + + + + + + + @? (Any Attribute) + + + + + +
+ restriction +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
enum values
+ + + + + + + + + + + + + + +
+
+ + + (id = + + ) + +
+ +
+ +
+ +
+ + + + + + + + + + (id = + + ) + + + (fixed) + + + + + + + + + + + + +
+ +
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + < + + > + + + + + + @ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/api-ref/src/wadls/image-api/src/v2/samples/extensions.json b/api-ref/src/wadls/image-api/src/v2/samples/extensions.json new file mode 100644 index 000000000..a977d991b --- /dev/null +++ b/api-ref/src/wadls/image-api/src/v2/samples/extensions.json @@ -0,0 +1,3 @@ +{ + "key": "value" +} \ No newline at end of file diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/pool-post-req.json b/api-ref/src/wadls/netconn-api/src/api_samples/pool-post-req.json index 89e73a49b..67c0ff5c4 100644 --- a/api-ref/src/wadls/netconn-api/src/api_samples/pool-post-req.json +++ b/api-ref/src/wadls/netconn-api/src/api_samples/pool-post-req.json @@ -1,8 +1,9 @@ { - "pool":{ - "name":"Example pool", - "tenant_id":"19eaa775-cf5d-49bc-902e-2f85f668d995", - "protocol":"HTTP", - "lb_algorithm":"ROUND_ROBIN" - } + "pool": { + "lb_method": "ROUND_ROBIN", + "protocol": "HTTP", + "name": "Example pool", + "subnet_id": "1981f108-3c48-48d2-b908-30f7d28532c9", + "tenant_id": "2ffc6e22aae24e4795f87155d24c896f" + } } \ No newline at end of file diff --git a/api-ref/src/wadls/netconn-api/src/api_samples/pool-post-resp.json b/api-ref/src/wadls/netconn-api/src/api_samples/pool-post-resp.json index c858790a1..b5a012d4c 100644 --- a/api-ref/src/wadls/netconn-api/src/api_samples/pool-post-resp.json +++ b/api-ref/src/wadls/netconn-api/src/api_samples/pool-post-resp.json @@ -1,17 +1,19 @@ { - "pool":{ - "id":"332abe93-f488-41ba-870b-2ac66be7f853", - "tenant_id":"19eaa775-cf5d-49bc-902e-2f85f668d995", - "name":"Example pool", - "description":"", - "protocol":"tcp", - "lb_algorithm":"ROUND_ROBIN", - "session_persistence":{ - }, - "healthmonitor_id":null, - "members":[ - ], - "admin_state_up":true, - "status":"ACTIVE" - } + "pool": { + "status": "PENDING_CREATE", + "lb_method": "ROUND_ROBIN", + "protocol": "HTTP", + "description": "", + "health_monitors": [], + "members": [], + "status_description": null, + "id": "69055154-f603-4a28-8951-7cc2d9e54a9a", + "vip_id": null, + "name": "Example pool", + "admin_state_up": true, + "subnet_id": "1981f108-3c48-48d2-b908-30f7d28532c9", + "tenant_id": "2ffc6e22aae24e4795f87155d24c896f", + "health_monitors_status": [], + "provider": "haproxy" + } } \ No newline at end of file diff --git a/api-ref/src/wadls/netconn-api/src/common.ent b/api-ref/src/wadls/netconn-api/src/common.ent index be990c22d..c644a2d28 100644 --- a/api-ref/src/wadls/netconn-api/src/common.ent +++ b/api-ref/src/wadls/netconn-api/src/common.ent @@ -1163,7 +1163,7 @@ + name="subnet_id" style="plain" type="csapi:uuid">