From f004b3bc8fc177e5ad0e80108b71ca416bf259c2 Mon Sep 17 00:00:00 2001 From: Constanze Kratel Date: Mon, 23 Jun 2014 14:17:50 -0500 Subject: [PATCH] Fix: Adding changes made by Diane back into the files Closes-Bug: 1295718 Author: Constanze Kratel Change-Id: I6e0461eb5cca3a5eff47a2ccabd0d1bf7a9a442d --- v2/bk_compute_api_ref_v2.xml | 4 +- v2/section_concepts.xml | 85 +++++++++++++++--------------------- 2 files changed, 38 insertions(+), 51 deletions(-) diff --git a/v2/bk_compute_api_ref_v2.xml b/v2/bk_compute_api_ref_v2.xml index 09f9002..ba4c493 100755 --- a/v2/bk_compute_api_ref_v2.xml +++ b/v2/bk_compute_api_ref_v2.xml @@ -546,7 +546,7 @@ API operate using SSL over HTTP (HTTPS). -
+
Request and response formats The OpenStack Compute API supports both JSON and XML data serialization request and response @@ -1561,7 +1561,7 @@ Host: servers.api.openstack.org/v2/ suspended, either by request or necessity. This status appears for only the following hypervisors: XenServer/XCP, KVM, and ESXi. - Administrative usersmay suspend an + Administrative users may suspend an instance if it is infrequently used or to perform system maintenance. When you suspend an instance, its VM state is diff --git a/v2/section_concepts.xml b/v2/section_concepts.xml index 56dd340..24b25ec 100644 --- a/v2/section_concepts.xml +++ b/v2/section_concepts.xml @@ -48,63 +48,50 @@ particular server configuration frequently. - Reboot - action - Performs a soft or hard reboot of a server. With a - soft reboot, the operating system is signaled to - restart, which allows for a graceful shutdown of all - processes. A hard reboot is the equivalent of power - cycling the server. The virtualization platform should - ensure that the reboot action has completed - successfully even in cases in which the underlying - domain/VM is paused or halted/stopped. + Reboot + Use this function to perform either a soft or hard + reboot of a server. With a soft reboot, the operating + system is signaled to restart, which allows for a + graceful shutdown of all processes. A hard reboot is + the equivalent of power cycling the server. The + virtualization platform should ensure that the reboot + action has completed successfully even in cases in + which the underlying domain/VM is paused or + halted/stopped. - Rebuild - action - Removes all data on the server and replaces it with - the specified image. Server ID and IP addresses remain - the same. + Rebuild + Use this function to remove all data on the server and + replaces it with the specified image. Server ID and IP + addresses remain the same. - Resize - action - Converts an existing server to a different flavor, - in essence, scaling the server up or down. The - original server is saved for a period of time to allow - rollback if there is a problem. All resizes should be - tested and explicitly confirmed, at which time the - original server is removed. All resizes are - automatically confirmed after 24 hours if you do not - confirm or revert them. + Resize + Use this function to convert an existing server to a + different flavor, in essence, scaling the server up or + down. The original server is saved for a period of + time to allow rollback if there is a problem. All + resizes should be tested and explicitly confirmed, at + which time the original server is removed. All resizes + are automatically confirmed after 24 hours if you do + not confirm or revert them. - Pause action - Pauses a server and causes it to run in a frozen - state. To pause a server, make a Pause server request. This request stores - the state of the VM in RAM. + Pause + You can pause a server by making a pause request. This + request stores the state of the VM in RAM. A paused + instance continues to run in a frozen state. - Suspend - action - Suspends a server, which stores its VM state on - disk, writes all memory to disk, and stops the virtual - machine. Suspending an instance is similar to placing - a device in hibernation; memory and vCPUs become - available to create other instances. Administrative - users might want to suspend an infrequently used - instance or suspend an instance to perform system - maintenance. - - - Unpause - action - Unpauses a paused server. To unpause a server, make - an Unpause server request. + Suspend + Administrative users might want to suspend an + instance if it is infrequently used or to perform + system maintenance. When you suspend an instance, its + VM state is stored on disk, all memory is written to + disk, and the virtual machine is stopped. Suspending + an instance is similar to placing a device in + hibernation; memory and vCPUs become available to + create other instances.