openstack/cinder
Code Issues Proposed changes

Merge "VMware: Add file open mode to support python3"

Browse Source
This commit is contained in:
Zuul
2018-06-11 23:40:28 +00:00
committed by Gerrit Code Review
parent e2a29760dd dfd6d32967
commit dbca571a39
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cinder/tests/unit/volume/drivers/vmware/test_vmware_vmdk.py
View File

@@ -2572,6 +2572,7 @@ class VMwareVcVmdkDriverTestCase(test.TestCase):
vops.get_entity_name.assert_called_once_with(dc_ref)
cookies = session.vim.client.options.transport.cookiejar
if use_temp_image:
mock_open.assert_called_once_with('/tmp/foo', 'rb')
download_file.assert_called_once_with(
mock.sentinel.read_handle,
self._config.vmware_host_ip,

2
cinder/volume/drivers/vmware/vmdk.py
View File

@@ -868,7 +868,7 @@ class VMwareVcVmdkDriver(driver.VolumeDriver):
tmp_image = tmp_images.get(context, image_id)
if tmp_image:
LOG.debug("Using temporary image.")
with open(tmp_image) as read_handle:
with open(tmp_image, 'rb') as read_handle:
image_transfer.download_file(read_handle,
host_ip,
port,