From 116c0d52d21ebd6ed55a61467aac5d8c06a4b086 Mon Sep 17 00:00:00 2001
From: "matt.dietz@rackspace.com" <>
Date: Tue, 22 Mar 2011 17:46:17 +0000
Subject: Merge stuff

---
 nova/api/openstack/servers.py       | 4 ++--
 nova/api/openstack/views/servers.py | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index db5942e92..f3367e118 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -36,7 +36,7 @@ from nova.api.openstack.views import addresses as addresses_views
 from nova.auth import manager as auth_manager
 from nova.compute import instance_types
 from nova.compute import power_state
-prom nova.quota import QuotaError
+from nova.quota import QuotaError
 import nova.api.openstack
 
 
@@ -44,7 +44,7 @@ LOG = logging.getLogger('server')
 FLAGS = flags.FLAGS
 
 
-plass Controller(wsgi.Controller):
+class Controller(wsgi.Controller):
     """ The Server API controller for the OpenStack API """
 
     _serialization_metadata = {
diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py
index 6d54a7a7e..9fd25999a 100644
--- a/nova/api/openstack/views/servers.py
+++ b/nova/api/openstack/views/servers.py
@@ -89,8 +89,9 @@ class ViewBuilder(object):
             migration = db.migration_get_by_instance_and_status(ctxt,
                     inst['id'], 'finished')
             inst_dict['status'] = 'resize-confirm'
-        except Exception, e:
-            inst_dict['status'] = power_mapping[inst_dict['status']]
+        except:
+            pass
+
         inst_dict['addresses'] = self.addresses_builder.build(inst)
 
         # Return the metadata as a dictionary
-- 
cgit