summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-09-20 17:30:47 +0000
committerGerrit Code Review <review@openstack.org>2012-09-20 17:30:47 +0000
commitfbdaa960d9abfada9cabd4764b11eaaed15b19df (patch)
tree2e64939fc3d1cb4d1aca5d0ba933a2ba599df878 /nova/api
parentad4503d8340f0ef147d03ca789438067345e332e (diff)
parenta7a0705699662ec3a604126eec868c673cd5328e (diff)
downloadnova-fbdaa960d9abfada9cabd4764b11eaaed15b19df.tar.gz
nova-fbdaa960d9abfada9cabd4764b11eaaed15b19df.tar.xz
nova-fbdaa960d9abfada9cabd4764b11eaaed15b19df.zip
Merge "Raise NotFound for non-existent volume snapshot create"
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/volume/snapshots.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/nova/api/openstack/volume/snapshots.py b/nova/api/openstack/volume/snapshots.py
index bba3b0ced..74c5f75e6 100644
--- a/nova/api/openstack/volume/snapshots.py
+++ b/nova/api/openstack/volume/snapshots.py
@@ -151,7 +151,12 @@ class SnapshotsController(wsgi.Controller):
snapshot = body['snapshot']
volume_id = snapshot['volume_id']
- volume = self.volume_api.get(context, volume_id)
+
+ try:
+ volume = self.volume_api.get(context, volume_id)
+ except exception.VolumeNotFound as err:
+ raise exc.HTTPNotFound(explanation=unicode(err))
+
force = snapshot.get('force', False)
msg = _("Create snapshot from volume %s")
LOG.audit(msg, volume_id, context=context)