From b566f5ef61067b19675163cf1d346021b3c89033 Mon Sep 17 00:00:00 2001 From: "Li, Chen" Date: Tue, 31 Mar 2015 15:30:16 +0800 Subject: [PATCH] Switch to v2 version of novaclient Currently v1_1 version of novaclient is deprecated, so it's required to switch for v2 version of novaclient. Change-Id: I824e8659febfeb86721b610a03a8c3027042cb3d --- manila/compute/nova.py | 6 +++--- manila/tests/compute/test_nova.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) Index: manila-2015.1.1.dev6/manila/compute/nova.py =================================================================== --- manila-2015.1.1.dev6.orig/manila/compute/nova.py +++ manila-2015.1.1.dev6/manila/compute/nova.py @@ -21,9 +21,9 @@ import sys from novaclient import exceptions as nova_exception from novaclient import service_catalog from novaclient import utils -from novaclient.v2 import client as nova_client -from novaclient.v2.contrib import assisted_volume_snapshots -from novaclient.v2 import servers as nova_servers +from novaclient.v1_1 import client as nova_client +from novaclient.v1_1.contrib import assisted_volume_snapshots +from novaclient.v1_1 import servers as nova_servers from oslo.config import cfg from oslo_log import log Index: manila-2015.1.1.dev6/manila/tests/compute/test_nova.py =================================================================== --- manila-2015.1.1.dev6.orig/manila/tests/compute/test_nova.py +++ manila-2015.1.1.dev6/manila/tests/compute/test_nova.py @@ -15,7 +15,7 @@ import mock from novaclient import exceptions as nova_exception from novaclient import utils -from novaclient.v2 import servers as nova_servers +from novaclient.v1_1 import servers as nova_servers from manila.compute import nova from manila import context