Merge "Make signature verification go back to 'queued'"

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:

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()