From c316782f8879ef321c4545b04bc9d24e11bb4ee6 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar@rackspace.com>
Date: Thu, 25 Aug 2011 17:27:10 -0400
Subject: review feedback

---
 nova/api/ec2/cloud.py        | 3 +--
 nova/api/openstack/common.py | 7 ++-----
 2 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index ac247a0ef..fe44191c8 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -92,7 +92,6 @@ _STATE_DESCRIPTION_MAP = {
     vm_states.STOPPED: 'stopped',
     vm_states.MIGRATING: 'migrate',
     vm_states.RESIZING: 'resize',
-    vm_states.VERIFY_RESIZE: 'verify_resize',
     vm_states.PAUSED: 'pause',
     vm_states.SUSPENDED: 'suspend',
     vm_states.RESCUED: 'rescue',
@@ -101,7 +100,7 @@ _STATE_DESCRIPTION_MAP = {
 
 def state_description_from_vm_state(vm_state):
     """Map the vm state to the server status string"""
-    return _STATE_DESCRIPTION_MAP[vm_state]
+    return _STATE_DESCRIPTION_MAP.get(vm_state, vm_state)
 
 
 # TODO(yamahata): hypervisor dependent default device name
diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index bdbae0271..d743a66ef 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -43,8 +43,8 @@ _STATE_MAP = {
     vm_states.ACTIVE: {
         'default': 'ACTIVE',
         task_states.REBOOTING: 'REBOOT',
-        task_states.HARD_REBOOTING: 'HARD_REBOOT',
-        task_states.PASSWORD: 'PASSWORD',
+        task_states.UPDATING_PASSWORD: 'PASSWORD',
+        task_states.RESIZE_VERIFY: 'VERIFY_RESIZE',
     },
     vm_states.BUILDING: {
         'default': 'BUILD',
@@ -61,9 +61,6 @@ _STATE_MAP = {
     vm_states.RESIZING: {
         'default': 'RESIZE',
     },
-    vm_states.VERIFY_RESIZE: {
-        'default': 'VERIFY_RESIZE',
-    },
     vm_states.PAUSED: {
         'default': 'PAUSED',
     },
-- 
cgit