diff options
| author | Kevin_Zheng <zhengzhenyu@huawei.com> | 2017-05-15 15:02:00 +0800 |
|---|---|---|
| committer | Zhenyu Zheng <zhengzhenyu@huawei.com> | 2017-08-18 03:40:33 +0000 |
| commit | 5448a44c703c96d38ebfaf768214bf0600364c5b (patch) | |
| tree | 08f4aabacae5e4fa2f0951a9677c29c799d686b7 | |
| parent | 5d3c071f431ebed7e1e06655b962da9df91f9126 (diff) | |
| download | nova-5448a44c703c96d38ebfaf768214bf0600364c5b.tar.gz | |
Catch exception.OverQuota when create image for volume backed instance
When create image for a volume backed instance, nova will
create snapshots for all volumes attached to the instance
in Cinder, and if quota exceed in Cinder, HTTP 500 will
raise, we should capture this error and raise 403.
Conflicts:
nova/tests/unit/api/openstack/compute/test_server_actions.py
NOTE(mriedem): The conflict is due to the tests being refactored
to not use mox in Ocata: 612134ca7bd972e5cbd0d149ab1b45b2ec51ad49
Change-Id: Ic62478e22a7477cfaefac3e63c383082d66bd635
Closes-Bug: #1689284
(cherry picked from commit 29c8ae3cd9653b310c3fac803e6295e5fa885d15)
(cherry picked from commit 1b59d60f9520c7a1992a5753517e472f6dd8b85d)
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 2 | ||||
| -rw-r--r-- | nova/tests/unit/api/openstack/compute/test_server_actions.py | 21 |
2 files changed, 19 insertions, 4 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 8551287885..ce41f4cd85 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -1084,6 +1084,8 @@ class ServersController(wsgi.Controller): 'createImage', id) except exception.Invalid as err: raise exc.HTTPBadRequest(explanation=err.format_message()) + except exception.OverQuota as e: + raise exc.HTTPForbidden(explanation=e.format_message()) # build location of newly-created image entity image_id = str(image['id']) diff --git a/nova/tests/unit/api/openstack/compute/test_server_actions.py b/nova/tests/unit/api/openstack/compute/test_server_actions.py index a8f3160db1..bd40b55d2b 100644 --- a/nova/tests/unit/api/openstack/compute/test_server_actions.py +++ b/nova/tests/unit/api/openstack/compute/test_server_actions.py @@ -927,7 +927,8 @@ class ServerActionsControllerTestV21(test.TestCase): self.controller._action_create_image, self.req, FAKE_UUID, body=body) - def _do_test_create_volume_backed_image(self, extra_properties): + def _do_test_create_volume_backed_image( + self, extra_properties, mock_vol_create_side_effect=None): def _fake_id(x): return '%s-%s-%s-%s' % (x * 8, x * 4, x * 4, x * 12) @@ -986,8 +987,13 @@ class ServerActionsControllerTestV21(test.TestCase): self.mox.StubOutWithMock(self.controller.compute_api, 'volume_api') volume_api = self.controller.compute_api.volume_api volume_api.get(mox.IgnoreArg(), volume['id']).AndReturn(volume) - volume_api.create_snapshot_force(mox.IgnoreArg(), volume['id'], - mox.IgnoreArg(), mox.IgnoreArg()).AndReturn(snapshot) + if mock_vol_create_side_effect: + volume_api.create_snapshot_force(mox.IgnoreArg(), volume['id'], + mox.IgnoreArg(), mox.IgnoreArg()).AndRaise( + mock_vol_create_side_effect) + else: + volume_api.create_snapshot_force(mox.IgnoreArg(), volume['id'], + mox.IgnoreArg(), mox.IgnoreArg()).AndReturn(snapshot) self.mox.ReplayAll() @@ -996,7 +1002,7 @@ class ServerActionsControllerTestV21(test.TestCase): location = response.headers['Location'] image_id = location.replace(self.image_url or - glance.generate_image_url(''), '') + glance.generate_image_url(''), '') image = image_service.show(None, image_id) self.assertEqual(image['name'], 'snapshot_of_volume_backed') @@ -1024,6 +1030,13 @@ class ServerActionsControllerTestV21(test.TestCase): self._do_test_create_volume_backed_image(dict(ImageType='Gold', ImageVersion='2.0')) + def test_create_volume_backed_image_cinder_over_quota(self): + self.assertRaises( + webob.exc.HTTPForbidden, + self._do_test_create_volume_backed_image, {}, + mock_vol_create_side_effect=exception.OverQuota( + overs='snapshot')) + def _test_create_volume_backed_image_with_metadata_from_volume( self, extra_metadata=None): |