From 10668b87f46a1fb5d039f6e7d7a7a55b89d7602a Mon Sep 17 00:00:00 2001
From: Mark Washenberger <mark.washenberger@rackspace.com>
Date: Fri, 4 Mar 2011 17:04:41 -0500
Subject: respond well if personality attribute is incomplete

---
 nova/api/openstack/servers.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 8b7b20b92..7c620dbc6 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -153,6 +153,9 @@ class Controller(wsgi.Controller):
             try:
                 path = item['path']
                 contents = item['contents']
+            except KeyError, key:
+                expl = 'Bad personality format: missing %s' % key
+                raise exc.HTTPBadRequest(explanation=expl)
             except TypeError:
                 raise exc.HTTPBadRequest(explanation='Bad personality format')
             try:
-- 
cgit