openstack
/
cinder
Code Issues Proposed changes

Merge "Fix vhd image conversion regression"

This commit is contained in:
Zuul 2018-03-21 14:48:21 +00:00 committed by Gerrit Code Review
parent 41321d4bc0 cf9ea3fdb3
commit 9e4cbc6947
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/image/image_utils.py
View File

@ -145,7 +145,7 @@ def _get_qemu_convert_cmd(src, dest, out_format, src_format=None,
if out_format == 'vhd':
# qemu-img still uses the legacy vpc name
out_format == 'vpc'
out_format = 'vpc'
cmd = ['qemu-img', 'convert', '-O', out_format]

18
cinder/tests/unit/test_image_utils.py
View File

@ -260,6 +260,24 @@ class TestConvertImage(test.TestCase):
'-O', out_format, '-t', 'none',
source, dest, run_as_root=True)
@mock.patch('cinder.image.image_utils.qemu_img_info')
@mock.patch('cinder.utils.execute')
@mock.patch('cinder.utils.is_blk_device', return_value=False)
@mock.patch('cinder.volume.utils.check_for_odirect_support')
def test_convert_to_vhd(self, mock_check_odirect, mock_isblk,
mock_exec, mock_info):
source = mock.sentinel.source
dest = mock.sentinel.dest
out_format = "vhd"
mock_info.return_value.virtual_size = 1048576
output = image_utils.convert_image(source, dest, out_format)
self.assertIsNone(output)
# Qemu uses the legacy "vpc" format name, instead of "vhd".
mock_exec.assert_called_once_with('qemu-img', 'convert',
'-O', 'vpc',
source, dest, run_as_root=True)
class TestResizeImage(test.TestCase):
@mock.patch('cinder.utils.execute')