diff options
| author | Zuul <zuul@review.opendev.org> | 2021-09-10 16:26:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-09-10 16:26:27 +0000 |
| commit | 1fc30924eb360fd3a12d74a5f44576512f71ced2 (patch) | |
| tree | 5f80229b8020abea41ca6788a9d40e2a5779cda2 | |
| parent | 0db149425c8d06ad3b43f691ece62a4cf255a85b (diff) | |
| parent | 4ee400accae414b9d4d08a3388c2e23be1b00bd4 (diff) | |
| download | glance-1fc30924eb360fd3a12d74a5f44576512f71ced2.tar.gz | |
Merge "Make signature verification go back to 'queued'"
| -rw-r--r-- | glance/api/v2/image_data.py | 18 | ||||
| -rw-r--r-- | glance/tests/unit/v2/test_image_data_resource.py | 2 |
2 files changed, 2 insertions, 18 deletions
diff --git a/glance/api/v2/image_data.py b/glance/api/v2/image_data.py index e6d07ad7f..1f8c2519b 100644 --- a/glance/api/v2/image_data.py +++ b/glance/api/v2/image_data.py @@ -105,22 +105,6 @@ class ImageDataController(object): self._restore(image_repo, image) - def _delete(self, image_repo, image): - """Delete the image. - - :param image_repo: The instance of ImageRepo - :param image: The image that will be deleted - """ - try: - if image_repo and image: - image.status = 'killed' - image_repo.save(image) - except Exception as e: - msg = (_LE("Unable to delete image %(image_id)s: %(e)s") % - {'image_id': image.image_id, - 'e': encodeutils.exception_to_unicode(e)}) - LOG.exception(msg) - @utils.mutating def upload(self, req, image_id, data, size): try: @@ -301,7 +285,7 @@ class ImageDataController(object): % {'id': image_id, 'e': encodeutils.exception_to_unicode(e)}) LOG.error(msg) - self._delete(image_repo, image) + self._restore(image_repo, image) raise webob.exc.HTTPBadRequest(explanation=msg) except webob.exc.HTTPGone: diff --git a/glance/tests/unit/v2/test_image_data_resource.py b/glance/tests/unit/v2/test_image_data_resource.py index eb376670d..1b63a5a5a 100644 --- a/glance/tests/unit/v2/test_image_data_resource.py +++ b/glance/tests/unit/v2/test_image_data_resource.py @@ -379,7 +379,7 @@ class TestImagesController(base.StoreClearingUnitTest): self.image_repo.result = image self.assertRaises(webob.exc.HTTPBadRequest, self.controller.upload, request, unit_test_utils.UUID1, 'YYYY', 4) - self.assertEqual('killed', self.image_repo.saved_image.status) + self.assertEqual('queued', self.image_repo.saved_image.status) def test_image_size_limit_exceeded(self): request = unit_test_utils.get_fake_request() |