summaryrefslogtreecommitdiff
path: root/tempest/api/volume/base.py
diff options
context:
space:
mode:
authorGhanshyam Mann <ghanshyammann@gmail.com>2017-05-02 04:55:47 +0000
committerGhanshyam Mann <ghanshyammann@gmail.com>2017-05-02 05:05:38 +0000
commitb0d15bfefb0035ecbf732dfcd75fe4bcbde64808 (patch)
tree3ced908f50ac91ddc38b4bd0e773206cd29ceff8 /tempest/api/volume/base.py
parent31169e21d6f00fb65b8e7bd104860a82a631b69d (diff)
downloadtempest-b0d15bfefb0035ecbf732dfcd75fe4bcbde64808.tar.gz
Revert "cinder backup force-delete when backup is error"
force-delete feature is backend specific and not implemented by ceph. It return 405 in case of ceph. http://logs.openstack.org/01/458201/2/check/gate-tempest-dsvm-full-ceph-plugin-src-glance_store-ubuntu-xenial/d058f29/logs/testr_results.html.gz Currently it block the glance_store gate where ceph job is voting. Let's revert this for now and discuss such backend specific feature should be tested on Tempest side or not. This reverts commit 31169e21d6f00fb65b8e7bd104860a82a631b69d. Related-Bug: #1687538 Change-Id: I81c0911812945f8ada7c09fe98690aabacb0eda1
Diffstat (limited to 'tempest/api/volume/base.py')
-rw-r--r--tempest/api/volume/base.py12
1 files changed, 4 insertions, 8 deletions
diff --git a/tempest/api/volume/base.py b/tempest/api/volume/base.py
index 2362d3025..5e4fada0e 100644
--- a/tempest/api/volume/base.py
+++ b/tempest/api/volume/base.py
@@ -125,20 +125,16 @@ class BaseVolumeTest(tempest.test.BaseTestCase):
snapshot['id'], 'available')
return snapshot
- def create_backup(self, volume_id, backup_client=None,
- wait_until="available", **kwargs):
+ def create_backup(self, volume_id, backup_client=None, **kwargs):
"""Wrapper utility that returns a test backup."""
if backup_client is None:
backup_client = self.backups_client
backup = backup_client.create_backup(
volume_id=volume_id, **kwargs)['backup']
-
- self.addCleanup(test_utils.call_and_ignore_notfound_exc,
- backup_client.delete_backup, backup['id'])
- waiters.wait_for_volume_resource_status(backup_client,
- backup['id'],
- wait_until)
+ self.addCleanup(backup_client.delete_backup, backup['id'])
+ waiters.wait_for_volume_resource_status(backup_client, backup['id'],
+ 'available')
return backup
# NOTE(afazekas): these create_* and clean_* could be defined