Merge "Switch to decorators.idempotent_id"
Jenkins authored 9 years ago
Gerrit Code Review committed 9 years ago
| 19 | 19 | from tempest.common import waiters |
| 20 | 20 | from tempest import config |
| 21 | 21 | from tempest.lib.common.utils import data_utils |
| 22 | from tempest import test | |
| 22 | from tempest.lib import decorators | |
| 23 | 23 | |
| 24 | 24 | # TODO(obutenko): Remove this when liberty-eol happens. |
| 25 | 25 | snapshot_backup_opt = cfg.BoolOpt('snapshot_backup', |
| 41 | 41 | |
| 42 | 42 | @testtools.skipUnless(CONF.volume_feature_enabled.snapshot_backup, |
| 43 | 43 | "Skip. Not implemented in Liberty.") |
| 44 | @test.idempotent_id('885410c6-cd1d-452c-a409-7c32b7e0be15') | |
| 44 | @decorators.idempotent_id('885410c6-cd1d-452c-a409-7c32b7e0be15') | |
| 45 | 45 | def test_volume_snapshot_backup(self): |
| 46 | 46 | """Create backup from snapshot.""" |
| 47 | 47 | volume = self.create_volume() |
| 66 | 66 | self.volumes_client.delete_volume(volume['id']) |
| 67 | 67 | self.volumes_client.wait_for_resource_deletion(volume['id']) |
| 68 | 68 | |
| 69 | @test.idempotent_id('b5d837b0-7066-455d-88fc-4a721a899306') | |
| 69 | @decorators.idempotent_id('b5d837b0-7066-455d-88fc-4a721a899306') | |
| 70 | 70 | def test_backup_create_and_restore_to_an_existing_volume(self): |
| 71 | 71 | """Test backup create and restore to an existing volume.""" |
| 72 | 72 | # Create volume |
| 93 | 93 | self.assertEqual(src_vol['id'], restore['volume_id']) |
| 94 | 94 | self.assertEqual(backup['id'], restore['backup_id']) |
| 95 | 95 | |
| 96 | @test.idempotent_id('c810fe2c-cb40-43ab-96aa-471b74516a98') | |
| 96 | @decorators.idempotent_id('c810fe2c-cb40-43ab-96aa-471b74516a98') | |
| 97 | 97 | def test_incremental_backup(self): |
| 98 | 98 | """Test create incremental backup.""" |
| 99 | 99 | # Create volume from image |