compute: Replace remaining use of keystoneclient

We also add a missing --project-domain options to the 'usage list'
command.

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

Author: stephenfin

openstackclient/compute/v2/flavor.py

@@ -154,7 +154,9 @@ def take_action(
         self, parsed_args: argparse.Namespace
     ) -> tuple[Sequence[str], Iterable[Any]]:
         compute_client = self.app.client_manager.compute
-        identity_client = self.app.client_manager.identity
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
 
         if parsed_args.project and parsed_args.public:
             msg = _("--project is only allowed with --private")
@@ -208,11 +210,11 @@ def take_action(
 
         if parsed_args.project:
             try:
-                project_id = identity_common.find_project(
+                project_id = identity_common.find_project_id_sdk(
                     identity_client,
                     parsed_args.project,
                     parsed_args.project_domain,
-                ).id
+                )
                 compute_client.flavor_add_tenant_access(flavor.id, project_id)
             except Exception as e:
                 msg = _(
@@ -450,7 +452,9 @@ def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
 
     def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
-        identity_client = self.app.client_manager.identity
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
 
         try:
             flavor = compute_client.find_flavor(
@@ -496,15 +500,13 @@ def take_action(self, parsed_args: argparse.Namespace) -> None:
                 if flavor.is_public:
                     msg = _("Cannot set access for a public flavor")
                     raise exceptions.CommandError(msg)
-                else:
-                    project_id = identity_common.find_project(
-                        identity_client,
-                        parsed_args.project,
-                        parsed_args.project_domain,
-                    ).id
-                    compute_client.flavor_add_tenant_access(
-                        flavor.id, project_id
-                    )
+
+                project_id = identity_common.find_project_id_sdk(
+                    identity_client,
+                    parsed_args.project,
+                    parsed_args.project_domain,
+                )
+                compute_client.flavor_add_tenant_access(flavor.id, project_id)
             except Exception as e:
                 LOG.error(_("Failed to set flavor access to project: %s"), e)
                 result += 1
@@ -599,7 +601,9 @@ def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
 
     def take_action(self, parsed_args: argparse.Namespace) -> None:
         compute_client = self.app.client_manager.compute
-        identity_client = self.app.client_manager.identity
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
 
         try:
             flavor = compute_client.find_flavor(
@@ -625,11 +629,11 @@ def take_action(self, parsed_args: argparse.Namespace) -> None:
                     msg = _("Cannot remove access for a public flavor")
                     raise exceptions.CommandError(msg)
 
-                project_id = identity_common.find_project(
+                project_id = identity_common.find_project_id_sdk(
                     identity_client,
                     parsed_args.project,
                     parsed_args.project_domain,
-                ).id
+                )
                 compute_client.flavor_remove_tenant_access(
                     flavor.id, project_id
                 )

openstackclient/compute/v2/keypair.py

@@ -131,7 +131,9 @@ def take_action(
         self, parsed_args: argparse.Namespace
     ) -> tuple[Sequence[str], Iterable[Any]]:
         compute_client = self.app.client_manager.compute
-        identity_client = self.app.client_manager.identity
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
 
         kwargs = {'name': parsed_args.name}
 
@@ -192,11 +194,11 @@ def take_action(
                 )
                 raise exceptions.CommandError(msg)
 
-            kwargs['user_id'] = identity_common.find_user(
+            kwargs['user_id'] = identity_common.find_user_id_sdk(
                 identity_client,
                 parsed_args.user,
                 parsed_args.user_domain,
-            ).id
+            )
 
         keypair = compute_client.create_keypair(**kwargs)
 
@@ -239,7 +241,9 @@ def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
 
     def take_action(self, parsed_args: argparse.Namespace) -> Any:
         compute_client = self.app.client_manager.compute
-        identity_client = self.app.client_manager.identity
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
 
         kwargs = {}
         result = 0
@@ -252,11 +256,11 @@ def take_action(self, parsed_args: argparse.Namespace) -> Any:
                 )
                 raise exceptions.CommandError(msg)
 
-            kwargs['user_id'] = identity_common.find_user(
+            kwargs['user_id'] = identity_common.find_user_id_sdk(
                 identity_client,
                 parsed_args.user,
                 parsed_args.user_domain,
-            ).id
+            )
 
         for n in parsed_args.name:
             try:
@@ -311,8 +315,7 @@ def take_action(
         self, parsed_args: argparse.Namespace
     ) -> tuple[Sequence[str], Iterable[Any]]:
         compute_client = self.app.client_manager.compute
-        identity_client = self.app.client_manager.identity
-        identity_sdk_client = sdk_utils.ensure_service_version(
+        identity_client = sdk_utils.ensure_service_version(
             self.app.client_manager.sdk_connection.identity, '3'
         )
 
@@ -358,12 +361,12 @@ def take_action(
             # NOTE(stephenfin): This is done client side because nova doesn't
             # currently support doing so server-side. If this is slow, we can
             # think about spinning up a threadpool or similar.
-            project = identity_common.find_project(
+            project = identity_common.find_project_id_sdk(
                 identity_client,
                 parsed_args.project,
                 parsed_args.project_domain,
-            ).id
-            assignments = identity_sdk_client.role_assignments(
+            )
+            assignments = identity_client.role_assignments(
                 scope_project_id=project
             )
             user_ids = set()
@@ -383,12 +386,12 @@ def take_action(
                 )
                 raise exceptions.CommandError(msg)
 
-            user = identity_common.find_user(
+            user_id = identity_common.find_user_id_sdk(
                 identity_client,
                 parsed_args.user,
                 parsed_args.user_domain,
             )
-            kwargs['user_id'] = user.id
+            kwargs['user_id'] = user_id
 
             data = list(compute_client.keypairs(**kwargs))
         else:
@@ -436,7 +439,9 @@ def take_action(
         self, parsed_args: argparse.Namespace
     ) -> tuple[Sequence[str], Iterable[Any]]:
         compute_client = self.app.client_manager.compute
-        identity_client = self.app.client_manager.identity
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
 
         kwargs = {}
 
@@ -448,11 +453,11 @@ def take_action(
                 )
                 raise exceptions.CommandError(msg)
 
-            kwargs['user_id'] = identity_common.find_user(
+            kwargs['user_id'] = identity_common.find_user_id_sdk(
                 identity_client,
                 parsed_args.user,
                 parsed_args.user_domain,
-            ).id
+            )
 
         keypair = compute_client.find_keypair(
             parsed_args.name, **kwargs, ignore_missing=False

openstackclient/compute/v2/server.py

@@ -2724,25 +2724,27 @@ def take_action(
         self, parsed_args: argparse.Namespace
     ) -> tuple[tuple[str, ...], Iterable[tuple[Any, ...]]]:
         compute_client = self.app.client_manager.compute
-        identity_client = self.app.client_manager.identity
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
         image_client = self.app.client_manager.image
 
         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
+            )
             parsed_args.all_projects = True
 
         user_id = None
         if parsed_args.user:
-            user_id = identity_common.find_user(
+            user_id = identity_common.find_user_id_sdk(
                 identity_client,
                 parsed_args.user,
                 parsed_args.user_domain,
-            ).id
+            )
 
         # Nova only supports list servers searching by flavor ID. So if a
         # flavor name is given, map it to ID.

openstackclient/compute/v2/server_migration.py

@@ -165,7 +165,9 @@ def take_action(
         self, parsed_args: argparse.Namespace
     ) -> tuple[list[str], Iterable[tuple[Any, ...]]]:
         compute_client = self.app.client_manager.compute
-        identity_client = self.app.client_manager.identity
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
 
         search_opts = {}
 
@@ -236,11 +238,11 @@ def take_action(
                 )
                 raise exceptions.CommandError(msg)
 
-            search_opts['project_id'] = identity_common.find_project(
+            search_opts['project_id'] = identity_common.find_project_id_sdk(
                 identity_client,
                 parsed_args.project,
                 parsed_args.project_domain,
-            ).id
+            )
 
         if parsed_args.user:
             if not sdk_utils.supports_microversion(compute_client, "2.80"):
@@ -250,11 +252,11 @@ def take_action(
                 )
                 raise exceptions.CommandError(msg)
 
-            search_opts['user_id'] = identity_common.find_user(
+            search_opts['user_id'] = identity_common.find_user_id_sdk(
                 identity_client,
                 parsed_args.user,
                 parsed_args.user_domain,
-            ).id
+            )
 
         migrations = list(compute_client.migrations(**search_opts))
 

openstackclient/compute/v2/usage.py

@@ -19,13 +19,15 @@
 from collections.abc import Collection, Iterable, Sequence
 import datetime
 import functools
-from typing import Any, cast
+from typing import Any
 
 from cliff import columns as cliff_columns
+from openstack import utils as sdk_utils
 from osc_lib import utils
 
 from openstackclient import command
 from openstackclient.i18n import _
+from openstackclient.identity import common as identity_common
 
 
 # TODO(stephenfin): This exists in a couple of places and should be moved to a
@@ -41,7 +43,9 @@ class ProjectColumn(cliff_columns.FormattableColumn[str]):
     project_cache)`` to use this.
     """
 
-    def __init__(self, value: str, project_cache: Any = None) -> None:
+    def __init__(
+        self, value: str, project_cache: dict[str, str] | None = None
+    ) -> None:
         super().__init__(value)
         self.project_cache = project_cache or {}
 
@@ -50,8 +54,8 @@ def human_readable(self) -> str:
         if not project:
             return ''
 
-        if project in self.project_cache.keys():
-            return cast(str, self.project_cache[project].name)
+        if project in self.project_cache:
+            return self.project_cache[project]
 
         return project
 
@@ -66,7 +70,7 @@ def human_readable(self) -> str:
         return f"{self._value:.2f}"
 
 
-def _formatters(project_cache: Any) -> dict[str, Any]:
+def _formatters(project_cache: dict[str, str] | None) -> dict[str, Any]:
     return {
         'project_id': functools.partial(
             ProjectColumn, project_cache=project_cache
@@ -135,12 +139,16 @@ def take_action(
         def _format_project(project: str) -> str:
             if not project:
                 return ""
-            if project in project_cache.keys():
-                return cast(str, project_cache[project].name)
+            if project in project_cache:
+                return project_cache[project]
             else:
                 return project
 
         compute_client = self.app.client_manager.compute
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
+
         columns = (
             "project_id",
             "server_usages",
@@ -182,8 +190,8 @@ def _format_project(project: str) -> str:
         # Cache the project list
         project_cache = {}
         try:
-            for p in self.app.client_manager.identity.projects.list():
-                project_cache[p.id] = p
+            for p in identity_client.projects():
+                project_cache[p.id] = p.name
         except Exception:  # noqa: S110
             # Just forget it if there's any trouble
             pass
@@ -221,6 +229,7 @@ def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
             default=None,
             help=_("Name or ID of project to show usage for"),
         )
+        identity_common.add_project_domain_option_to_parser(parser)
         parser.add_argument(
             "--start",
             metavar="<start>",
@@ -240,8 +249,11 @@ def get_parser(self, prog_name: str) -> argparse.ArgumentParser:
     def take_action(
         self, parsed_args: argparse.Namespace
     ) -> tuple[Sequence[str], Iterable[Any]]:
-        identity_client = self.app.client_manager.identity
         compute_client = self.app.client_manager.compute
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
+
         date_cli_format = "%Y-%m-%d"
         now = datetime.datetime.now(datetime.UTC).replace(tzinfo=None)
 
@@ -258,13 +270,16 @@ def take_action(
             end = now + datetime.timedelta(days=1)
 
         if parsed_args.project:
-            project = utils.find_resource(
-                identity_client.projects,
+            project = identity_common.find_project_id_sdk(
+                identity_client,
                 parsed_args.project,
-            ).id
+                parsed_args.project_domain,
+            )
         else:
             # Get the project from the current auth
-            project = self.app.client_manager.auth_ref.project_id
+            _project_id = self.app.client_manager.auth_ref.project_id
+            assert _project_id is not None  # narrow type
+            project = _project_id
 
         usage = compute_client.get_usage(
             project=project,