image v1: Migrate 'create image' volume calls to SDK

Change Ie57a5c17a6df5a333abd6b11e28b65833740e102 did this for the v2
API but missed v1. Correct this now.

Change-Id: I53c72cce4be38d7eb64345db29abf95d5d5ffeb7
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

Author: stephenfin

openstackclient/image/v1/image.py

@@ -297,19 +297,17 @@ def take_action(
 
         if not parsed_args.location and not parsed_args.copy_from:
             if parsed_args.volume:
-                volume_client = self.app.client_manager.volume
-                source_volume = utils.find_resource(
-                    volume_client.volumes,
-                    parsed_args.volume,
+                volume_client = self.app.client_manager.sdk_connection.volume
+                source_volume = volume_client.find_volume(
+                    parsed_args.volume, ignore_missing=False
                 )
-                _response, body = volume_client.volumes.upload_to_image(
-                    source_volume.id,
-                    parsed_args.force,
+                info = source_volume.upload_to_image(
+                    volume_client,
                     parsed_args.name,
-                    parsed_args.container_format,
-                    parsed_args.disk_format,
+                    force=parsed_args.force,
+                    container_format=parsed_args.container_format,
+                    disk_format=parsed_args.disk_format,
                 )
-                info = body['os-volume_upload_image']
             elif parsed_args.file:
                 # Send an open file handle to glanceclient so it will
                 # do a chunked transfer
@@ -764,21 +762,22 @@ def take_action(self, parsed_args: argparse.Namespace) -> None:
 
             if not parsed_args.location and not parsed_args.copy_from:
                 if parsed_args.volume:
-                    volume_client = self.app.client_manager.volume
-                    source_volume = utils.find_resource(
-                        volume_client.volumes,
-                        parsed_args.volume,
+                    volume_client = (
+                        self.app.client_manager.sdk_connection.volume
                     )
-                    volume_client.volumes.upload_to_image(
-                        source_volume.id,
-                        parsed_args.force,
+                    source_volume = volume_client.find_volume(
+                        parsed_args.volume, ignore_missing=False
+                    )
+                    source_volume.upload_to_image(
+                        volume_client,
                         parsed_args.image,
-                        (
+                        force=parsed_args.force,
+                        container_format=(
                             parsed_args.container_format
                             if parsed_args.container_format
                             else image.container_format
                         ),
-                        (
+                        disk_format=(
                             parsed_args.disk_format
                             if parsed_args.disk_format
                             else image.disk_format

openstackclient/tests/unit/image/v1/fakes.py

@@ -15,6 +15,7 @@
 from unittest import mock
 import uuid
 
+from openstack.block_storage.v2 import _proxy as block_storage_v2_proxy
 from openstack.image.v1 import _proxy
 from openstack.image.v1 import image
 
@@ -41,6 +42,12 @@ def setUp(self):
         )
         self.volume_client = self.app.client_manager.volume
 
+        self.app.client_manager.sdk_connection.volume = mock.Mock(
+            spec=block_storage_v2_proxy.Proxy,
+        )
+        self.app.client_manager.sdk_connection.volume.api_version = '2'
+        self.volume_sdk_client = self.app.client_manager.sdk_connection.volume
+
 
 def create_one_image(attrs=None):
     """Create a fake image.

openstackclient/tests/unit/image/v1/test_image.py

@@ -15,10 +15,11 @@
 import copy
 from unittest import mock
 
+from openstack.block_storage.v2 import volume as _volume
+from openstack.test import fakes as sdk_fakes
 from osc_lib.cli import format_columns
 
 from openstackclient.image.v1 import image
-from openstackclient.tests.unit import fakes
 from openstackclient.tests.unit.image.v1 import fakes as image_fakes
 
 
@@ -591,27 +592,8 @@ def test_image_set_properties(self):
         self.assertIsNone(result)
 
     def test_image_update_volume(self):
-        # Set up VolumeManager Mock
-        volumes_mock = self.volume_client.volumes
-        volumes_mock.reset_mock()
-        volumes_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy({'id': 'vol1', 'name': 'volly'}),
-            loaded=True,
-        )
-        response = {
-            "id": 'volume_id',
-            "updated_at": 'updated_at',
-            "status": 'uploading',
-            "display_description": 'desc',
-            "size": 'size',
-            "volume_type": 'volume_type',
-            "container_format": image.DEFAULT_CONTAINER_FORMAT,
-            "disk_format": image.DEFAULT_DISK_FORMAT,
-            "image": self._image.name,
-        }
-        full_response = {"os-volume_upload_image": response}
-        volumes_mock.upload_to_image.return_value = (201, full_response)
+        source_volume = sdk_fakes.generate_fake_resource(_volume.Volume)
+        self.volume_sdk_client.find_volume.return_value = source_volume
 
         arglist = [
             '--volume',
@@ -632,18 +614,20 @@ def test_image_update_volume(self):
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
+        source_volume.upload_to_image = mock.Mock()
+
         result = self.cmd.take_action(parsed_args)
 
-        # VolumeManager.upload_to_image(volume, force, image_name,
-        #     container_format, disk_format)
-        volumes_mock.upload_to_image.assert_called_with(
-            'vol1',
-            False,
+        self.volume_sdk_client.find_volume.assert_called_once_with(
+            'volly', ignore_missing=False
+        )
+        source_volume.upload_to_image.assert_called_once_with(
+            self.volume_sdk_client,
             self._image.name,
-            '',
-            '',
+            force=False,
+            container_format=self._image.container_format,
+            disk_format=self._image.disk_format,
         )
-        # ImageManager.update(image_id, remove_props=, **)
         self.image_client.update_image.assert_called_with(
             self._image.id,
             name='updated_image',