summaryrefslogtreecommitdiffstats
path: root/nova/tests
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/tests
parentad4503d8340f0ef147d03ca789438067345e332e (diff)
parenta7a0705699662ec3a604126eec868c673cd5328e (diff)
Merge "Raise NotFound for non-existent volume snapshot create"
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/api/openstack/fakes.py2
-rw-r--r--nova/tests/api/openstack/volume/test_snapshots.py14
2 files changed, 15 insertions, 1 deletions
diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/api/openstack/fakes.py
index dc9ccc5f3..fb7a7183c 100644
--- a/nova/tests/api/openstack/fakes.py
+++ b/nova/tests/api/openstack/fakes.py
@@ -567,7 +567,7 @@ def stub_volume_get(self, context, volume_id):
def stub_volume_get_notfound(self, context, volume_id):
- raise exc.NotFound
+ raise exc.VolumeNotFound(volume_id=volume_id)
def stub_volume_get_all(context, search_opts=None):
diff --git a/nova/tests/api/openstack/volume/test_snapshots.py b/nova/tests/api/openstack/volume/test_snapshots.py
index 66f8cddc3..c6e703f83 100644
--- a/nova/tests/api/openstack/volume/test_snapshots.py
+++ b/nova/tests/api/openstack/volume/test_snapshots.py
@@ -124,6 +124,20 @@ class SnapshotApiTest(test.TestCase):
req,
body)
+ def test_snapshot_create_nonexistent_volume_id(self):
+ self.stubs.Set(volume.api.API, 'get', fakes.stub_volume_get_notfound)
+
+ snapshot = {"volume_id": 13,
+ "force": False,
+ "display_name": "Snapshot Test Name",
+ "display_description": "Snapshot Test Desc"}
+ body = dict(snapshot=snapshot)
+ req = fakes.HTTPRequest.blank('/v1/snapshots')
+ self.assertRaises(webob.exc.HTTPNotFound,
+ self.controller.create,
+ req,
+ body)
+
def test_snapshot_delete(self):
self.stubs.Set(volume.api.API, "get_snapshot", stub_snapshot_get)
self.stubs.Set(volume.api.API, "delete_snapshot", stub_snapshot_delete)