diff options
| author | Zuul <zuul@review.opendev.org> | 2023-01-25 18:04:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-01-25 18:04:00 +0000 |
| commit | f1da522cc3c2f1055157d41c783e18597608fbb6 (patch) | |
| tree | 1e188be8ad9182974316d4d4adc7d715c17eb502 | |
| parent | 7985d496892635b70b71be552c52946824d73e9b (diff) | |
| parent | 6dea276e5a425cd7fa3fd839e5bb03027b7a9347 (diff) | |
| download | python-openstackclient-f1da522cc3c2f1055157d41c783e18597608fbb6.tar.gz | |
Merge "image: Add support for additional image import methods"
| -rw-r--r-- | openstackclient/image/v2/image.py | 8 | ||||
| -rw-r--r-- | openstackclient/tests/unit/image/v2/test_image.py | 20 |
2 files changed, 20 insertions, 8 deletions
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py index ed99c174..4adaadda 100644 --- a/openstackclient/image/v2/image.py +++ b/openstackclient/image/v2/image.py @@ -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, diff --git a/openstackclient/tests/unit/image/v2/test_image.py b/openstackclient/tests/unit/image/v2/test_image.py index dccdabf0..019b4d9d 100644 --- a/openstackclient/tests/unit/image/v2/test_image.py +++ b/openstackclient/tests/unit/image/v2/test_image.py @@ -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, |