Merge lp:~reldan/nova/lp764551 into lp:~hudson-openstack/nova/trunk

[Eldar Nugaev]

Fix loggin in creation server in OpenStack API 1.0

[lp:~reldan/nova/lp764551]

997. By Eldar Nugaev on 2011-04-18

Fix logging in openstack api

998. By Eldar Nugaev on 2011-04-18

Fix logging in openstack api

999. By Eldar Nugaev on 2011-04-18

add fault as response

1000. By Eldar Nugaev on 2011-04-18

pep8 fix

[Jay Pipes (jaypipes)]

good stuff, thanks Eldar!

review: Approve

[Rick Harris (rconradharris)]

lgtm

review: Approve

[Eldar Nugaev (reldan)]

Thank you!

[Devin Carlen (devcamcar)]

lgtm

review: Approve

=== modified file 'nova/api/openstack/common.py'
--- nova/api/openstack/common.py	2011-03-30 17:05:06 +0000
+++ nova/api/openstack/common.py	2011-04-18 15:37:49 +0000
@@ -25,7 +25,7 @@
 from nova import wsgi
 
 
-LOG = logging.getLogger('common')
+LOG = logging.getLogger('nova.api.openstack.common')
 
 
 FLAGS = flags.FLAGS
@@ -116,8 +116,14 @@
         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 Exception(msg)
     raise exception.NotFound(image_hash)
 
 

=== modified file 'nova/api/openstack/servers.py'
--- nova/api/openstack/servers.py	2011-04-08 00:32:34 +0000
+++ nova/api/openstack/servers.py	2011-04-18 15:37:49 +0000
@@ -127,8 +127,13 @@
             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)