Define volume availability_zones_client as library
Volume availability_zones_clients have good interfaces now,
then this patch makes them as a library.
Partially implements blueprint consistent-service-method-names
Change-Id: I4fc229b113b4f85af22fb3300ae0907dc49f4a73
diff --git a/releasenotes/notes/volume-clients-as-library-9a3444dd63c134b3.yaml b/releasenotes/notes/volume-clients-as-library-9a3444dd63c134b3.yaml
index 101263f..df7e46d 100644
--- a/releasenotes/notes/volume-clients-as-library-9a3444dd63c134b3.yaml
+++ b/releasenotes/notes/volume-clients-as-library-9a3444dd63c134b3.yaml
@@ -6,5 +6,7 @@
so the other projects can use these modules as stable libraries
without any maintenance changes.
+ * availability_zone_client(v1)
+ * availability_zone_client(v2)
* extensions_client(v1)
* extensions_client(v2)
diff --git a/tempest/services/volume/v1/json/availability_zone_client.py b/tempest/lib/services/volume/v1/availability_zone_client.py
similarity index 100%
rename from tempest/services/volume/v1/json/availability_zone_client.py
rename to tempest/lib/services/volume/v1/availability_zone_client.py
diff --git a/tempest/services/volume/v2/json/availability_zone_client.py b/tempest/lib/services/volume/v2/availability_zone_client.py
similarity index 100%
rename from tempest/services/volume/v2/json/availability_zone_client.py
rename to tempest/lib/services/volume/v2/availability_zone_client.py
diff --git a/tempest/services/volume/v1/__init__.py b/tempest/services/volume/v1/__init__.py
index 4334889..c56d42c 100644
--- a/tempest/services/volume/v1/__init__.py
+++ b/tempest/services/volume/v1/__init__.py
@@ -12,14 +12,14 @@
# License for the specific language governing permissions and limitations under
# the License.
+from tempest.lib.services.volume.v1.availability_zone_client import \
+ AvailabilityZoneClient
from tempest.lib.services.volume.v1.extensions_client import ExtensionsClient
from tempest.services.volume.v1.json.admin.hosts_client import HostsClient
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.availability_zone_client import \
- AvailabilityZoneClient
from tempest.services.volume.v1.json.backups_client import BackupsClient
from tempest.services.volume.v1.json.qos_client import QosSpecsClient
from tempest.services.volume.v1.json.snapshots_client import SnapshotsClient
diff --git a/tempest/services/volume/v2/__init__.py b/tempest/services/volume/v2/__init__.py
index 7e4dd40..df6bd3e 100644
--- a/tempest/services/volume/v2/__init__.py
+++ b/tempest/services/volume/v2/__init__.py
@@ -12,14 +12,14 @@
# License for the specific language governing permissions and limitations under
# the License.
+from tempest.lib.services.volume.v2.availability_zone_client import \
+ AvailabilityZoneClient
from tempest.lib.services.volume.v2.extensions_client import ExtensionsClient
from tempest.services.volume.v2.json.admin.hosts_client import HostsClient
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.availability_zone_client import \
- AvailabilityZoneClient
from tempest.services.volume.v2.json.backups_client import BackupsClient
from tempest.services.volume.v2.json.qos_client import QosSpecsClient
from tempest.services.volume.v2.json.snapshots_client import SnapshotsClient