commit f1448f0caa509013399afc4bc18ca3a2c5c34d17
author Matt Riedemann <mriedem@us.ibm.com> Sat Oct 01 20:03:16 2016 -0400
committer Matt Riedemann <mriedem@us.ibm.com> Tue Oct 04 11:33:19 2016 -0400
tree 1fb22c781bfd9f43592d4bb9a70d908096c5b164
parent 9fb8cc2487b3e20105c82d3da59339274df82a4d

Re-use common methods in test_rebuild_server_with_volume_attached

This changes test_rebuild_server_with_volume_attached to re-use
the common volume create/attach methods in the base compute API
test class.

Change-Id: Ieaa69f851148dea329e9e43fc746f308dbe5d343

tempest/api/compute/servers/test_server_actions.py

diff --git a/tempest/api/compute/servers/test_server_actions.py b/tempest/api/compute/servers/test_server_actions.py
index 062e920..28ee739 100644
--- a/tempest/api/compute/servers/test_server_actions.py
+++ b/tempest/api/compute/servers/test_server_actions.py
@@ -235,20 +235,10 @@
     @test.services('volume')
     def test_rebuild_server_with_volume_attached(self):
         # create a new volume and attach it to the server
-        volume = self.volumes_client.create_volume(
-            size=CONF.volume.volume_size)
-        volume = volume['volume']
-        self.addCleanup(self.volumes_client.delete_volume, volume['id'])
-        waiters.wait_for_volume_status(self.volumes_client, volume['id'],
-                                       'available')
+        volume = self.create_volume()
 
-        self.client.attach_volume(self.server_id, volumeId=volume['id'])
-        self.addCleanup(waiters.wait_for_volume_status, self.volumes_client,
-                        volume['id'], 'available')
-        self.addCleanup(self.client.detach_volume,
-                        self.server_id, volume['id'])
-        waiters.wait_for_volume_status(self.volumes_client, volume['id'],
-                                       'in-use')
+        server = self.client.show_server(self.server_id)['server']
+        self.attach_volume(server, volume)
 
         # run general rebuild test
         self.test_rebuild_server()