From 5e938c9c06741388aa85a69f087135a2892c4405 Mon Sep 17 00:00:00 2001 From: Ken'ichi Ohmichi Date: Tue, 2 Aug 2016 16:11:50 -0700 Subject: [PATCH] Define volume services_client as library Volume services_clients have good interfaces now, then this patch makes them as a library. Partially implements blueprint consistent-service-method-names Change-Id: I1b4f38033830ce7bed24d97e73072fd7a2f03f09 --- .../notes/volume-clients-as-library-9a3444dd63c134b3.yaml | 2 ++ .../json/admin => lib/services/volume/v1}/services_client.py | 0 .../json/admin => lib/services/volume/v2}/services_client.py | 0 tempest/services/volume/v1/__init__.py | 3 +-- tempest/services/volume/v2/__init__.py | 3 +-- 5 files changed, 4 insertions(+), 4 deletions(-) rename tempest/{services/volume/v1/json/admin => lib/services/volume/v1}/services_client.py (100%) rename tempest/{services/volume/v2/json/admin => lib/services/volume/v2}/services_client.py (100%) diff --git a/releasenotes/notes/volume-clients-as-library-9a3444dd63c134b3.yaml b/releasenotes/notes/volume-clients-as-library-9a3444dd63c134b3.yaml index b1fe74a15a..6a4fc2bcda 100644 --- a/releasenotes/notes/volume-clients-as-library-9a3444dd63c134b3.yaml +++ b/releasenotes/notes/volume-clients-as-library-9a3444dd63c134b3.yaml @@ -12,3 +12,5 @@ features: * extensions_client(v2) * hosts_client(v1) * hosts_client(v2) + * services_client(v1) + * services_client(v2) diff --git a/tempest/services/volume/v1/json/admin/services_client.py b/tempest/lib/services/volume/v1/services_client.py similarity index 100% rename from tempest/services/volume/v1/json/admin/services_client.py rename to tempest/lib/services/volume/v1/services_client.py diff --git a/tempest/services/volume/v2/json/admin/services_client.py b/tempest/lib/services/volume/v2/services_client.py similarity index 100% rename from tempest/services/volume/v2/json/admin/services_client.py rename to tempest/lib/services/volume/v2/services_client.py diff --git a/tempest/services/volume/v1/__init__.py b/tempest/services/volume/v1/__init__.py index 9363a2bcfa..52d2942533 100644 --- a/tempest/services/volume/v1/__init__.py +++ b/tempest/services/volume/v1/__init__.py @@ -16,9 +16,8 @@ from tempest.lib.services.volume.v1.availability_zone_client import \ AvailabilityZoneClient from tempest.lib.services.volume.v1.extensions_client import ExtensionsClient from tempest.lib.services.volume.v1.hosts_client import HostsClient +from tempest.lib.services.volume.v1.services_client import ServicesClient from tempest.services.volume.v1.json.admin.quotas_client import QuotasClient -from tempest.services.volume.v1.json.admin.services_client import \ - ServicesClient from tempest.services.volume.v1.json.admin.types_client import TypesClient from tempest.services.volume.v1.json.backups_client import BackupsClient from tempest.services.volume.v1.json.qos_client import QosSpecsClient diff --git a/tempest/services/volume/v2/__init__.py b/tempest/services/volume/v2/__init__.py index 0880afd5a7..26fbc2ba2e 100644 --- a/tempest/services/volume/v2/__init__.py +++ b/tempest/services/volume/v2/__init__.py @@ -16,9 +16,8 @@ from tempest.lib.services.volume.v2.availability_zone_client import \ AvailabilityZoneClient from tempest.lib.services.volume.v2.extensions_client import ExtensionsClient from tempest.lib.services.volume.v2.hosts_client import HostsClient +from tempest.lib.services.volume.v2.services_client import ServicesClient from tempest.services.volume.v2.json.admin.quotas_client import QuotasClient -from tempest.services.volume.v2.json.admin.services_client import \ - ServicesClient from tempest.services.volume.v2.json.admin.types_client import TypesClient from tempest.services.volume.v2.json.backups_client import BackupsClient from tempest.services.volume.v2.json.qos_client import QosSpecsClient