openstack/cinder
Code Issues Proposed changes

Merge "Fixes Cinder fails to upload volume to vhd image"

Browse Source
This commit is contained in:
Jenkins 2014-09-10 18:54:07 +00:00 committed by Gerrit Code Review
commit 69b4cfd09c
2 changed files with 2 additions and 2 deletions
cinder
tests/windows
test_windows.py
volume/drivers/windows
windows.py

2
cinder/tests/windows/test_windows.py

@ -326,7 +326,7 @@ class TestWindowsDriver(test.TestCase):
vhdutils.VHDUtils.convert_vhd(temp_vhd_path, upload_image,
constants.VHD_TYPE_DYNAMIC)
image_utils.upload_volume(None, None, image_meta, upload_image, 'vpc')
image_utils.upload_volume(None, None, image_meta, upload_image, 'vhd')
fileutils.delete_if_exists(temp_vhd_path)
fileutils.delete_if_exists(upload_image)

2
cinder/volume/drivers/windows/windows.py

@ -201,7 +201,7 @@ class WindowsDriver(driver.ISCSIDriver):
constants.VHD_TYPE_DYNAMIC)
image_utils.upload_volume(context, image_service, image_meta,
upload_image, 'vpc')
upload_image, 'vhd')
finally:
fileutils.delete_if_exists(temp_vhd_path)
fileutils.delete_if_exists(upload_image)