From c49c372ec3e94331eb8a16a0af7c9c9c5e46bba0 Mon Sep 17 00:00:00 2001
From: Eldar Nugaev <enugaev@griddynamics.com>
Date: Mon, 18 Apr 2011 17:06:18 +0400
Subject: Fix logging in openstack api

---
 nova/api/openstack/common.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index 234f921ab..2ace9b3de 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -25,7 +25,7 @@ from nova import log as logging
 from nova import wsgi
 
 
-LOG = logging.getLogger('common')
+LOG = logging.getLogger('nova.api.openstack.common')
 
 
 FLAGS = flags.FLAGS
@@ -116,8 +116,14 @@ def get_image_id_from_image_hash(image_service, context, image_hash):
         items = image_service.index(context)
     for image in items:
         image_id = image['id']
-        if abs(hash(image_id)) == int(image_hash):
-            return image_id
+        try:
+            if abs(hash(image_id)) == int(image_hash):
+                return image_id
+        except ValueError:
+            msg = _("Requested image_id has wrong format: %s,"
+                    "should have numerical format" % image_id)
+            LOG.error(msg)
+            raise msg
     raise exception.NotFound(image_hash)
 
 
-- 
cgit 


From a582afce13286160411a65d4b1b91e69f67ab430 Mon Sep 17 00:00:00 2001
From: Eldar Nugaev <enugaev@griddynamics.com>
Date: Mon, 18 Apr 2011 17:31:29 +0400
Subject: Fix logging in openstack api

---
 nova/api/openstack/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index 2ace9b3de..f3f7f6d9b 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -121,7 +121,7 @@ def get_image_id_from_image_hash(image_service, context, image_hash):
                 return image_id
         except ValueError:
             msg = _("Requested image_id has wrong format: %s,"
-                    "should have numerical format" % image_id)
+                    "should have numerical format") % image_id
             LOG.error(msg)
             raise msg
     raise exception.NotFound(image_hash)
-- 
cgit 


From d1a7cf94f368e0c115bd7680512c582163f5e49e Mon Sep 17 00:00:00 2001
From: Eldar Nugaev <enugaev@griddynamics.com>
Date: Mon, 18 Apr 2011 17:32:48 +0400
Subject: Fix logging in openstack api

---
 nova/api/openstack/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index f3f7f6d9b..0b6dc944a 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -123,7 +123,7 @@ def get_image_id_from_image_hash(image_service, context, image_hash):
             msg = _("Requested image_id has wrong format: %s,"
                     "should have numerical format") % image_id
             LOG.error(msg)
-            raise msg
+            raise Exception(msg)
     raise exception.NotFound(image_hash)
 
 
-- 
cgit 


From fe2d43472548f7c32a621ab4f245e078d0f46f0b Mon Sep 17 00:00:00 2001
From: Eldar Nugaev <enugaev@griddynamics.com>
Date: Mon, 18 Apr 2011 18:13:56 +0400
Subject: add fault as response

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

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 43e0c7963..4fb0f078b 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -127,8 +127,13 @@ class Controller(common.OpenstackController):
             key_data = key_pair['public_key']
 
         requested_image_id = self._image_id_from_req_data(env)
-        image_id = common.get_image_id_from_image_hash(self._image_service,
-            context, requested_image_id)
+        try:
+            image_id = common.get_image_id_from_image_hash(self._image_service,
+                context, requested_image_id)
+        except:
+            msg = _("Can not find requested image")
+            return faults.Fault(exc.HTTPBadRequest(msg))
+        
         kernel_id, ramdisk_id = self._get_kernel_ramdisk_from_image(
             req, image_id)
 
-- 
cgit 


From c8ca373cfc71cf62d79ff90957961e9b0aa2ed36 Mon Sep 17 00:00:00 2001
From: Eldar Nugaev <enugaev@griddynamics.com>
Date: Mon, 18 Apr 2011 19:36:19 +0400
Subject: pep8 fix

---
 nova/api/openstack/servers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 4fb0f078b..d3f51df0d 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -133,7 +133,7 @@ class Controller(common.OpenstackController):
         except:
             msg = _("Can not find requested image")
             return faults.Fault(exc.HTTPBadRequest(msg))
-        
+
         kernel_id, ramdisk_id = self._get_kernel_ramdisk_from_image(
             req, image_id)
 
-- 
cgit