openstack
/
openstacksdk
Code Issues Proposed changes

Merge "image: Pass correct stores argument"

This commit is contained in:
Zuul 2024-04-26 12:33:56 +00:00 committed by Gerrit Code Review
parent 7ad4623a97 e409254ed5
commit b77ebf2ae0
2 changed files with 75 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack/image/v2/_proxy.py
View File

@ -333,8 +333,8 @@ class Proxy(proxy.Proxy):
validate_checksum=validate_checksum,
use_import=use_import,
stores=stores,
all_stores=stores,
all_stores_must_succeed=stores,
all_stores=all_stores,
all_stores_must_succeed=all_stores_must_succeed,
**image_kwargs,
)
else:

73
openstack/tests/unit/image/v2/test_proxy.py
View File

@ -278,6 +278,79 @@ class TestImage(TestImageProxy):
args, kwargs = self.proxy._create.call_args
self.assertEqual(kwargs["is_protected"], True)
def test_image_create_with_stores(self):
self.proxy.find_image = mock.Mock()
self.proxy._upload_image = mock.Mock()
self.proxy.create_image(
name='fake',
data=b'fake',
container='bare',
disk_format='raw',
use_import=True,
stores=['cinder', 'swift'],
)
self.proxy.find_image.assert_called_with('fake')
self.proxy._upload_image.assert_called_with(
'fake',
container_format='bare',
disk_format='raw',
filename=None,
data=b'fake',
meta={},
properties={
self.proxy._IMAGE_MD5_KEY: '',
self.proxy._IMAGE_SHA256_KEY: '', # noqa: E501
self.proxy._IMAGE_OBJECT_KEY: 'bare/fake',
},
timeout=3600,
validate_checksum=False,
use_import=True,
stores=['cinder', 'swift'],
all_stores=None,
all_stores_must_succeed=None,
wait=False,
)
def test_image_create_with_all_stores(self):
self.proxy.find_image = mock.Mock()
self.proxy._upload_image = mock.Mock()
self.proxy.create_image(
name='fake',
data=b'fake',
container='bare',
disk_format='raw',
use_import=True,
all_stores=True,
all_stores_must_succeed=True,
)
self.proxy.find_image.assert_called_with('fake')
self.proxy._upload_image.assert_called_with(
'fake',
container_format='bare',
disk_format='raw',
filename=None,
data=b'fake',
meta={},
properties={
self.proxy._IMAGE_MD5_KEY: '',
self.proxy._IMAGE_SHA256_KEY: '', # noqa: E501
self.proxy._IMAGE_OBJECT_KEY: 'bare/fake',
},
timeout=3600,
validate_checksum=False,
use_import=True,
stores=None,
all_stores=True,
all_stores_must_succeed=True,
wait=False,
)
def test_image_upload_no_args(self):
# container_format and disk_format are required args
self.assertRaises(exceptions.InvalidRequest, self.proxy.upload_image)