commit 9902c17927b69e0b2379dfe8d2a2b89244162526
Author: Brian Rosmaita <email address hidden>
Date: Mon Jan 16 14:44:04 2023 -0500
Check VMDK subformat against an allowed list
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 930fc93e9fda82a4aa4568ae149c3c80af7379d0)
(cherry picked from commit ba37dc2ead69c08d7ede242295ff997086e6121d)
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 2ae5d53526e2b224d81b3259140c59aba97d72c3)
(cherry picked from commit e96415409daa158cc503c1adec1ca1ca4f940082)
Conflicts:
cinder/image/image_utils.py
- removed type annotations
- restored wallaby-era fetch_verify_image() function signature
(cherry picked from commit be11d54ac420e0ebc0da6917d7ffc3af59b40f24)
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 ^^
(cherry picked from commit 17565262dafb5beeaec8e9e249e760fc64f3df93)
Conflicts:
cinder/image/image_utils.py
- removed src_passphrase_file parameter to convert_image() that was
introduced in victoria by change I896f70d204ad103e
cinder/tests/unit/test_image_utils.py
- removed references to ddt.TestNameFormat (not present in this
version of ddt)
Reviewed: https:/ /review. opendev. org/c/openstack /cinder/ +/871629 /opendev. org/openstack/ cinder/ commit/ 9902c17927b69e0 b2379dfe8d2a2b8 9244162526
Committed: https:/
Submitter: "Zuul (22348)"
Branch: stable/ussuri
commit 9902c17927b69e0 b2379dfe8d2a2b8 9244162526
Author: Brian Rosmaita <email address hidden>
Date: Mon Jan 16 14:44:04 2023 -0500
Check VMDK subformat against an allowed list
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: I3c60ee4c0795aa df03108ed9b5a46 ecd116894af 4aa4568ae149c3c 80af7379d0) d7ede242295ff99 7086e6121d) image/image_ utils.py n_disable in tests 4d81b3259140c59 aba97d72c3) cc503c1adec1ca1 ca4f940082) image/image_ utils.py image() function signature bc0da6917d7ffc3 af59b40f24) tests/unit/ test_image_ utils.py image/image_ utils.py 4.1.0,> =3.14.0 tests/unit/ test_image_ utils.py eaec8e9e249e760 fc64f3df93) image/image_ utils.py tests/unit/ test_image_ utils.py
Partial-bug: #1996188
(cherry picked from commit 930fc93e9fda82a
(cherry picked from commit ba37dc2ead69c08
Conflicts:
cinder/
- changed type annotations to use implicit Optional to be
consistent with cinder yoga mypy usage
- removed refs to image_conversio
(cherry picked from commit 2ae5d53526e2b22
(cherry picked from commit e96415409daa158
Conflicts:
cinder/
- removed type annotations
- restored wallaby-era fetch_verify_
(cherry picked from commit be11d54ac420e0e
Conflicts:
cinder/
- did not include extraneous test from be11d54ac's parent commit
Additions:
cinder/
- added code to handle oslo.utils<
cinder/
- added a test for ^^
(cherry picked from commit 17565262dafb5be
Conflicts:
cinder/
- removed src_passphrase_file parameter to convert_image() that was
introduced in victoria by change I896f70d204ad103e
cinder/
- removed references to ddt.TestNameFormat (not present in this
version of ddt)