image: Add support for additional image import methods
These are now supported in openstacksdk so we can use them. Change-Id: Ie3107ba2155f9008e6065171298f85978957a172 Signed-off-by: Stephen Finucane <sfinucan@redhat.com> Depends-on: https://review.opendev.org/c/openstack/openstacksdk/+/864029
This commit is contained in:
parent
4eea3408dc
commit
6dea276e5a
@ -1793,10 +1793,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,
|
||||
|
@ -1856,6 +1856,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,
|
||||
@ -1880,7 +1884,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,
|
||||
@ -1978,6 +1985,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,
|
||||
@ -2005,9 +2016,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,
|
||||
|
Loading…
x
Reference in New Issue
Block a user