From d05536b958a1ed8a786ed4c006992b4006b996d4 Mon Sep 17 00:00:00 2001 From: Felix Huettner Date: Mon, 8 Mar 2021 08:48:43 +0100 Subject: [PATCH] Reactivate image before deletion Normal users should not be able to delete disabled images (see [1]) as this can lead to inconsistencies between database and storage backend. Tempest relies on being able to do this in some tests. [1]: https://bugs.launchpad.net/glance/+bug/1917469 Related-Bug: 1917469 Change-Id: I0b29fe59e238f4c723a15271117e6cfb072e648a --- tempest/api/volume/test_volumes_negative.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tempest/api/volume/test_volumes_negative.py b/tempest/api/volume/test_volumes_negative.py index 35dd0caf98..563820fbf6 100644 --- a/tempest/api/volume/test_volumes_negative.py +++ b/tempest/api/volume/test_volumes_negative.py @@ -336,6 +336,9 @@ class VolumesNegativeTest(base.BaseVolumeTest): # Deactivate the image self.images_client.deactivate_image(image['id']) + self.addCleanup(test_utils.call_and_ignore_notfound_exc, + self.images_client.reactivate_image, image['id']) + body = self.images_client.show_image(image['id']) self.assertEqual("deactivated", body['status']) # Try creating a volume from deactivated image