diff --git a/api-ref/src/docbkx/ch_compute-v2.1.xml b/api-ref/src/docbkx/ch_compute-v2.1.xml index 94b28d688..566804805 100644 --- a/api-ref/src/docbkx/ch_compute-v2.1.xml +++ b/api-ref/src/docbkx/ch_compute-v2.1.xml @@ -107,15 +107,6 @@ href="../wadls/compute-api/src/v2.1/wadl/os-admin-password-v2.1.wadl" xmlns:wadl="http://wadl.dev.java.net/2009/02"/> -
- Servers backups (servers, action) - - Creates backup for a server instance. - - -
Servers console output (servers, action) @@ -238,41 +229,6 @@ href="../wadls/compute-api/src/v2.1/wadl/os-config-drive-v2.1.wadl" xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
-
- Servers with extended availability zones - (servers, os-extended-availability-zones) - - - Shows the instance availability zone for compute nodes (nova- - compute). Internal services appear in their own internal availability - zone. - - -
-
- Servers extended attributes - (servers, os-extended-server-attributes) - - - Shows metadata for servers. - - -
-
- Servers extended status (servers, os-extended-status) - - Shows extended status information, vm_state, - task_state, and power_state, in detailed - server responses. - - -
Servers password (servers, os-server-password) @@ -292,15 +248,6 @@ href="../wadls/compute-api/src/v2.1/wadl/os-virtual-interfaces-v2.1.wadl" xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
-
- Servers extended volumes (servers) - - Lists servers with attached volume information. - - -
Flavors with extended attributes (flavors) diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-server-attributes/server-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-server-attributes/server-get-resp.json deleted file mode 100644 index 0085ae1f4..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-server-attributes/server-get-resp.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "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-16T02:55:07Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "3bf189131c61d0e71b0a8686a897a0f50d1693b48c47b721fe77155b", - "id": "c278163e-36f9-4cf2-b1ac-80db4c63f7a8", - "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/c278163e-36f9-4cf2-b1ac-80db4c63f7a8", - "rel": "self" - }, - { - "href": "http://openstack.example.com/servers/c278163e-36f9-4cf2-b1ac-80db4c63f7a8", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "OS-EXT-SRV-ATTR:host": "c5f474bf81474f9dbbc404d5b2e4e9b3", - "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", - "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "openstack", - "updated": "2013-09-16T02:55:08Z", - "user_id": "fake" - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-server-attributes/server-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-server-attributes/server-post-resp.json deleted file mode 100644 index 53942c41c..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-server-attributes/server-post-resp.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "server": { - "adminPass": "UCvmH8nHXm66", - "id": "a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", - "links": [ - { - "href": "http://openstack.example.com/v2.1/servers/a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", - "rel": "self" - }, - { - "href": "http://openstack.example.com/servers/a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", - "rel": "bookmark" - } - ] - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-server-attributes/servers-detail-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-server-attributes/servers-detail-resp.json deleted file mode 100644 index c9dcc331b..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-server-attributes/servers-detail-resp.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "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-16T02:55:03Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "63cf07a9fd82e1d2294926ec5c0d2e1e0ca449224246df75e16f23dc", - "id": "a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", - "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/a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", - "rel": "self" - }, - { - "href": "http://openstack.example.com/servers/a8c1c13d-ec7e-47c7-b4ff-077f72c1ca46", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "OS-EXT-SRV-ATTR:host": "bc8efe4fdb7148a4bb921a2b03d17de6", - "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", - "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "openstack", - "updated": "2013-09-16T02:55:05Z", - "user_id": "fake" - } - ] -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-status/server-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-status/server-get-resp.json deleted file mode 100644 index 425413c2f..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-status/server-get-resp.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "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:07:06Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "46d2aa2d637bd55606304b611a1928627ee1278c149aef2206268d6e", - "id": "a868cb5e-c794-47bf-9cd8-e302b72bb94b", - "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/a868cb5e-c794-47bf-9cd8-e302b72bb94b", - "rel": "self" - }, - { - "href": "http://openstack.example.com/servers/a868cb5e-c794-47bf-9cd8-e302b72bb94b", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "OS-EXT-STS:power_state": 1, - "OS-EXT-STS:task_state": null, - "OS-EXT-STS:vm_state": "active", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "openstack", - "updated": "2013-09-16T03:07:07Z", - "user_id": "fake" - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-status/servers-detail-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-status/servers-detail-resp.json deleted file mode 100644 index 4eb867eca..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-status/servers-detail-resp.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "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:07:09Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "a275e77473e464558c4aba0d68e1914d1164e7ee2f69affde7aaae2b", - "id": "6c8b5385-e74c-4fd5-add6-2fcf42d74a98", - "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/6c8b5385-e74c-4fd5-add6-2fcf42d74a98", - "rel": "self" - }, - { - "href": "http://openstack.example.com/servers/6c8b5385-e74c-4fd5-add6-2fcf42d74a98", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "OS-EXT-STS:power_state": 1, - "OS-EXT-STS:task_state": null, - "OS-EXT-STS:vm_state": "active", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "openstack", - "updated": "2013-09-16T03:07:10Z", - "user_id": "fake" - } - ] -} 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 deleted file mode 100644 index 830c42b9a..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-volumes/server-get-resp.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "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" - }, - { - "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/servers-detail-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-volumes/servers-detail-resp.json deleted file mode 100644 index 6f92debd3..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-extended-volumes/servers-detail-resp.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "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" - }, - { - "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/wadl/os-create-backup-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-create-backup-v2.1.wadl deleted file mode 100644 index 8387ff6af..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-create-backup-v2.1.wadl +++ /dev/null @@ -1,92 +0,0 @@ - - - %common; - - %common_project; -]> - - - - - - &tenantIdRequestParameter; - - - &serverIdRequestParameter; - - - - - - - - - - - - - - Backs up a server instance. - - Specify the createBackup action in the request - body. - - - Policy defaults enable only users with the administrative role - or the owner of the server to perform this operation. Cloud - providers can change these permissions through the - policy.json file. - - - - - - - - - - - The name for the backup. - - - - - - - The backup type. A valid value is - daily or weekly. - - - - - - - The number of backups to maintain. A valid value - is greater than or equal to zero. - - - - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-availability-zone-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-availability-zone-v2.1.wadl deleted file mode 100644 index 5cafb087d..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-availability-zone-v2.1.wadl +++ /dev/null @@ -1,68 +0,0 @@ - - - - %common; - - %common_project; -]> - - - - - &tenantIdRequestParameter; - - - - &serverIdRequestParameter; - - - - - - - - - - - - - - - - Shows details for a specified - server. - - - - - - &x-openstack-request-idHeader; - - - - - - Lists server details for a - specified user. - - - - - - &x-openstack-request-idHeader; - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-server-attributes-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-server-attributes-v2.1.wadl deleted file mode 100644 index c3f92fb5f..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-server-attributes-v2.1.wadl +++ /dev/null @@ -1,68 +0,0 @@ - - - - %common; - - %common_project; -]> - - - - - &tenantIdRequestParameter; - - - - &serverIdRequestParameter; - - - - - - - - - - - - - - - - Shows details for a specified - server. - - - - - - &x-openstack-request-idHeader; - - - - - - Lists server details for a - specified user. - - - - - - &x-openstack-request-idHeader; - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-status-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-status-v2.1.wadl deleted file mode 100644 index 4b0511b69..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-status-v2.1.wadl +++ /dev/null @@ -1,65 +0,0 @@ - - - - %common; - - %common_project; -]> - - - - - &tenantIdRequestParameter; - - - - &serverIdRequestParameter; - - - - - - - - - - - - - - - - Shows details for a specified server. - - - - - - &x-openstack-request-idHeader; - - - - - - Lists servers with details for a specified user. - - - - - - &x-openstack-request-idHeader; - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-volumes-v2.1.wadl b/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-volumes-v2.1.wadl deleted file mode 100644 index fb5dcf925..000000000 --- a/api-ref/src/wadls/compute-api/src/v2.1/wadl/os-extended-volumes-v2.1.wadl +++ /dev/null @@ -1,66 +0,0 @@ - - - - %common; - - %common_project; -]> - - - - - &tenantIdRequestParameter; - - - - - - &serverIdRequestParameter; - - - - - - - - - Shows volume information for a specified - server. - - - - - - - - - - - - - Lists servers with attached volume information. - - - - - - - - - - - diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-extended-availability-zone/server-get-resp.json b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-extended-availability-zone/server-get-resp.json deleted file mode 100644 index dffea6445..000000000 --- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-extended-availability-zone/server-get-resp.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "server": { - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", - "version": 4 - } - ] - }, - "created": "2013-09-16T02:54:56Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/flavors/1", - "rel": "bookmark" - } - ] - }, - "host_id": "b75d6736650f9b272223ceb48f4cde001de1856e381613a922117ab7", - "id": "f22e4521-d03a-4e9f-9fd3-016b9e227219", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "key_name": null, - "links": [ - { - "href": "http://openstack.example.com/v2.1/servers/f22e4521-d03a-4e9f-9fd3-016b9e227219", - "rel": "self" - }, - { - "href": "http://openstack.example.com/servers/f22e4521-d03a-4e9f-9fd3-016b9e227219", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "os-extended-availability-zone:availability_zone": "nova", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "openstack", - "updated": "2013-09-16T02:54:57Z", - "user_id": "fake" - } -} diff --git a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-extended-availability-zone/servers-detail-resp.json b/api-ref/src/wadls/compute-api/src/v2/api_samples/os-extended-availability-zone/servers-detail-resp.json deleted file mode 100644 index 0014a99b4..000000000 --- a/api-ref/src/wadls/compute-api/src/v2/api_samples/os-extended-availability-zone/servers-detail-resp.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "servers": [ - { - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "mac_addr": "aa:bb:cc:dd:ee:ff", - "type": "fixed", - "version": 4 - } - ] - }, - "created": "2013-09-16T02:54:56Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/flavors/1", - "rel": "bookmark" - } - ] - }, - "host_id": "cf5540800371e53064a60b36ff9d6d1d6a8719ffc870c63a270c6bee", - "id": "55f43fa2-dc7c-4c0b-b21a-76f9abe516f9", - "image": { - "id": "70a599e0-31e7-49b7-b260-868f441e862b", - "links": [ - { - "href": "http://glance.openstack.example.com/images/70a599e0-31e7-49b7-b260-868f441e862b", - "rel": "bookmark" - } - ] - }, - "key_name": null, - "links": [ - { - "href": "http://openstack.example.com/v2.1/servers/55f43fa2-dc7c-4c0b-b21a-76f9abe516f9", - "rel": "self" - }, - { - "href": "http://openstack.example.com/servers/55f43fa2-dc7c-4c0b-b21a-76f9abe516f9", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "os-extended-availability-zone:availability_zone": "nova", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "openstack", - "updated": "2013-09-16T02:54:58Z", - "user_id": "fake" - } - ] -}