Remove wait_for_volume_status from compute client
wait_for_volume_status of compute client just calls the one of waiters
module and the method is a wrapper.
So the method seems redundant and it doesn't fit as service clients.
This patch removes wait_for_volume_status from compute client and
replaces it with waiters' one.
Partially implements blueprint consistent-service-method-names
Change-Id: I1e1bec6f7560efd59eb9962f49763316f1f02377
diff --git a/tempest/api/compute/servers/test_delete_server.py b/tempest/api/compute/servers/test_delete_server.py
index b36b721..990ad47 100644
--- a/tempest/api/compute/servers/test_delete_server.py
+++ b/tempest/api/compute/servers/test_delete_server.py
@@ -16,6 +16,7 @@
import testtools
from tempest.api.compute import base
+from tempest.common import waiters
from tempest import config
from tempest import test
@@ -117,15 +118,18 @@
volume = volumes_client.create_volume()
self.addCleanup(volumes_client.delete_volume, volume['id'])
- volumes_client.wait_for_volume_status(volume['id'], 'available')
+ waiters.wait_for_volume_status(volumes_client,
+ volume['id'], 'available')
self.client.attach_volume(server['id'],
volume['id'],
device=device)
- volumes_client.wait_for_volume_status(volume['id'], 'in-use')
+ waiters.wait_for_volume_status(volumes_client,
+ volume['id'], 'in-use')
self.client.delete_server(server['id'])
self.client.wait_for_server_termination(server['id'])
- volumes_client.wait_for_volume_status(volume['id'], 'available')
+ waiters.wait_for_volume_status(volumes_client,
+ volume['id'], 'available')
class DeleteServersAdminTestJSON(base.BaseV2ComputeAdminTest):
diff --git a/tempest/api/compute/servers/test_server_rescue_negative.py b/tempest/api/compute/servers/test_server_rescue_negative.py
index 9cc9e9b..4300dd4 100644
--- a/tempest/api/compute/servers/test_server_rescue_negative.py
+++ b/tempest/api/compute/servers/test_server_rescue_negative.py
@@ -18,6 +18,7 @@
from tempest.api.compute import base
from tempest.common.utils import data_utils
+from tempest.common import waiters
from tempest import config
from tempest import test
@@ -61,14 +62,14 @@
CONF.volume.volume_size, display_name=data_utils.rand_name(
self.__class__.__name__ + '_volume'))
self.addCleanup(self.delete_volume, volume['id'])
- self.volumes_extensions_client.wait_for_volume_status(
- volume['id'], 'available')
+ waiters.wait_for_volume_status(self.volumes_extensions_client,
+ volume['id'], 'available')
return volume
def _detach(self, server_id, volume_id):
self.servers_client.detach_volume(server_id, volume_id)
- self.volumes_extensions_client.wait_for_volume_status(volume_id,
- 'available')
+ waiters.wait_for_volume_status(self.volumes_extensions_client,
+ volume_id, 'available')
def _unrescue(self, server_id):
self.servers_client.unrescue_server(server_id)
@@ -143,8 +144,8 @@
self.servers_client.attach_volume(self.server_id,
volume['id'],
device='/dev/%s' % self.device)
- self.volumes_extensions_client.wait_for_volume_status(
- volume['id'], 'in-use')
+ waiters.wait_for_volume_status(self.volumes_extensions_client,
+ volume['id'], 'in-use')
# Rescue the server
self.servers_client.rescue_server(self.server_id,
diff --git a/tempest/api/compute/volumes/test_volumes_get.py b/tempest/api/compute/volumes/test_volumes_get.py
index 1a64b22..44339a3 100644
--- a/tempest/api/compute/volumes/test_volumes_get.py
+++ b/tempest/api/compute/volumes/test_volumes_get.py
@@ -17,6 +17,7 @@
from tempest.api.compute import base
from tempest.common.utils import data_utils
+from tempest.common import waiters
from tempest import config
from tempest import test
@@ -56,7 +57,7 @@
self.assertTrue(volume['id'] is not None,
"Field volume id is empty or not found.")
# Wait for Volume status to become ACTIVE
- self.client.wait_for_volume_status(volume['id'], 'available')
+ waiters.wait_for_volume_status(self.client, volume['id'], 'available')
# GET Volume
fetched_volume = self.client.show_volume(volume['id'])
# Verification of details of fetched Volume
diff --git a/tempest/api/compute/volumes/test_volumes_list.py b/tempest/api/compute/volumes/test_volumes_list.py
index 7ba62b0..22b3d13 100644
--- a/tempest/api/compute/volumes/test_volumes_list.py
+++ b/tempest/api/compute/volumes/test_volumes_list.py
@@ -15,6 +15,7 @@
from tempest.api.compute import base
from tempest.common.utils import data_utils
+from tempest.common import waiters
from tempest import config
from tempest import test
@@ -55,7 +56,8 @@
try:
volume = cls.client.create_volume(display_name=v_name,
metadata=metadata)
- cls.client.wait_for_volume_status(volume['id'], 'available')
+ waiters.wait_for_volume_status(cls.client,
+ volume['id'], 'available')
volume = cls.client.show_volume(volume['id'])
cls.volume_list.append(volume)
cls.volume_id_list.append(volume['id'])
diff --git a/tempest/services/compute/json/volumes_extensions_client.py b/tempest/services/compute/json/volumes_extensions_client.py
index 985038d..121f160 100644
--- a/tempest/services/compute/json/volumes_extensions_client.py
+++ b/tempest/services/compute/json/volumes_extensions_client.py
@@ -20,7 +20,6 @@
from tempest.api_schema.response.compute.v2_1 import volumes as schema
from tempest.common import service_client
-from tempest.common import waiters
class VolumesExtensionsClient(service_client.ServiceClient):
@@ -80,10 +79,6 @@
self.validate_response(schema.delete_volume, resp, body)
return service_client.ResponseBody(resp, body)
- def wait_for_volume_status(self, volume_id, status):
- """Waits for a Volume to reach a given status."""
- waiters.wait_for_volume_status(self, volume_id, status)
-
def is_resource_deleted(self, id):
try:
self.show_volume(id)