From ea4f2643351023525ebefc7d82cef910f6640799 Mon Sep 17 00:00:00 2001 From: guo yunxian Date: Thu, 22 Sep 2016 16:55:20 +0800 Subject: [PATCH] Define v2 encryption_types_client as library Migrate v2 API encryption_types_client to tempest.lib. Partially implements blueprint consistent-service-method-names Change-Id: Id3b41db66626cda2a50bf406fe4d6cff085c8dbf --- ...volume-clients-as-a-library-d05b6bc35e66c6ef.yaml | 1 + .../services/volume/v2}/encryption_types_client.py | 0 tempest/services/volume/v2/__init__.py | 12 ++++++------ 3 files changed, 7 insertions(+), 6 deletions(-) rename tempest/{services/volume/v2/json => lib/services/volume/v2}/encryption_types_client.py (100%) diff --git a/releasenotes/notes/add-volume-clients-as-a-library-d05b6bc35e66c6ef.yaml b/releasenotes/notes/add-volume-clients-as-a-library-d05b6bc35e66c6ef.yaml index 1ef2b0d1da..4886f165f6 100644 --- a/releasenotes/notes/add-volume-clients-as-a-library-d05b6bc35e66c6ef.yaml +++ b/releasenotes/notes/add-volume-clients-as-a-library-d05b6bc35e66c6ef.yaml @@ -7,6 +7,7 @@ features: any maintenance changes. * encryption_types_client (v1) + * encryption_types_client (v2) * qos_clients (v1) * qos_clients (v2) * snapshots_client (v1) diff --git a/tempest/services/volume/v2/json/encryption_types_client.py b/tempest/lib/services/volume/v2/encryption_types_client.py similarity index 100% rename from tempest/services/volume/v2/json/encryption_types_client.py rename to tempest/lib/services/volume/v2/encryption_types_client.py diff --git a/tempest/services/volume/v2/__init__.py b/tempest/services/volume/v2/__init__.py index b63e6f2b50..fcc34f952c 100644 --- a/tempest/services/volume/v2/__init__.py +++ b/tempest/services/volume/v2/__init__.py @@ -14,6 +14,8 @@ from tempest.lib.services.volume.v2.availability_zone_client import \ AvailabilityZoneClient +from tempest.lib.services.volume.v2.encryption_types_client import \ + EncryptionTypesClient 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.qos_client import QosSpecsClient @@ -22,11 +24,9 @@ from tempest.lib.services.volume.v2.services_client import ServicesClient from tempest.lib.services.volume.v2.snapshots_client import SnapshotsClient from tempest.lib.services.volume.v2.types_client import TypesClient from tempest.services.volume.v2.json.backups_client import BackupsClient -from tempest.services.volume.v2.json.encryption_types_client import \ - EncryptionTypesClient from tempest.services.volume.v2.json.volumes_client import VolumesClient -__all__ = ['AvailabilityZoneClient', 'ExtensionsClient', 'HostsClient', - 'QosSpecsClient', 'QuotasClient', 'ServicesClient', - 'SnapshotsClient', 'TypesClient', 'BackupsClient', - 'EncryptionTypesClient', 'VolumesClient', ] +__all__ = ['AvailabilityZoneClient', 'EncryptionTypesClient', + 'ExtensionsClient', 'HostsClient', 'QosSpecsClient', + 'QuotasClient', 'ServicesClient', 'SnapshotsClient', + 'TypesClient', 'BackupsClient', 'VolumesClient', ]