diff --git a/ironic_lib/disk_utils.py b/ironic_lib/disk_utils.py index 4f6e4aa0..322d4b91 100644 --- a/ironic_lib/disk_utils.py +++ b/ironic_lib/disk_utils.py @@ -456,8 +456,9 @@ def qemu_img_info(path): out, err = utils.execute('env', 'LC_ALL=C', 'LANG=C', 'qemu-img', 'info', path, + '--output=json', prlimit=_qemu_img_limits()) - return imageutils.QemuImgInfo(out) + return imageutils.QemuImgInfo(out, format='json') def _retry_on_res_temp_unavailable(exc): diff --git a/ironic_lib/tests/test_disk_utils.py b/ironic_lib/tests/test_disk_utils.py index 433a058a..eb56ec8a 100644 --- a/ironic_lib/tests/test_disk_utils.py +++ b/ironic_lib/tests/test_disk_utils.py @@ -617,8 +617,9 @@ class OtherFunctionTestCase(base.IronicLibTestCase): path_exists_mock.assert_called_once_with('img') execute_mock.assert_called_once_with('env', 'LC_ALL=C', 'LANG=C', 'qemu-img', 'info', 'img', + '--output=json', prlimit=mock.ANY) - qemu_img_info_mock.assert_called_once_with('out') + qemu_img_info_mock.assert_called_once_with('out', format='json') @mock.patch.object(utils, 'execute', autospec=True) def test_convert_image(self, execute_mock):