Merge "Fix usage of v1 and v2 availability zones"
This commit is contained in:
commit
1eb83d0480
cinderclient
@ -16,10 +16,10 @@
|
|||||||
|
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from cinderclient.v1 import availability_zones
|
from cinderclient.v2 import availability_zones
|
||||||
from cinderclient.v1 import shell
|
from cinderclient.v2 import shell
|
||||||
from cinderclient.tests import utils
|
from cinderclient.tests import utils
|
||||||
from cinderclient.tests.v1 import fakes
|
from cinderclient.tests.v2 import fakes
|
||||||
|
|
||||||
|
|
||||||
cs = fakes.FakeClient()
|
cs = fakes.FakeClient()
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from cinderclient import client
|
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 limits
|
||||||
from cinderclient.v2 import qos_specs
|
from cinderclient.v2 import qos_specs
|
||||||
from cinderclient.v2 import quota_classes
|
from cinderclient.v2 import quota_classes
|
||||||
|
Loading…
x
Reference in New Issue
Block a user