Merge "Remove "extensions" from volumes_extensions_client"
diff --git a/tempest/clients.py b/tempest/clients.py
index dd0d145..e5ef812 100644
--- a/tempest/clients.py
+++ b/tempest/clients.py
@@ -81,8 +81,8 @@
from tempest.services.compute.json.tenant_usages_client import \
TenantUsagesClient
from tempest.services.compute.json.versions_client import VersionsClient
-from tempest.services.compute.json.volumes_extensions_client import \
- VolumesExtensionsClient
+from tempest.services.compute.json.volumes_client import \
+ VolumesClient as ComputeVolumesClient
from tempest.services.data_processing.v1_1.data_processing_client import \
DataProcessingClient
from tempest.services.database.json.flavors_client import \
@@ -334,7 +334,7 @@
'build_interval': CONF.volume.build_interval,
'build_timeout': CONF.volume.build_timeout
})
- self.volumes_extensions_client = VolumesExtensionsClient(
+ self.volumes_extensions_client = ComputeVolumesClient(
self.auth_provider, **params_volume)
self.compute_versions_client = VersionsClient(self.auth_provider,
**params_volume)
diff --git a/tempest/services/compute/json/volumes_extensions_client.py b/tempest/services/compute/json/volumes_client.py
similarity index 97%
rename from tempest/services/compute/json/volumes_extensions_client.py
rename to tempest/services/compute/json/volumes_client.py
index db92351..e799c29 100644
--- a/tempest/services/compute/json/volumes_extensions_client.py
+++ b/tempest/services/compute/json/volumes_client.py
@@ -21,7 +21,7 @@
from tempest.common import service_client
-class VolumesExtensionsClient(service_client.ServiceClient):
+class VolumesClient(service_client.ServiceClient):
def list_volumes(self, detail=False, **params):
"""List all the volumes created."""
diff --git a/tempest/tests/common/test_service_clients.py b/tempest/tests/common/test_service_clients.py
index 00b8470..c56c74c 100644
--- a/tempest/tests/common/test_service_clients.py
+++ b/tempest/tests/common/test_service_clients.py
@@ -46,8 +46,8 @@
from tempest.services.compute.json import servers_client
from tempest.services.compute.json import services_client
from tempest.services.compute.json import tenant_usages_client
-from tempest.services.compute.json import volumes_extensions_client \
- as compute_volumes_extensions_client
+from tempest.services.compute.json import volumes_client \
+ as compute_volumes_client
from tempest.services.data_processing.v1_1 import data_processing_client
from tempest.services.database.json import flavors_client as db_flavor_client
from tempest.services.database.json import versions_client as db_version_client
@@ -137,7 +137,7 @@
servers_client.ServersClient,
services_client.ServicesClient,
tenant_usages_client.TenantUsagesClient,
- compute_volumes_extensions_client.VolumesExtensionsClient,
+ compute_volumes_client.VolumesClient,
data_processing_client.DataProcessingClient,
db_flavor_client.DatabaseFlavorsClient,
db_version_client.DatabaseVersionsClient,
diff --git a/tempest/tests/services/compute/test_volumes_extensions_client.py b/tempest/tests/services/compute/test_volumes_client.py
similarity index 87%
rename from tempest/tests/services/compute/test_volumes_extensions_client.py
rename to tempest/tests/services/compute/test_volumes_client.py
index 2fe8497..33d4bad 100644
--- a/tempest/tests/services/compute/test_volumes_extensions_client.py
+++ b/tempest/tests/services/compute/test_volumes_client.py
@@ -17,12 +17,12 @@
from oslotest import mockpatch
from tempest_lib import exceptions as lib_exc
-from tempest.services.compute.json import volumes_extensions_client
+from tempest.services.compute.json import volumes_client
from tempest.tests import fake_auth_provider
from tempest.tests.services.compute import base
-class TestVolumesExtensionsClient(base.BaseComputeServiceTest):
+class TestVolumesClient(base.BaseComputeServiceTest):
FAKE_VOLUME = {
"id": "521752a6-acf6-4b2d-bc7a-119f9148cd8c",
@@ -43,9 +43,9 @@
FAKE_VOLUMES = {"volumes": [FAKE_VOLUME]}
def setUp(self):
- super(TestVolumesExtensionsClient, self).setUp()
+ super(TestVolumesClient, self).setUp()
fake_auth = fake_auth_provider.FakeAuthProvider()
- self.client = volumes_extensions_client.VolumesExtensionsClient(
+ self.client = volumes_client.VolumesClient(
fake_auth, 'compute', 'regionOne')
def _test_list_volumes(self, bytes_body=False, **params):
@@ -100,15 +100,15 @@
{}, status=202, volume_id=self.FAKE_VOLUME['id'])
def test_is_resource_deleted_true(self):
- module = ('tempest.services.compute.json.volumes_extensions_client.'
- 'VolumesExtensionsClient.show_volume')
+ module = ('tempest.services.compute.json.volumes_client.'
+ 'VolumesClient.show_volume')
self.useFixture(mockpatch.Patch(
module, side_effect=lib_exc.NotFound))
self.assertTrue(self.client.is_resource_deleted('fake-id'))
def test_is_resource_deleted_false(self):
- module = ('tempest.services.compute.json.volumes_extensions_client.'
- 'VolumesExtensionsClient.show_volume')
+ module = ('tempest.services.compute.json.volumes_client.'
+ 'VolumesClient.show_volume')
self.useFixture(mockpatch.Patch(
module, return_value={}))
self.assertFalse(self.client.is_resource_deleted('fake-id'))