diff options
Diffstat (limited to 'heat/tests/openstack/cinder/test_volume_utils.py')
-rw-r--r-- | heat/tests/openstack/cinder/test_volume_utils.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/heat/tests/openstack/cinder/test_volume_utils.py b/heat/tests/openstack/cinder/test_volume_utils.py index e5aee1bc1..9a05923a6 100644 --- a/heat/tests/openstack/cinder/test_volume_utils.py +++ b/heat/tests/openstack/cinder/test_volume_utils.py @@ -10,11 +10,12 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -from cinderclient.v2 import client as cinderclient -import mock import six +from unittest import mock + +from cinderclient.v3 import client as cinderclient + from heat.engine.clients.os import cinder from heat.engine.clients.os import nova from heat.engine.resources.aws.ec2 import volume as aws_vol @@ -31,7 +32,7 @@ class VolumeTestCase(common.HeatTestCase): super(VolumeTestCase, self).setUp() self.fc = fakes_nova.FakeClient() self.cinder_fc = cinderclient.Client('username', 'password') - self.cinder_fc.volume_api_version = 2 + self.cinder_fc.volume_api_version = 3 self.patchobject(cinder.CinderClientPlugin, '_create', return_value=self.cinder_fc) self.patchobject(nova.NovaClientPlugin, 'client', |