openstack
/
glance
Code Issues Proposed changes

Merge "Catch UnknownScheme exception"

This commit is contained in:
Jenkins 2015-04-09 21:47:56 +00:00 committed by Gerrit Code Review
parent 31221b1904 d88b4b6d56
commit a4bd859acf
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
glance/api/v1/images.py
View File

@ -457,7 +457,8 @@ class Controller(controller.BaseController):
except store.NotFound as e:
raise HTTPNotFound(explanation=e.msg)
except (store.StoreGetNotSupported,
store.StoreRandomGetNotSupported) as e:
store.StoreRandomGetNotSupported,
store.UnknownScheme) as e:
raise HTTPBadRequest(explanation=e.msg)
image_size = int(image_size) if image_size else None
return image_data, image_size
@ -529,9 +530,9 @@ class Controller(controller.BaseController):
if location:
try:
backend = store.get_store_from_location(location)
except store.BadStoreUri:
msg = _("Invalid location: %s") % location
LOG.warn(msg)
except (store.UnknownScheme, store.BadStoreUri):
msg = _("Invalid location %s") % location
LOG.debug(msg)
raise HTTPBadRequest(explanation=msg,
request=req,
content_type="text/plain")
@ -728,7 +729,7 @@ class Controller(controller.BaseController):
# disable debug logs.
LOG.debug(utils.exception_to_str(e))
raise HTTPNotFound(explanation=e.msg, content_type="text/plain")
except store.BadStoreUri as e:
except (store.UnknownScheme, store.BadStoreUri) as e:
# NOTE(rajesht): See above note of store.NotFound
LOG.debug(utils.exception_to_str(e))
raise HTTPBadRequest(explanation=e.msg, content_type="text/plain")