vm state and task state management

partially implements bp task-management
fixes bug 997867

also see http://wiki.openstack.org/VMState

Refactored the following API/state:
* rebuild
* migrate
* resize
* start
* stop
* delete
* soft delete
* rework sync_power_state in compute/manager.

fix broken tests, add transition diagram in dot

Change-Id: I3c5a97508a6dad7175fba12828bd3fa6ef1e50ee

1 files changed, 14 insertions, 13 deletions

diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index 93b5a36ab0..eacd9b8cb2 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -48,25 +48,26 @@ _STATE_MAP = {
         task_states.REBOOTING: 'REBOOT',
         task_states.REBOOTING_HARD: 'HARD_REBOOT',
         task_states.UPDATING_PASSWORD: 'PASSWORD',
-        task_states.RESIZE_VERIFY: 'VERIFY_RESIZE',
+        task_states.REBUILDING: 'REBUILD',
+        task_states.REBUILD_BLOCK_DEVICE_MAPPING: 'REBUILD',
+        task_states.REBUILD_SPAWNING: 'REBUILD',
+        task_states.MIGRATING: 'MIGRATING',
+        task_states.RESIZE_PREP: 'RESIZE',
+        task_states.RESIZE_MIGRATING: 'RESIZE',
+        task_states.RESIZE_MIGRATED: 'RESIZE',
+        task_states.RESIZE_FINISH: 'RESIZE',
     },
     vm_states.BUILDING: {
         'default': 'BUILD',
     },
-    vm_states.REBUILDING: {
-        'default': 'REBUILD',
-    },
     vm_states.STOPPED: {
         'default': 'STOPPED',
     },
-    vm_states.SHUTOFF: {
-        'default': 'SHUTOFF',
-    },
-    vm_states.MIGRATING: {
-        'default': 'MIGRATING',
-    },
-    vm_states.RESIZING: {
-        'default': 'RESIZE',
+    vm_states.RESIZED: {
+        'default': 'VERIFY_RESIZE',
+        # Note(maoy): the OS API spec 1.1 doesn't have CONFIRMING_RESIZE
+        # state so we comment that out for future reference only.
+        #task_states.RESIZE_CONFIRMING: 'CONFIRMING_RESIZE',
         task_states.RESIZE_REVERTING: 'REVERT_RESIZE',
     },
     vm_states.PAUSED: {
@@ -84,7 +85,7 @@ _STATE_MAP = {
     vm_states.DELETED: {
         'default': 'DELETED',
     },
-    vm_states.SOFT_DELETE: {
+    vm_states.SOFT_DELETED: {
         'default': 'DELETED',
     },
 }