From e18baa0c516b74091d6a21552f352316bfe9a7b5 Mon Sep 17 00:00:00 2001
From: ekudryashova <ekudryashova@mirantis.com>
Date: Tue, 11 Mar 2014 18:29:13 +0200
Subject: [PATCH] Fix usage of v1 and v2 availability zones

Change usage of availability zones in client. V2 client should
use appropriate version of manager of availability zones.

Also change tests of v2 availability zones to test version 2
instead of one more time test v1 availability zones.

Change-Id: Iec3863a105a20f876a303f789cc1edfafa58f4df
Closes-Bug: #1290956
---
 cinderclient/tests/v2/test_availability_zone.py | 6 +++---
 cinderclient/v2/client.py                       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cinderclient/tests/v2/test_availability_zone.py b/cinderclient/tests/v2/test_availability_zone.py
index a2e1fc8b3..8dd99aa6c 100644
--- a/cinderclient/tests/v2/test_availability_zone.py
+++ b/cinderclient/tests/v2/test_availability_zone.py
@@ -16,10 +16,10 @@
 
 import six
 
-from cinderclient.v1 import availability_zones
-from cinderclient.v1 import shell
+from cinderclient.v2 import availability_zones
+from cinderclient.v2 import shell
 from cinderclient.tests import utils
-from cinderclient.tests.v1 import fakes
+from cinderclient.tests.v2 import fakes
 
 
 cs = fakes.FakeClient()
diff --git a/cinderclient/v2/client.py b/cinderclient/v2/client.py
index 7b91c2344..ebe77489f 100644
--- a/cinderclient/v2/client.py
+++ b/cinderclient/v2/client.py
@@ -14,7 +14,7 @@
 #    under the License.
 
 from cinderclient import client
-from cinderclient.v1 import availability_zones
+from cinderclient.v2 import availability_zones
 from cinderclient.v2 import limits
 from cinderclient.v2 import qos_specs
 from cinderclient.v2 import quota_classes