image: Replace remaining use of keystoneclient

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

Author: stephenfin

openstackclient/image/v2/image.py

@@ -264,13 +264,13 @@ def take_action(
         self, parsed_args: argparse.Namespace
     ) -> tuple[Sequence[str], Iterable[Any]]:
         image_client = self.app.client_manager.image
-        identity_client = self.app.client_manager.identity
+        identity_client = self.app.client_manager.sdk_connection.identity
 
-        project_id = identity_common.find_project(
+        project_id = identity_common.find_project_id_sdk(
             identity_client,
             parsed_args.project,
             parsed_args.project_domain,
-        ).id
+        )
 
         image = image_client.find_image(
             parsed_args.image,
@@ -449,8 +449,8 @@ def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
     def _take_action_image(
         self, parsed_args: argparse.Namespace
     ) -> dict[str, Any]:
-        identity_client = self.app.client_manager.identity
         image_client = self.app.client_manager.image
+        identity_client = self.app.client_manager.sdk_connection.identity
 
         # Build an attribute dict from the parsed args, only include
         # attributes that were actually set on the command line
@@ -491,11 +491,11 @@ def _take_action_image(
             kwargs['visibility'] = parsed_args.visibility
 
         if parsed_args.project:
-            kwargs['owner_id'] = identity_common.find_project(
+            kwargs['owner_id'] = identity_common.find_project_id_sdk(
                 identity_client,
                 parsed_args.project,
                 parsed_args.project_domain,
-            ).id
+            )
 
         if parsed_args.use_import:
             kwargs['use_import'] = True
@@ -879,8 +879,8 @@ def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
     def take_action(
         self, parsed_args: argparse.Namespace
     ) -> tuple[tuple[str, ...], Iterable[tuple[Any, ...]]]:
-        identity_client = self.app.client_manager.identity
         image_client = self.app.client_manager.image
+        identity_client = self.app.client_manager.sdk_connection.identity
 
         kwargs = {}
         if parsed_args.visibility is not None:
@@ -904,11 +904,11 @@ def take_action(
             kwargs['tag'] = parsed_args.tag
         project_id = None
         if parsed_args.project:
-            project_id = identity_common.find_project(
+            project_id = identity_common.find_project_id_sdk(
                 identity_client,
                 parsed_args.project,
                 parsed_args.project_domain,
-            ).id
+            )
             kwargs['owner'] = project_id
         if parsed_args.is_hidden:
             kwargs['is_hidden'] = parsed_args.is_hidden
@@ -1036,13 +1036,13 @@ def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
 
     def take_action(self, parsed_args: argparse.Namespace) -> None:
         image_client = self.app.client_manager.image
-        identity_client = self.app.client_manager.identity
+        identity_client = self.app.client_manager.sdk_connection.identity
 
-        project_id = identity_common.find_project(
+        project_id = identity_common.find_project_id_sdk(
             identity_client,
             parsed_args.project,
             parsed_args.project_domain,
-        ).id
+        )
 
         image = image_client.find_image(
             parsed_args.image,
@@ -1320,8 +1320,8 @@ def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
         return parser
 
     def take_action(self, parsed_args: argparse.Namespace) -> None:
-        identity_client = self.app.client_manager.identity
         image_client = self.app.client_manager.image
+        identity_client = self.app.client_manager.sdk_connection.identity
 
         for deadopt in self.deadopts:
             if getattr(parsed_args, f"dead_{deadopt.replace('-', '_')}", None):
@@ -1339,11 +1339,11 @@ def take_action(self, parsed_args: argparse.Namespace) -> None:
         )
         project_id = None
         if parsed_args.project:
-            project_id = identity_common.find_project(
+            project_id = identity_common.find_project_id_sdk(
                 identity_client,
                 parsed_args.project,
                 parsed_args.project_domain,
-            ).id
+            )
 
         # handle activation status changes
 

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

@@ -19,31 +19,18 @@
 
 from openstack.block_storage.v2 import volume as _volume
 from openstack import exceptions as sdk_exceptions
+from openstack.identity.v3 import domain as _domain
+from openstack.identity.v3 import project as _project
 from openstack.test import fakes as sdk_fakes
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
 
 from openstackclient.image.v2 import image as _image
-from openstackclient.tests.unit.identity.v3 import fakes as identity_fakes
 from openstackclient.tests.unit.image.v2 import fakes as image_fakes
 from openstackclient.tests.unit.volume.v3 import fakes as volume_fakes
 
 
-class TestImage(image_fakes.TestImagev2, volume_fakes.TestVolume):
-    def setUp(self):
-        super().setUp()
-
-        # Get shortcut to the Mocks in identity client
-        self.project_mock = self.identity_client.projects
-        self.project_mock.reset_mock()
-        self.domain_mock = self.identity_client.domains
-        self.domain_mock.reset_mock()
-
-
-class TestImageCreate(TestImage):
-    project = identity_fakes.FakeProject.create_one_project()
-    domain = identity_fakes.FakeDomain.create_one_domain()
-
+class TestImageCreate(image_fakes.TestImagev2, volume_fakes.TestVolume):
     def setUp(self):
         super().setUp()
 
@@ -52,11 +39,12 @@ def setUp(self):
         self.image_client.update_image.return_value = self.new_image
         self.image_client.get_image.return_value = self.new_image
 
-        self.project_mock.get.return_value = self.project
+        self.project = sdk_fakes.generate_fake_resource(_project.Project)
+        self.identity_sdk_client.find_project.return_value = self.project
 
-        self.domain_mock.get.return_value = self.domain
+        self.domain = sdk_fakes.generate_fake_resource(_domain.Domain)
 
-        (self.expected_columns, self.expected_data) = zip(
+        self.expected_columns, self.expected_data = zip(
             *sorted(_image._format_image(self.new_image).items())
         )
 
@@ -149,8 +137,9 @@ def test_image_reserve_options(self, raw_input):
         self.assertCountEqual(self.expected_data, data)
 
     def test_image_create_with_unexist_project(self):
-        self.project_mock.get.side_effect = exceptions.NotFound(None)
-        self.project_mock.find.side_effect = exceptions.NotFound(None)
+        self.identity_sdk_client.find_project.side_effect = (
+            sdk_exceptions.ResourceNotFound()
+        )
 
         arglist = [
             '--container-format',
@@ -410,9 +399,9 @@ def test_image_create_from_volume_v31(self, mock_get_data_f):
         )
 
 
-class TestAddProjectToImage(TestImage):
-    project = identity_fakes.FakeProject.create_one_project()
-    domain = identity_fakes.FakeDomain.create_one_domain()
+class TestAddProjectToImage(image_fakes.TestImagev2):
+    project = sdk_fakes.generate_fake_resource(_project.Project)
+    domain = sdk_fakes.generate_fake_resource(_domain.Domain)
     _image = image_fakes.create_one_image()
     new_member = image_fakes.create_one_image_member(
         attrs={'image_id': _image.id, 'member_id': project.id}
@@ -444,8 +433,7 @@ def setUp(self):
 
         # Update the image_id in the MEMBER dict
         self.image_client.add_member.return_value = self.new_member
-        self.project_mock.get.return_value = self.project
-        self.domain_mock.get.return_value = self.domain
+        self.identity_sdk_client.find_project.return_value = self.project
         # Get the command object to test
         self.cmd = _image.AddProjectToImage(self.app, None)
 
@@ -497,7 +485,7 @@ def test_add_project_to_image_with_option(self):
         self.assertEqual(self.datalist, data)
 
 
-class TestImageDelete(TestImage):
+class TestImageDelete(image_fakes.TestImagev2):
     def setUp(self):
         super().setUp()
 
@@ -617,7 +605,7 @@ def test_image_delete_multi_images_exception(self):
         self.image_client.delete_image.assert_has_calls(calls)
 
 
-class TestImageList(TestImage):
+class TestImageList(image_fakes.TestImagev2):
     _image = image_fakes.create_one_image()
 
     columns = (
@@ -1008,8 +996,8 @@ def test_image_list_tag_option(self):
         self.image_client.images.assert_called_with(tag=['abc', 'cba'])
 
 
-class TestListImageProjects(TestImage):
-    project = identity_fakes.FakeProject.create_one_project()
+class TestListImageProjects(image_fakes.TestImagev2):
+    project = sdk_fakes.generate_fake_resource(_project.Project)
     _image = image_fakes.create_one_image()
     member = image_fakes.create_one_image_member(
         attrs={'image_id': _image.id, 'member_id': project.id}
@@ -1046,9 +1034,9 @@ def test_image_member_list(self):
         self.assertEqual(self.datalist, list(data))
 
 
-class TestRemoveProjectImage(TestImage):
-    project = identity_fakes.FakeProject.create_one_project()
-    domain = identity_fakes.FakeDomain.create_one_domain()
+class TestRemoveProjectImage(image_fakes.TestImagev2):
+    project = sdk_fakes.generate_fake_resource(_project.Project)
+    domain = sdk_fakes.generate_fake_resource(_domain.Domain)
 
     def setUp(self):
         super().setUp()
@@ -1057,8 +1045,7 @@ def setUp(self):
         # This is the return value for utils.find_resource()
         self.image_client.find_image.return_value = self._image
 
-        self.project_mock.get.return_value = self.project
-        self.domain_mock.get.return_value = self.domain
+        self.identity_sdk_client.find_project.return_value = self.project
         self.image_client.remove_member.return_value = None
         # Get the command object to test
         self.cmd = _image.RemoveProjectImage(self.app, None)
@@ -1109,7 +1096,7 @@ def test_remove_project_image_with_options(self):
         self.assertIsNone(result)
 
 
-class TestShowProjectImage(TestImage):
+class TestShowProjectImage(image_fakes.TestImagev2):
     _image = image_fakes.create_one_image()
     new_member = image_fakes.create_one_image_member(
         attrs={'image_id': _image.id, 'member_id': 'member1'}
@@ -1169,17 +1156,15 @@ def test_show_project_image(self):
         self.assertEqual(self.datalist, data)
 
 
-class TestImageSet(TestImage):
-    project = identity_fakes.FakeProject.create_one_project()
-    domain = identity_fakes.FakeDomain.create_one_domain()
+class TestImageSet(image_fakes.TestImagev2):
+    project = sdk_fakes.generate_fake_resource(_project.Project)
+    domain = sdk_fakes.generate_fake_resource(_domain.Domain)
     _image = image_fakes.create_one_image({'tags': []})
 
     def setUp(self):
         super().setUp()
 
-        self.project_mock.get.return_value = self.project
-
-        self.domain_mock.get.return_value = self.domain
+        self.identity_sdk_client.find_project.return_value = self.project
 
         self.image_client.find_image.return_value = self._image
 
@@ -1453,8 +1438,9 @@ def test_image_set_options(self):
         self.assertIsNone(result)
 
     def test_image_set_with_unexist_project(self):
-        self.project_mock.get.side_effect = exceptions.NotFound(None)
-        self.project_mock.find.side_effect = exceptions.NotFound(None)
+        self.identity_sdk_client.find_project.side_effect = (
+            sdk_exceptions.ResourceNotFound()
+        )
 
         arglist = [
             '--project',
@@ -1823,7 +1809,7 @@ def test_image_set_unhidden(self):
         self.assertIsNone(result)
 
 
-class TestImageShow(TestImage):
+class TestImageShow(image_fakes.TestImagev2):
     new_image = image_fakes.create_one_image(attrs={'size': 1000})
 
     _data = image_fakes.create_one_image()
@@ -1891,7 +1877,7 @@ def test_image_show_human_readable(self):
         self.assertEqual(data[size_index], '1K')
 
 
-class TestImageUnset(TestImage):
+class TestImageUnset(image_fakes.TestImagev2):
     def setUp(self):
         super().setUp()
 
@@ -1994,7 +1980,7 @@ def test_image_unset_mixed_option(self):
         self.assertIsNone(result)
 
 
-class TestImageStage(TestImage):
+class TestImageStage(image_fakes.TestImagev2):
     image = image_fakes.create_one_image({})
 
     def setUp(self):
@@ -2048,7 +2034,7 @@ def test_stage_image__from_stdin(self, mock_get_data_from_stdin):
         )
 
 
-class TestImageImport(TestImage):
+class TestImageImport(image_fakes.TestImagev2):
     image = image_fakes.create_one_image(
         {
             'container_format': 'bare',
@@ -2325,7 +2311,7 @@ def test_import_image__glance_download(self):
         )
 
 
-class TestImageSave(TestImage):
+class TestImageSave(image_fakes.TestImagev2):
     image = image_fakes.create_one_image({})
 
     def setUp(self):
@@ -2375,7 +2361,7 @@ def test_save_data_with_chunk_size(self):
         )
 
 
-class TestImageGetData(TestImage):
+class TestImageGetData(image_fakes.TestImagev2):
     def test_get_data_from_stdin(self):
         fd = io.BytesIO(b"some initial binary data: \x00\x01")
 
@@ -2401,7 +2387,7 @@ def test_get_data_from_stdin__interactive(self):
             self.assertIsNone(test_fd)
 
 
-class TestStoresInfo(TestImage):
+class TestStoresInfo(image_fakes.TestImagev2):
     stores_info = image_fakes.create_one_stores_info()
 
     def setUp(self):