From 95ccc46a2f46f8bdf926a4cfe157cea2f56b4ddb Mon Sep 17 00:00:00 2001 From: Diane Fleming Date: Wed, 22 May 2013 10:21:07 -0500 Subject: [PATCH] Updated title to "API Reference" from "Dev Guide" for consistency bug: #1178388 Change-Id: I03ac5c8a69e44fa0429b50711485f33c889c48b7 author: diane fleming --- openstack-compute-api-2/pom.xml | 6 +- .../src/os-compute-devguide.xml | 37 ++----- .../src/wadl/os-admin-actions.wadl | 100 ------------------ 3 files changed, 13 insertions(+), 130 deletions(-) diff --git a/openstack-compute-api-2/pom.xml b/openstack-compute-api-2/pom.xml index 246c97e..b2f796a 100644 --- a/openstack-compute-api-2/pom.xml +++ b/openstack-compute-api-2/pom.xml @@ -77,11 +77,11 @@ appendix toc,title article/appendix nop article toc,title - book title,figure,table,example,equation - chapter toc,title + book toc,title,figure,table,example,equation + chapter toc section toc part toc,title - preface toc,title + preface toc qandadiv toc qandaset toc reference toc,title diff --git a/openstack-compute-api-2/src/os-compute-devguide.xml b/openstack-compute-api-2/src/os-compute-devguide.xml index 8166222..4d0602c 100755 --- a/openstack-compute-api-2/src/os-compute-devguide.xml +++ b/openstack-compute-api-2/src/os-compute-devguide.xml @@ -34,10 +34,10 @@ xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" version="5.0" xml:id="os-cs-devguide"> - OpenStack Compute API and Extensions Specification - - OpenStack Compute API and Extensions - Specification + OpenStack Compute API v2 and Extensions Reference + + Compute API and Extensions + Reference @@ -57,7 +57,7 @@ OpenStack Foundation API v2 - OpenStack Compute API and Extensions + OpenStack Compute API v2 and Extensions @@ -74,7 +74,7 @@ - 2013-05-09 + 2013-05-22 @@ -1201,8 +1201,8 @@ Host: servers.api.openstack.org/v2/ machine-processable description is written in the Web Application Description Language (WADL). - If there is a discrepancy between the two - specifications, the WADL is authoritative as it + If a discrepancy exists between the two + References, the WADL is authoritative as it contains the most accurate and up-to-date description of the API service. @@ -3022,7 +3022,7 @@ Host: servers.api.openstack.org/v2/ The resize operation converts an existing server to a different flavor, in essence, scaling the server up or down. The original server is saved -<<<<<<< HEAD + for a period of time to allow rollback if a problem occurs. You should test and explicitly confirm all resizes. When you confirm a resize, the original server is removed. @@ -3030,24 +3030,7 @@ All resizes are automatically confirmed after 24 hours if you do not explicitly confirm or revert them. Depending on the cloud provider, this operation might result in billing you for a snapshot. -======= - for a period of time to allow rollback if - a problem occurs. You should test and explicitly confirm all resizes. When you confirm a resize, the original - server is removed. All resizes are automatically - confirmed after 24 hours if you do not explicitly confirm or resize them. - - You can complete the following types of migrations: - Live migrate with block storage migration. In the request body, set - the block_migration parameter to true. - Live migrate without block storage migration. - In the request body, set - the block_migration parameter to false. - Non-live migrate - Resize (this operation) - - Depending on your cloud provider, this operation might result in billing you for a snapshot. - You can delete the snapshot after you complete this operation. ->>>>>>> a59ebf6... Added information about migration types and billing + Specify the server ID as id in the URI. In the request body, specify the diff --git a/openstack-compute-api-2/src/wadl/os-admin-actions.wadl b/openstack-compute-api-2/src/wadl/os-admin-actions.wadl index d26fdd6..d2c1b82 100755 --- a/openstack-compute-api-2/src/wadl/os-admin-actions.wadl +++ b/openstack-compute-api-2/src/wadl/os-admin-actions.wadl @@ -58,24 +58,14 @@ element="compext:action"> -======= - href="../samples/admin-actions-pause.json" - /> ->>>>>>> a59ebf6... Added information about migration types and billing -======= - href="../samples/admin-actions-pause.xml" - /> ->>>>>>> a59ebf6... Added information about migration types and billing @@ -93,24 +83,14 @@ element="compext:action"> -======= - href="../samples/admin-actions-unpause.json" - /> ->>>>>>> a59ebf6... Added information about migration types and billing -======= - href="../samples/admin-actions-unpause.xml" - /> ->>>>>>> a59ebf6... Added information about migration types and billing @@ -128,24 +108,14 @@ element="compext:action"> -======= - href="../samples/admin-actions-suspend.json" - /> ->>>>>>> a59ebf6... Added information about migration types and billing -======= - href="../samples/admin-actions-suspend.xml" - /> ->>>>>>> a59ebf6... Added information about migration types and billing @@ -163,24 +133,14 @@ element="compext:action"> -======= - href="../samples/admin-actions-resume.json" - /> ->>>>>>> a59ebf6... Added information about migration types and billing -======= - href="../samples/admin-actions-resume.xml" - /> ->>>>>>> a59ebf6... Added information about migration types and billing @@ -189,18 +149,6 @@ -<<<<<<< HEAD - Migrates a server to a host. The - scheduler chooses the host. Specify the - migrate action in the request body. - You can complete the following types of migrations: - live migrate with block storage migration; live - migrate without block storage migration; non-live - migrate (this operation), or; resize. Depending on the - cloud provider, these operations might result in billing you for a - snapshot. You can delete the snapshot after you - complete the migrate operation. -======= Migrates a server to a host. The scheduler chooses the host. Specify the migrate action in the request body. @@ -212,19 +160,13 @@ Depending on your cloud provider, this operation might result in billing you for a snapshot. You can delete the snapshot after you complete this operation. ->>>>>>> a59ebf6... Added information about migration types and billing -======= - href="../samples/admin-actions-migrate.json" - /> ->>>>>>> a59ebf6... Added information about migration types and billing @@ -380,20 +322,6 @@ -<<<<<<< HEAD - Live-migrates a server to a new - host without rebooting. Specify the - os-migrateLive action in the request - body. - You can complete the following types of migrations: - live migrate with block storage migration (this - operation); live migrate without block storage - migration (this operation); non-live migrate (this - operation), or; resize. Depending on the - cloud provider, these operations might result in billing you for a - snapshot. You can delete the snapshot after you - complete the migrate operation. -======= Live-migrates a server to a new host without rebooting. Specify the os-migrateLive action in the request body. @@ -405,7 +333,6 @@ Depending on your cloud provider, this operation might result in billing you for a snapshot. You can delete the snapshot after you complete this operation. ->>>>>>> a59ebf6... Added information about migration types and billing -<<<<<<< HEAD If true, block storage is migrated. If false, block storage is not migrated. -======= - If true, block storage is migrated. - If false, block storage is not migrated. ->>>>>>> a59ebf6... Added information about migration types and billing @@ -478,18 +400,11 @@ -<<<<<<< HEAD Evacuates a server from failed host. Specify the evacuate action in the request body. -======= - -

Evacuates a server - from failed host. Specify the evacuate - action in the request body.

->>>>>>> a59ebf6... Added information about migration types and billing -<<<<<<< HEAD -======= - ->>>>>>> a59ebf6... Added information about migration types and billing -<<<<<<< HEAD -======= - ->>>>>>> a59ebf6... Added information about migration types and billing @@ -544,13 +449,8 @@ -<<<<<<< HEAD -======= - ->>>>>>> a59ebf6... Added information about migration types and billing