From 793de5cef9fb539a4fb3ba976d83adde38a589c1 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Tue, 29 Mar 2011 10:40:35 -0400
Subject: adding more tests; making name checks more robust

---
 nova/api/openstack/servers.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index e9bc0a797..29c491716 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -250,8 +250,15 @@ class Controller(wsgi.Controller):
         if 'name' in inst_dict['server']:
             name = inst_dict['server']['name']
 
-            if not isinstance(name, basestring) or name == '':
-                return exc.HTTPBadRequest()
+            if not isinstance(name, basestring):
+                msg = _("Server name is not a string or unicode")
+                return exc.HTTPBadRequest(msg)
+
+            name = name.strip()
+
+            if name == '':
+                msg = _("Server name is an empty string")
+                return exc.HTTPBadRequest(msg)
 
             update_dict['display_name'] = name
 
-- 
cgit