commit 8ec97d751de2b8839acf884fa865e20bdebc11e9
author Zuul <zuul@review.opendev.org> Fri May 27 18:32:09 2022 +0000
committer Gerrit Code Review <review@openstack.org> Fri May 27 18:32:09 2022 +0000
tree 6b6b7f904bfa69c7f06416880afaadf381da1df2
parent 263825a17a8393ade1ff0d99a1ad035ca47eee8b
parent 404b55cd2f07327ab2acc58295ed2fcd222e3bc2

Merge "Add verification when restoring backups"

tempest/scenario/manager.py

diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index db28487..ce45ff6 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -419,8 +419,12 @@
 
         body = self.backups_client.restore_backup(backup_id, **kwargs)
         restore = body['restore']
-        self.addCleanup(self.volumes_client.delete_volume,
-                        restore['volume_id'])
+
+        using_pre_existing_volume = kwargs.get('volume_id', False)
+        if not using_pre_existing_volume:
+            self.addCleanup(self.volumes_client.delete_volume,
+                            restore['volume_id'])
+
         waiters.wait_for_volume_resource_status(self.backups_client,
                                                 backup_id, 'available')
         waiters.wait_for_volume_resource_status(self.volumes_client,