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

Zuul · openstack-gerrit · commit f1da522cc3c2 · 2023-01-25T18:04:00.000Z
diff --git a/openstackclient/image/v2/image.py b/openstackclient/image/v2/image.py
@@ -1805,10 +1805,10 @@ def take_action(self, parsed_args):
         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
@@ -1859,6 +1859,10 @@ def test_import_image__glance_direct(self):
         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 @@ def test_import_image__web_download(self):
         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 @@ def test_import_image__copy_image(self):
         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 @@ def test_import_image__glance_download(self):
         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,
