openstack
/
python-openstackclient
Code Issues Proposed changes

Merge "image: Add support for additional image import methods"

This commit is contained in:
Zuul 2023-01-25 18:04:00 +00:00 committed by Gerrit Code Review
parent 7985d49689 6dea276e5a
commit f1da522cc3
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstackclient/image/v2/image.py
View File

@ -1805,10 +1805,10 @@ class ImportImage(command.ShowOne):
image_client.import_image(
image,
method=parsed_args.import_method,
# uri=parsed_args.uri,
# remote_region=parsed_args.remote_region,
# remote_image=parsed_args.remote_image,
# remote_service_interface=parsed_args.remote_service_interface,
uri=parsed_args.uri,
remote_region=parsed_args.remote_region,
remote_image=parsed_args.remote_image,
remote_service_interface=parsed_args.remote_service_interface,
stores=parsed_args.stores,
all_stores=parsed_args.all_stores,
all_stores_must_succeed=not parsed_args.allow_failure,

20
openstackclient/tests/unit/image/v2/test_image.py
View File

@ -1859,6 +1859,10 @@ class TestImageImport(TestImage):
self.client.import_image.assert_called_once_with(
self.image,
method='glance-direct',
uri=None,
remote_region=None,
remote_image=None,
remote_service_interface=None,
stores=None,
all_stores=None,
all_stores_must_succeed=False,
@ -1883,7 +1887,10 @@ class TestImageImport(TestImage):
self.client.import_image.assert_called_once_with(
self.image,
method='web-download',
# uri='https://example.com/',
uri='https://example.com/',
remote_region=None,
remote_image=None,
remote_service_interface=None,
stores=None,
all_stores=None,
all_stores_must_succeed=False,
@ -1981,6 +1988,10 @@ class TestImageImport(TestImage):
self.client.import_image.assert_called_once_with(
self.image,
method='copy-image',
uri=None,
remote_region=None,
remote_image=None,
remote_service_interface=None,
stores=['fast'],
all_stores=None,
all_stores_must_succeed=False,
@ -2008,9 +2019,10 @@ class TestImageImport(TestImage):
self.client.import_image.assert_called_once_with(
self.image,
method='glance-download',
# remote_region='eu/dublin',
# remote_image='remote-image-id',
# remote_service_interface='private',
uri=None,
remote_region='eu/dublin',
remote_image='remote-image-id',
remote_service_interface='private',
stores=None,
all_stores=None,
all_stores_must_succeed=False,