diff --git a/tempest/api/volume/test_volumes_snapshots.py b/tempest/api/volume/test_volumes_snapshots.py index be3f1f2e5f..99918ebb6f 100644 --- a/tempest/api/volume/test_volumes_snapshots.py +++ b/tempest/api/volume/test_volumes_snapshots.py @@ -35,10 +35,9 @@ def resource_setup(cls): super(VolumesSnapshotTestJSON, cls).resource_setup() cls.volume_origin = cls.create_volume() - @decorators.idempotent_id('b467b54c-07a4-446d-a1cf-651dedcc3ff1') + @decorators.idempotent_id('8567b54c-4455-446d-a1cf-651ddeaa3ff2') @test.services('compute') - def test_snapshot_create_with_volume_in_use(self): - # Create a snapshot when volume status is in-use + def test_snapshot_create_delete_with_volume_in_use(self): # Create a test instance server = self.create_server(wait_until='ACTIVE') self.attach_volume(server['id'], self.volume_origin['id']) @@ -47,19 +46,6 @@ def test_snapshot_create_with_volume_in_use(self): self.assertRaises(lib_exc.BadRequest, self.create_snapshot, self.volume_origin['id'], force=False) - # Snapshot a volume even if it's attached to an instance - snapshot = self.create_snapshot(self.volume_origin['id'], - force=True) - # Delete the snapshot - self.delete_snapshot(snapshot['id']) - - @decorators.idempotent_id('8567b54c-4455-446d-a1cf-651ddeaa3ff2') - @test.services('compute') - def test_snapshot_delete_with_volume_in_use(self): - # Create a test instance - server = self.create_server(wait_until='ACTIVE') - self.attach_volume(server['id'], self.volume_origin['id']) - # Snapshot a volume attached to an instance snapshot1 = self.create_snapshot(self.volume_origin['id'], force=True) snapshot2 = self.create_snapshot(self.volume_origin['id'], force=True)