diff --git a/api-ref/src/docbkx/ch_compute-v2.1.xml b/api-ref/src/docbkx/ch_compute-v2.1.xml
index 499546263..5ccb5fb7c 100644
--- a/api-ref/src/docbkx/ch_compute-v2.1.xml
+++ b/api-ref/src/docbkx/ch_compute-v2.1.xml
@@ -4,290 +4,274 @@
%common_project;
]>
- Compute API v2.1 (CURRENT)
- XML support in requests and responses has been deprecated for the Compute
- API v2.1 (originally referred to as API v3).
-
- The Compute API returns the 403 forbidden error code if
- you exceed your allotted quota for the operation.
-
-
-
-
- API versions
- Lists information for all API versions.
-
-
-
-
-
-
-
- Availability zones (os-availability-zone)
- Gets availability zone information.
-
-
-
- Server actions (servers)
-
- Performs actions on a server. Specify the action in the request body.
-
-
-
-
- Server admin actions (servers)
- Administrators only. Performs actions on a server. Specify
- the action in the request body.
-
-
-
- Server IPs (ips)
-
- Lists the IP addresses assigned to an instance or show details for
- a specified IP address.
-
-
-
-
- Server backups (servers)
-
- Backs up a server instance.
-
-
-
-
- Admin password (os-admin-password)
-
- Clears the encrypted copy of the password from the metadata server
- after the client gets the password and determines that it no longer needs
- it in the metadata server. The password for the server remains the
- same.
-
-
-
-
- Guest agents (os-agents)
-
- Creates, lists, updates, and deletes guest agent builds. Use guest
- agents to access files on the disk, configure networking, or run other
- applications or scripts in the guest while the agent runs. This
- hypervisor-specific extension is not currently enabled for KVM. 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)
-
- Adds neighbor cells, lists neighbor cells, and gets 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 console output (os-console-output)
- Gets console output for a server instance.
-
-
-
- Server deferred delete (os-deferred-delete)
- Force-deletes a server or restores a deleted server.
-
-
-
- Evacuate (os-evacuate)
- Evacuates servers.
-
-
-
- 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.
-
-
-
-
- Flavors (flavors and flavor-access)
- Creates, lists, shows details for, and manages access for flavors.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Flavor extra-specs (flavor-extra-specs)
- Lists, creates, deletes, and updates the extra-specs or keys
- for a flavor.
-
-
-
- Flavor manage (flavor-manage)
- Creates and deletes flavors.
-
-
-
- Flavors with rxtx_factor extended attribute
- (os-flavor-rxtx)
- Shows the rxtx status of a flavor.
-
-
-
- Flavors with extended attributes (flavors)
- Shows information about flavors.
-
-
-
- Floating IP DNS records (os-floating-ip-dns)
- Manages DNS records associated with IP addresses
- allocated by the floating IPs extension. Requests are
- dispatched to a DNS driver selected at startup.
-
-
-
- Floating IP pools (os-floating-ip-pools)
- Manages groups of floating IPs.
-
-
-
- Floating IPs (os-floating-ips)
- Assigns and allocates floating IP addresses to instances
- that run in an OpenStack cloud.
-
-
-
- Floating IPs bulk (os-floating-ips-bulk)
-
- Bulk-creates, deletes, and lists floating IPs. By default, the pool
- is named nova.
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ 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-v2.1"
+ role="api-reference">
+ Compute API v2.1 (CURRENT)
+
+ XML support in requests and responses has been deprecated for the Compute
+ API v2.1 (originally referred to as API v3).
+
+
+
+
+ The Compute API returns the 403 forbidden error code if
+ you exceed your allotted quota for the operation.
+
+
+
+
+
+ API versions
+ Lists information for all API versions.
+
+
+
+
+
+
+
+ Availability zones (os-availability-zone)
+ Gets availability zone information.
+
+
+
+ Server actions (servers)
+
+ Performs actions on a server. Specify the action in the request body.
+
+
+
+
+ Server admin actions (servers)
+ Administrators only. Performs actions on a server. Specify
+ the action in the request body.
+
+
+
+
+ Server IPs (ips)
+
+ Lists the IP addresses assigned to an instance or show details for
+ a specified IP address.
+
+
+
+
+ Server backups (servers)
+
+ Backs up a server instance.
+
+
+
+
+ Admin password (os-admin-password)
+
+ Clears the encrypted copy of the password from the metadata server
+ after the client gets the password and determines that it no longer needs
+ it in the metadata server. The password for the server remains the
+ same.
+
+
+
+
+ Guest agents (os-agents)
+
+ Creates, lists, updates, and deletes guest agent builds. Use guest
+ agents to access files on the disk, configure networking, or run other
+ applications or scripts in the guest while the agent runs. This
+ hypervisor-specific extension is not currently enabled for KVM. 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)
+ Adds neighbor cells, lists neighbor cells, and gets 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 console output (os-console-output)
+ Gets console output for a server instance.
+
+
+
+ Server deferred delete (os-deferred-delete)
+ Force-deletes a server or restores a deleted server.
+
+
+
+ Evacuate (os-evacuate)
+ Evacuates servers.
+
+
+
+ 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.
+
+
+
+
+ Flavors (flavors and flavor-access)
+ Creates, lists, shows details for, and manages access for flavors.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Flavor extra-specs (flavor-extra-specs)
+ Lists, creates, deletes, and updates the extra-specs or keys
+ for a flavor.
+
+
+
+
+ Flavor manage (flavor-manage)
+ Creates and deletes flavors.
+
+
+
+ Flavors with rxtx_factor extended attribute (os-flavor-rxtx)
+
+ Shows the rxtx status of a flavor.
+
+
+
+ Flavors with extended attributes (flavors)
+ Shows information about flavors.
+
+
+
+ Floating IP DNS records (os-floating-ip-dns)
+ Manages DNS records associated with IP addresses
+ allocated by the floating IPs extension. Requests are
+ dispatched to a DNS driver selected at startup.
+
+
+
+
+ Floating IP pools (os-floating-ip-pools)
+ Manages groups of floating IPs.
+
+
+
+ Floating IPs (os-floating-ips)
+ Assigns and allocates floating IP addresses to instances
+ that run in an OpenStack cloud.
+
+
+
+
+ Floating IPs bulk (os-floating-ips-bulk)
+
+ Bulk-creates, deletes, and lists floating IPs. By default, the pool
+ is named nova.
- Use the os-floating-ip-pools extension
- to view available pools.
+ Use the os-floating-ip-pools extension to view available pools.
-
diff --git a/api-ref/src/docbkx/ch_compute-v2.xml b/api-ref/src/docbkx/ch_compute-v2.xml
index 0953df572..02e4f02f4 100644
--- a/api-ref/src/docbkx/ch_compute-v2.xml
+++ b/api-ref/src/docbkx/ch_compute-v2.xml
@@ -95,57 +95,86 @@
You can use both IPv4 and IPv6 addresses as access addresses and you can
assign both addresses simultaneously. You can update access addresses after
- you create a server.
+ you create a server.
+
Server personality
- You can customize the personality of a server instance by injecting data into
- its file system. For example, you might want to insert ssh keys, set
- configuration files, or store data that you want to retrieve from inside the
- instance. This feature provides a minimal amount of launch-time personalization.
- If you require significant customization, create a custom image.
- Follow these guidelines when you inject files:
+
+ You can customize the personality of a server instance by
+ injecting data into its file system. For example, you
+ might want to insert ssh keys, set configuration files, or
+ store data that you want to retrieve from inside the
+ instance. This feature provides a minimal amount of
+ launch-time personalization. If you require significant
+ customization, create a custom image.
+
+
+ Follow these guidelines when you inject files:
+
The maximum size of the file path data is 255 bytes.
- Encode the file contents as a Base64 string. The compute providers
- determines the maximum size of the file contents. This value can vary
- based on the image that is used to create the server.
+
+ Encode the file contents as a Base64 string. The
+ compute providers determines the maximum size of
+ the file contents. This value can vary based on
+ the image that is used to create the server.
+
- The maximum limit refers to the number of bytes in the decoded
- data and not to the number of characters in the encoded data.
+
+ The maximum limit refers to the number of
+ bytes in the decoded data and not to the
+ number of characters in the encoded data.
+
- You can inject text files only. You cannot inject binary or ZIP files
- into a new build.
+
+ You can inject only text files. You cannot inject
+ binary or ZIP files into a new build.
+
- The maximum number of file path/content pairs that you can supply is
- also determined by the compute provider and is defined by the
- maxPersonality absolute limit.
+
+ The maxPersonality absolute limit
+ defines the maximum number of file path and
+ content pairs that you can supply. The compute
+ provider determines this value.
+
- The absolute limit, maxPersonalitySize, is a byte limit
- that is guaranteed to apply to all images in the deployment. Providers
- can set additional per-image personality limits.
+
+ The maxPersonalitySize absolute limit
+ is a byte limit that is guaranteed to apply to all
+ images in the deployment. Providers can set
+ additional per-image personality limits.
+
- The file injection might not occur until after the server is built and
- booted.
- During file injection, any existing files that match specified files are
- renamed to include the BAK extension appended with a time stamp. For example, if
- the /etc/passwd file exists, it is backed up as
- /etc/passwd.bak.1246036261.5785.
- After file injection, personality files are accessible by only system
- administrators. For example, on Linux, all files have root and the root group as
- the owner and group owner, respectively, and allow user and group read access
- only ( ).
+
+ The file injection might not occur until after the server
+ is built and booted.
+
+
+ During file injection, any existing files that match
+ specified files are renamed to include the BAK extension
+ appended with a time stamp. For example, if the
+ /etc/passwd file exists, it is backed up as
+ /etc/passwd.bak.1246036261.5785.
+
+
+ After file injection, only system administrators can
+ access personality files. For example, on Linux, all files
+ have root as the owner and the root group as the group
+ owner, and allow only user and group read access (chmod
+ 440).
+
@@ -162,10 +191,9 @@
might be assigned at creation time to provide access to
the server. This address might not be directly bound to a
network interface on the server and might not necessarily
- appear when you query the server addresses. See Compute
- server address. Nonetheless, clients that must access the
- server directly are encouraged to do so through an access
- address.
+ appear when you query the server addresses. Nonetheless,
+ clients that must access the server directly are
+ encouraged to do so through an access address.
@@ -203,7 +231,10 @@
Server addresses
- Lists addresses for a specified server or a specified server and network.
+
+ List addresses for a specified server or a specified server and
+ network.
+
@@ -211,8 +242,11 @@
Server actions
- Performs actions for a specified server. Changes administrator password,
- reboots, rebuilds, resizes, and creates an image from a server.
+
+ Perform actions for a specified server, including change
+ administrator password, reboot, rebuild, resize, and create image
+ from server.
+
@@ -227,9 +261,11 @@
Flavors
- Lists available flavors and gets details for a specified flavor. A flavor is a hardware
- configuration for a server. Each flavor is a unique combination of disk space and memory
- capacity.
+
+ List available flavors and get details for a specified flavor. A
+ flavor is a hardware configuration for a server. Each flavor is a
+ unique combination of disk space and memory capacity.
+
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-volumes/server-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-volumes/server-get-resp.json
index 6008935a6..830c42b9a 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-volumes/server-get-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-volumes/server-get-resp.json
@@ -1,43 +1,44 @@
{
"server": {
- "accessIPv4": "",
- "accessIPv6": "",
"addresses": {
"private": [
{
"addr": "192.168.0.3",
+ "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
+ "OS-EXT-IPS:type": "fixed",
"version": 4
}
]
},
- "created": "2013-02-07T19:35:09Z",
+ "created": "2013-09-16T03:22:28Z",
"flavor": {
"id": "1",
"links": [
{
- "href": "http://openstack.example.com/openstack/flavors/1",
+ "href": "http://openstack.example.com/flavors/1",
"rel": "bookmark"
}
]
},
- "hostId": "570eff4776ab310707d11d181037337197086998a8b3305c90bf87c8",
- "id": "ecb5e433-fa75-4db2-af3d-a29ae8618edc",
+ "hostId": "8feef92e2152b9970b51dbdade024afbec7f8f03daf7cb335a3c1cb9",
+ "id": "7d62983e-23df-4320-bc89-bbc77f2a2e40",
"image": {
"id": "70a599e0-31e7-49b7-b260-868f441e862b",
"links": [
{
- "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+ "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
"rel": "bookmark"
}
]
},
+ "key_name": null,
"links": [
{
- "href": "http://openstack.example.com/v2/openstack/servers/ecb5e433-fa75-4db2-af3d-a29ae8618edc",
+ "href": "http://openstack.example.com/v2.1/servers/7d62983e-23df-4320-bc89-bbc77f2a2e40",
"rel": "self"
},
{
- "href": "http://openstack.example.com/openstack/servers/ecb5e433-fa75-4db2-af3d-a29ae8618edc",
+ "href": "http://openstack.example.com/servers/7d62983e-23df-4320-bc89-bbc77f2a2e40",
"rel": "bookmark"
}
],
@@ -45,18 +46,18 @@
"My Server Name": "Apache1"
},
"name": "new-server-test",
- "progress": 0,
- "status": "ACTIVE",
- "tenant_id": "openstack",
- "updated": "2013-02-07T19:35:10Z",
- "user_id": "fake",
- "os-extended-volumes: volumes_attached": [
+ "os-extended-volumes:volumes_attached": [
{
"id": "volume_id1"
},
{
"id": "volume_id2"
}
- ]
+ ],
+ "progress": 0,
+ "status": "ACTIVE",
+ "tenant_id": "openstack",
+ "updated": "2013-09-16T03:22:29Z",
+ "user_id": "fake"
}
}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-volumes/server-get-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-volumes/server-get-resp.xml
deleted file mode 100644
index 37b790b66..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-volumes/server-get-resp.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
- Apache1
-
-
-
-
-
-
-
-
-
-
-
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-volumes/servers-detail-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-volumes/servers-detail-resp.json
index 6556af771..6f92debd3 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-volumes/servers-detail-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-volumes/servers-detail-resp.json
@@ -1,44 +1,45 @@
{
"servers": [
{
- "accessIPv4": "",
- "accessIPv6": "",
"addresses": {
"private": [
{
"addr": "192.168.0.3",
+ "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
+ "OS-EXT-IPS:type": "fixed",
"version": 4
}
]
},
- "created": "2012-12-05T07:34:10Z",
+ "created": "2013-09-16T03:22:32Z",
"flavor": {
"id": "1",
"links": [
{
- "href": "http://openstack.example.com/openstack/flavors/1",
+ "href": "http://openstack.example.com/flavors/1",
"rel": "bookmark"
}
]
},
- "hostId": "585aa01f94eca692eff9f77ffe3eab866d8a819e97397e28c5c7df12",
- "id": "030758aa-5c41-41c6-8fb4-29d44eb96a85",
+ "hostId": "f9622ec1b5ab6e3785661ea1c1e0294f95aecbcf27ac4cb60b06bd02",
+ "id": "8e479732-7701-48cd-af7a-04d84f51b742",
"image": {
"id": "70a599e0-31e7-49b7-b260-868f441e862b",
"links": [
{
- "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+ "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
"rel": "bookmark"
}
]
},
+ "key_name": null,
"links": [
{
- "href": "http://openstack.example.com/v2/openstack/servers/030758aa-5c41-41c6-8fb4-29d44eb96a85",
+ "href": "http://openstack.example.com/v2.1/servers/8e479732-7701-48cd-af7a-04d84f51b742",
"rel": "self"
},
{
- "href": "http://openstack.example.com/openstack/servers/030758aa-5c41-41c6-8fb4-29d44eb96a85",
+ "href": "http://openstack.example.com/servers/8e479732-7701-48cd-af7a-04d84f51b742",
"rel": "bookmark"
}
],
@@ -46,19 +47,19 @@
"My Server Name": "Apache1"
},
"name": "new-server-test",
- "progress": 0,
- "status": "ACTIVE",
- "tenant_id": "openstack",
- "updated": "2012-12-05T07:34:10Z",
- "user_id": "fake",
- "os-extended-volumes: volumes_attached": [
+ "os-extended-volumes:volumes_attached": [
{
"id": "volume_id1"
},
{
"id": "volume_id2"
}
- ]
+ ],
+ "progress": 0,
+ "status": "ACTIVE",
+ "tenant_id": "openstack",
+ "updated": "2013-09-16T03:22:34Z",
+ "user_id": "fake"
}
]
}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-volumes/servers-detail-resp.xml b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-volumes/servers-detail-resp.xml
deleted file mode 100644
index a8566f2a0..000000000
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-volumes/servers-detail-resp.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- Apache1
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-volumes/v2.3/server-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-volumes/v2.3/server-get-resp.json
new file mode 100644
index 000000000..11d328adf
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-volumes/v2.3/server-get-resp.json
@@ -0,0 +1,65 @@
+{
+ "server": {
+ "addresses": {
+ "private": [
+ {
+ "addr": "192.168.0.3",
+ "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
+ "OS-EXT-IPS:type": "fixed",
+ "version": 4
+ }
+ ]
+ },
+ "created": "2013-09-16T03:22:28Z",
+ "flavor": {
+ "id": "1",
+ "links": [
+ {
+ "href": "http://openstack.example.com/flavors/1",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "hostId": "8feef92e2152b9970b51dbdade024afbec7f8f03daf7cb335a3c1cb9",
+ "id": "7d62983e-23df-4320-bc89-bbc77f2a2e40",
+ "image": {
+ "id": "70a599e0-31e7-49b7-b260-868f441e862b",
+ "links": [
+ {
+ "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "key_name": null,
+ "links": [
+ {
+ "href": "http://openstack.example.com/v2.1/servers/7d62983e-23df-4320-bc89-bbc77f2a2e40",
+ "rel": "self"
+ },
+ {
+ "href": "http://openstack.example.com/servers/7d62983e-23df-4320-bc89-bbc77f2a2e40",
+ "rel": "bookmark"
+ }
+ ],
+ "metadata": {
+ "My Server Name": "Apache1"
+ },
+ "name": "new-server-test",
+ "os-extended-volumes:volumes_attached": [
+ {
+ "id": "volume_id1",
+ "delete_on_termination": "True"
+ },
+ {
+ "id": "volume_id2",
+ "delete_on_termination": "False"
+ }
+ ],
+ "progress": 0,
+ "status": "ACTIVE",
+ "tenant_id": "openstack",
+ "updated": "2013-09-16T03:22:29Z",
+ "user_id": "fake"
+ }
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-volumes/v2.3/servers-detail-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-volumes/v2.3/servers-detail-resp.json
new file mode 100644
index 000000000..88c7579f4
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-volumes/v2.3/servers-detail-resp.json
@@ -0,0 +1,67 @@
+{
+ "servers": [
+ {
+ "addresses": {
+ "private": [
+ {
+ "addr": "192.168.0.3",
+ "OS-EXT-IPS-MAC:mac_addr": "aa:bb:cc:dd:ee:ff",
+ "OS-EXT-IPS:type": "fixed",
+ "version": 4
+ }
+ ]
+ },
+ "created": "2013-09-16T03:22:32Z",
+ "flavor": {
+ "id": "1",
+ "links": [
+ {
+ "href": "http://openstack.example.com/flavors/1",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "hostId": "f9622ec1b5ab6e3785661ea1c1e0294f95aecbcf27ac4cb60b06bd02",
+ "id": "8e479732-7701-48cd-af7a-04d84f51b742",
+ "image": {
+ "id": "70a599e0-31e7-49b7-b260-868f441e862b",
+ "links": [
+ {
+ "href": "http://openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b",
+ "rel": "bookmark"
+ }
+ ]
+ },
+ "key_name": null,
+ "links": [
+ {
+ "href": "http://openstack.example.com/v2.1/servers/8e479732-7701-48cd-af7a-04d84f51b742",
+ "rel": "self"
+ },
+ {
+ "href": "http://openstack.example.com/servers/8e479732-7701-48cd-af7a-04d84f51b742",
+ "rel": "bookmark"
+ }
+ ],
+ "metadata": {
+ "My Server Name": "Apache1"
+ },
+ "name": "new-server-test",
+ "os-extended-volumes:volumes_attached": [
+ {
+ "id": "volume_id1",
+ "delete_on_termination": "True"
+ },
+ {
+ "id": "volume_id2",
+ "delete_on_termination": "False"
+ }
+ ],
+ "progress": 0,
+ "status": "ACTIVE",
+ "tenant_id": "openstack",
+ "updated": "2013-09-16T03:22:34Z",
+ "user_id": "fake"
+ }
+ ]
+}
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json
index 5852fe444..58364e47c 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json
@@ -4,7 +4,7 @@
"id": "440cf918-3ee0-4143-b289-f63e1d2000e6",
"links": [
{
- "href": "http://openstack.example.com/v3/servers/440cf918-3ee0-4143-b289-f63e1d2000e6",
+ "href": "http://openstack.example.com/v2.1/servers/440cf918-3ee0-4143-b289-f63e1d2000e6",
"rel": "self"
},
{
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-action-rebuild-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-action-rebuild-resp.json
index 9bb066d44..3b18a2d80 100644
--- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-action-rebuild-resp.json
+++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/servers/server-action-rebuild-resp.json
@@ -32,7 +32,7 @@
},
"links": [
{
- "href": "http://openstack.example.com/v3/servers/a0a80a94-3d81-4a10-822a-daa0cf9e870b",
+ "href": "http://openstack.example.com/v2.1/servers/a0a80a94-3d81-4a10-822a-daa0cf9e870b",
"rel": "self"
},
{
diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-volumes.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-volumes.wadl
new file mode 100644
index 000000000..e677c47ed
--- /dev/null
+++ b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-volumes.wadl
@@ -0,0 +1,57 @@
+
+
+
+%common;]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Shows volume information for a specified
+ server.
+
+
+
+
+
+
+
+
+
+
+
+
+ Lists servers with attached volume information.
+
+
+
+
+
+
+
+
+
+
+