Also add a more general check to convert_image that the image format
reported by qemu-img matches what the caller says it is.
Change-Id: I3c60ee4c0795aadf03108ed9b5a46ecd116894af
Partial-bug: #1996188
(cherry picked from commit 930fc93e9f)
(cherry picked from commit ba37dc2ead)
Conflicts:
cinder/image/image_utils.py
- changed type annotations to use implicit Optional to be
consistent with cinder yoga mypy usage
- removed refs to image_conversion_disable in tests
(cherry picked from commit 2ae5d53526)
(cherry picked from commit e96415409d)
Conflicts:
cinder/image/image_utils.py
- removed type annotations
- restored wallaby-era fetch_verify_image() function signature
(cherry picked from commit be11d54ac4)
Conflicts:
cinder/tests/unit/test_image_utils.py
- did not include extraneous test from be11d54ac's parent commit
Additions:
cinder/image/image_utils.py
- added code to handle oslo.utils<4.1.0,>=3.14.0
cinder/tests/unit/test_image_utils.py
- added a test for ^^
17565262da