python-openstackclient 10.0.0__py3-none-any.whl → 10.1.0__py3-none-any.whl

openstackclient/identity/v3/endpoint.py

@@ -20,6 +20,8 @@ from collections.abc import Iterable, Sequence
 import logging
 from typing import Any
 
+from openstack.identity.v3 import endpoint as _endpoint
+from openstack.identity.v3 import service as _service
 from openstack import utils as sdk_utils
 from osc_lib import exceptions
 from osc_lib import utils
@@ -28,12 +30,11 @@ from openstackclient import command
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
-
 LOG = logging.getLogger(__name__)
 
 
 def _format_endpoint(
-    endpoint: Any, service: Any
+    endpoint: _endpoint.Endpoint, service: _service.Service
 ) -> tuple[tuple[str, ...], Any]:
     columns = (
         'is_enabled',
@@ -269,54 +270,65 @@ class ListEndpoint(command.Lister):
                 domain_id=project_domain_id,
             )
 
+        # FIXME(stephenfin): This belongs under the project list command
         if endpoint:
             column_headers: tuple[str, ...] = ('ID', 'Name')
             columns: tuple[str, ...] = ('id', 'name')
-            data = identity_client.endpoint_projects(endpoint=endpoint.id)
-        else:
-            column_headers = (
-                'ID',
-                'Region',
-                'Service Name',
-                'Service Type',
-                'Enabled',
-                'Interface',
-                'URL',
+            projects = identity_client.endpoint_projects(endpoint=endpoint.id)
+            return (
+                column_headers,
+                (
+                    utils.get_item_properties(
+                        s,
+                        columns,
+                        formatters={},
+                    )
+                    for s in projects
+                ),
             )
-            columns = (
-                'id',
-                'region_id',
-                'service_name',
-                'service_type',
-                'is_enabled',
-                'interface',
-                'url',
+
+        column_headers = (
+            'ID',
+            'Region',
+            'Service Name',
+            'Service Type',
+            'Enabled',
+            'Interface',
+            'URL',
+        )
+        columns = (
+            'id',
+            'region_id',
+            'service_name',
+            'service_type',
+            'is_enabled',
+            'interface',
+            'url',
+        )
+        kwargs = {}
+        if parsed_args.service:
+            service = common.find_service_sdk(
+                identity_client, parsed_args.service
             )
-            kwargs = {}
-            if parsed_args.service:
-                service = common.find_service_sdk(
-                    identity_client, parsed_args.service
-                )
-                kwargs['service_id'] = service.id
-            if parsed_args.interface:
-                kwargs['interface'] = parsed_args.interface
-            if parsed_args.region:
-                region = identity_client.get_region(parsed_args.region)
-                kwargs['region_id'] = region.id
-
-            if project_id:
-                data = list(
-                    identity_client.project_endpoints(project=project_id)
-                )
-            else:
-                data = list(identity_client.endpoints(**kwargs))
+            kwargs['service_id'] = service.id
+        if parsed_args.interface:
+            kwargs['interface'] = parsed_args.interface
+        if parsed_args.region:
+            region = identity_client.get_region(parsed_args.region)
+            kwargs['region_id'] = region.id
 
-            for ep in data:
-                service = identity_client.find_service(
-                    ep.service_id, ignore_missing=False
-                )
-                ep.service_name = getattr(service, 'name', '')
-                ep.service_type = service.type
+        data: list[_endpoint.Endpoint]
+        if project_id:
+            data = list(identity_client.project_endpoints(project=project_id))
+        else:
+            data = list(identity_client.endpoints(**kwargs))
+
+        for ep in data:
+            service = identity_client.find_service(
+                ep.service_id, ignore_missing=False
+            )
+            setattr(ep, 'service_name', getattr(service, 'name', ''))
+            setattr(ep, 'service_type', service.type)
 
         return (
             column_headers,
@@ -421,7 +433,7 @@ class SetEndpoint(command.Command):
             parsed_args.endpoint, ignore_missing=False
         )
 
-        kwargs = {}
+        kwargs: dict[str, object] = {}
 
         if parsed_args.service:
             service = common.find_service_sdk(

openstackclient/identity/v3/federation_protocol.py

@@ -19,6 +19,7 @@ from collections.abc import Iterable, Sequence
 import logging
 from typing import Any
 
+from openstack.identity.v3 import federation_protocol as _federation_protocol
 from openstack import utils as sdk_utils
 from osc_lib import exceptions
 from osc_lib import utils
@@ -26,11 +27,12 @@ from osc_lib import utils
 from openstackclient import command
 from openstackclient.i18n import _
 
-
 LOG = logging.getLogger(__name__)
 
 
-def _format_protocol(protocol: Any) -> tuple[tuple[str, ...], Any]:
+def _format_protocol(
+    protocol: _federation_protocol.FederationProtocol,
+) -> tuple[tuple[str, ...], tuple[Any, ...]]:
     columns = ('name', 'idp_id', 'mapping_id')
     column_headers = ('id', 'identity_provider', 'mapping')
     return (
@@ -79,7 +81,7 @@ class CreateProtocol(command.ShowOne):
 
         protocol = identity_client.create_federation_protocol(
             name=parsed_args.federation_protocol,
-            idp_id=parsed_args.identity_provider,
+            idp=parsed_args.identity_provider,
             mapping_id=parsed_args.mapping,
         )
 
@@ -118,7 +120,7 @@ class DeleteProtocol(command.Command):
         for i in parsed_args.federation_protocol:
             try:
                 identity_client.delete_federation_protocol(
-                    idp_id=parsed_args.identity_provider,
+                    idp=parsed_args.identity_provider,
                     protocol=i,
                     ignore_missing=False,
                 )
@@ -246,7 +248,7 @@ class ShowProtocol(command.ShowOne):
         )
 
         protocol = identity_client.get_federation_protocol(
-            idp_id=parsed_args.identity_provider,
+            idp=parsed_args.identity_provider,
             protocol=parsed_args.federation_protocol,
         )
         return _format_protocol(protocol)

openstackclient/identity/v3/group.py

@@ -21,6 +21,7 @@ import logging
 from typing import Any
 
 from openstack import exceptions as sdk_exc
+from openstack.identity.v3 import group as _group
 from openstack import utils as sdk_utils
 from osc_lib import exceptions
 from osc_lib import utils
@@ -29,11 +30,12 @@ from openstackclient import command
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
-
 LOG = logging.getLogger(__name__)
 
 
-def _format_group(group: Any) -> tuple[tuple[str, ...], Any]:
+def _format_group(
+    group: _group.Group,
+) -> tuple[tuple[str, ...], Iterable[Any]]:
     columns = (
         'description',
         'domain_id',
@@ -325,8 +327,12 @@ class ListGroup(command.Lister):
                 identity_client, parsed_args.domain
             )
 
-        data = []
-        if parsed_args.user:
+        if not parsed_args.user:
+            if domain:
+                data = list(identity_client.groups(domain_id=domain))
+            else:
+                data = list(identity_client.groups())
+        else:
             user = common.find_user_id_sdk(
                 identity_client,
                 parsed_args.user,
@@ -335,12 +341,7 @@ class ListGroup(command.Lister):
             # NOTE(0weng): The API doesn't actually support filtering
             # additionally by domain_id, so this doesn't really do
             # anything.
-            data = identity_client.user_groups(user)
-        else:
-            if domain:
-                data = identity_client.groups(domain_id=domain)
-            else:
-                data = identity_client.groups()
+            data = list(identity_client.user_groups(user))
 
         # List groups
         columns: tuple[str, ...] = ('ID', 'Name')

openstackclient/identity/v3/identity_provider.py

@@ -18,6 +18,7 @@ from collections.abc import Iterable, Sequence
 import logging
 from typing import Any
 
+from openstack.identity.v3 import identity_provider as _identity_provider
 from openstack import utils as sdk_utils
 from osc_lib.cli import format_columns
 from osc_lib import exceptions
@@ -31,7 +32,9 @@ from openstackclient.identity import common
 LOG = logging.getLogger(__name__)
 
 
-def _format_identity_provider(idp):
+def _format_identity_provider(
+    idp: _identity_provider.IdentityProvider,
+) -> tuple[tuple[str, ...], tuple[Any, ...]]:
     columns = (
         'authorization_ttl',
         'description',

openstackclient/identity/v3/limit.py

@@ -18,6 +18,7 @@ from collections.abc import Iterable, Sequence
 import logging
 from typing import Any
 
+from openstack.identity.v3 import limit as _limit
 from openstack import utils as sdk_utils
 from osc_lib import exceptions
 from osc_lib import utils
@@ -29,7 +30,9 @@ from openstackclient.identity import common as common_utils
 LOG = logging.getLogger(__name__)
 
 
-def _format_limit(limit: Any) -> tuple[tuple[str, ...], Any]:
+def _format_limit(
+    limit: _limit.Limit,
+) -> tuple[tuple[str, ...], Iterable[Any]]:
     columns = (
         "description",
         "id",
@@ -164,7 +167,7 @@ class ListLimit(command.Lister):
             self.app.client_manager.sdk_connection.identity, '3'
         )
 
-        kwargs = {}
+        kwargs: dict[str, object] = {}
         if parsed_args.service:
             kwargs["service_id"] = common_utils.find_service_sdk(
                 identity_client, parsed_args.service

openstackclient/identity/v3/mapping.py

@@ -21,6 +21,8 @@ import json
 import logging
 from typing import Any
 
+from openstack.identity.v3 import mapping as _mapping
+from openstack import utils as sdk_utils
 from osc_lib import exceptions
 from osc_lib import utils
 
@@ -31,6 +33,17 @@ from openstackclient.i18n import _
 LOG = logging.getLogger(__name__)
 
 
+def _format_mapping(
+    mapping: _mapping.Mapping,
+) -> tuple[tuple[str, ...], tuple[Any, ...]]:
+    columns = ('id', 'rules', 'schema_version')
+    column_headers = ('id', 'rules', 'schema_version')
+    return (
+        column_headers,
+        utils.get_item_properties(mapping, columns),
+    )
+
+
 class _RulesReader:
     _description = _("Helper class capable of reading rules from files")
 
@@ -124,18 +137,18 @@ class CreateMapping(command.ShowOne, _RulesReader):
     def take_action(
         self, parsed_args: argparse.Namespace
     ) -> tuple[Sequence[str], Iterable[Any]]:
-        identity_client = self.app.client_manager.identity
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
 
         rules = self._read_rules(parsed_args.rules)
-        mapping = identity_client.federation.mappings.create(
-            mapping_id=parsed_args.mapping,
+        mapping = identity_client.create_mapping(
+            id=parsed_args.mapping,
             rules=rules,
             schema_version=parsed_args.schema_version,
         )
 
-        mapping._info.pop('links', None)
-        col_headers, col_data = zip(*sorted(mapping._info.items()))
-        return col_headers, col_data
+        return _format_mapping(mapping)
 
 
 class DeleteMapping(command.Command):
@@ -152,11 +165,13 @@ class DeleteMapping(command.Command):
         return parser
 
     def take_action(self, parsed_args: argparse.Namespace) -> None:
-        identity_client = self.app.client_manager.identity
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
         result = 0
         for i in parsed_args.mapping:
             try:
-                identity_client.federation.mappings.delete(i)
+                identity_client.delete_mapping(i, ignore_missing=False)
             except Exception as e:
                 result += 1
                 LOG.error(
@@ -185,8 +200,10 @@ class ListMapping(command.Lister):
         # NOTE(marek-denis): Since rules can be long and tedious I have decided
         # to only list ids of the mappings. If somebody wants to check the
         # rules, (s)he should show specific ones.
-        identity_client = self.app.client_manager.identity
-        data = identity_client.federation.mappings.list()
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
+        data = identity_client.mappings()
         columns = ('ID', 'schema_version')
         items = [utils.get_item_properties(s, columns) for s in data]
         return (columns, items)
@@ -212,18 +229,18 @@ class SetMapping(command.Command, _RulesReader):
         return parser
 
     def take_action(self, parsed_args: argparse.Namespace) -> None:
-        identity_client = self.app.client_manager.identity
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
 
         rules = self._read_rules(parsed_args.rules)
 
-        mapping = identity_client.federation.mappings.update(
+        identity_client.update_mapping(
             mapping=parsed_args.mapping,
             rules=rules,
             schema_version=parsed_args.schema_version,
         )
 
-        mapping._info.pop('links', None)
-
 
 class ShowMapping(command.ShowOne):
     _description = _("Display mapping details")
@@ -240,10 +257,10 @@ class ShowMapping(command.ShowOne):
     def take_action(
         self, parsed_args: argparse.Namespace
     ) -> tuple[Sequence[str], Iterable[Any]]:
-        identity_client = self.app.client_manager.identity
+        identity_client = sdk_utils.ensure_service_version(
+            self.app.client_manager.sdk_connection.identity, '3'
+        )
 
-        mapping = identity_client.federation.mappings.get(parsed_args.mapping)
+        mapping = identity_client.get_mapping(parsed_args.mapping)
 
-        mapping._info.pop('links', None)
-        col_headers, col_data = zip(*sorted(mapping._info.items()))
-        return col_headers, col_data
+        return _format_mapping(mapping)

openstackclient/identity/v3/project.py

@@ -21,12 +21,14 @@ import logging
 from typing import Any
 
 from openstack import exceptions as sdk_exc
+from openstack.identity.v3 import project as _project
 from openstack import utils as sdk_utils
 from osc_lib.cli import parseractions
 from osc_lib import exceptions
 from osc_lib import utils
 
 from openstackclient import command
+from openstackclient.common import pagination
 from openstackclient.i18n import _
 from openstackclient.identity import common
 from openstackclient.identity.v3 import tag
@@ -34,10 +36,12 @@ from openstackclient.identity.v3 import tag
 LOG = logging.getLogger(__name__)
 
 
-def _format_project(project: Any) -> tuple[tuple[str, ...], Any]:
+def _format_project(
+    project: _project.Project,
+) -> tuple[tuple[str, ...], tuple[Any, ...]]:
     # NOTE(0weng): Projects allow unknown attributes in the body, so extract
     # the column names separately.
-    (column_headers, columns) = utils.get_osc_show_columns_for_sdk_resource(
+    column_headers, columns = utils.get_osc_show_columns_for_sdk_resource(
         project,
         {'is_enabled': 'enabled'},
         ['links', 'location', 'parents_as_ids', 'subtree_as_ids'],
@@ -297,6 +301,7 @@ class ListProject(command.Lister):
             help=_('List only disabled projects'),
         )
         tag.add_tag_filtering_option_to_parser(parser, _('projects'))
+        pagination.add_marker_pagination_option_to_parser(parser)
         return parser
 
     def take_action(
@@ -348,6 +353,13 @@ class ListProject(command.Lister):
         if parsed_args.is_enabled is not None:
             kwargs['is_enabled'] = parsed_args.is_enabled
 
+        if parsed_args.limit is not None:
+            kwargs['limit'] = parsed_args.limit
+        if parsed_args.max_items is not None:
+            kwargs['max_items'] = parsed_args.max_items
+        if parsed_args.marker is not None:
+            kwargs['marker'] = parsed_args.marker
+
         tag.get_tag_filtering_args(parsed_args, kwargs)
 
         if parsed_args.my_projects:
@@ -355,9 +367,7 @@ class ListProject(command.Lister):
             kwargs = {}
             user = self.app.client_manager.auth_ref.user_id
 
-        if user:
-            data = list(identity_client.user_projects(user, **kwargs))
-        else:
+        if not user:
             try:
                 data = list(identity_client.projects(**kwargs))
             except sdk_exc.ForbiddenException:
@@ -365,9 +375,12 @@ class ListProject(command.Lister):
                 # wanting their own project list.
                 if not kwargs:
                     user = self.app.client_manager.auth_ref.user_id
+                    assert user is not None, 'this should not happen'
                     data = list(identity_client.user_projects(user))
                 else:
                     raise
+        else:
+            data = list(identity_client.user_projects(user, **kwargs))
 
         if parsed_args.sort:
             data = list(utils.sort_items(data, parsed_args.sort))

openstackclient/identity/v3/region.py

@@ -18,6 +18,7 @@ from collections.abc import Iterable, Sequence
 import logging
 from typing import Any
 
+from openstack.identity.v3 import region as _region
 from openstack import utils as sdk_utils
 from osc_lib import exceptions
 from osc_lib import utils
@@ -25,11 +26,12 @@ from osc_lib import utils
 from openstackclient import command
 from openstackclient.i18n import _
 
-
 LOG = logging.getLogger(__name__)
 
 
-def _format_region(region: Any) -> tuple[tuple[str, ...], Any]:
+def _format_region(
+    region: _region.Region,
+) -> tuple[tuple[str, ...], tuple[Any, ...]]:
     columns = ('id', 'description', 'parent_region_id')
     column_headers = ('region', 'description', 'parent_region')
     return (

openstackclient/identity/v3/registered_limit.py

@@ -18,6 +18,7 @@ from collections.abc import Iterable, Sequence
 import logging
 from typing import Any
 
+from openstack.identity.v3 import registered_limit as _registered_limit
 from openstack import utils as sdk_utils
 from osc_lib import exceptions
 from osc_lib import utils
@@ -30,8 +31,8 @@ LOG = logging.getLogger(__name__)
 
 
 def _format_registered_limit(
-    registered_limit: Any,
-) -> tuple[tuple[str, ...], Any]:
+    registered_limit: _registered_limit.RegisteredLimit,
+) -> tuple[tuple[str, ...], tuple[Any, ...]]:
     columns = (
         'default_limit',
         'description',

openstackclient/identity/v3/role.py

@@ -21,6 +21,7 @@ import logging
 from typing import Any
 
 from openstack import exceptions as sdk_exc
+from openstack.identity.v3 import role as _role
 from openstack import utils as sdk_utils
 from osc_lib import exceptions
 from osc_lib import utils
@@ -33,7 +34,7 @@ from openstackclient.identity import common
 LOG = logging.getLogger(__name__)
 
 
-def _format_role(role: Any) -> tuple[tuple[str, ...], Any]:
+def _format_role(role: _role.Role) -> tuple[tuple[str, ...], Iterable[Any]]:
     columns = (
         "id",
         "name",

openstackclient/identity/v3/role_assignment.py

@@ -17,6 +17,7 @@ import argparse
 from collections.abc import Iterable
 from typing import Any
 
+from openstack.identity.v3 import role_assignment as _role_assignment
 from openstack import utils as sdk_utils
 from osc_lib import exceptions
 
@@ -26,7 +27,7 @@ from openstackclient.identity import common
 
 
 def _format_role_assignment_(
-    assignment: Any, include_names: Any
+    assignment: _role_assignment.RoleAssignment, include_names: bool
 ) -> tuple[Any, ...]:
     def _get_names(attr: Any) -> str:
         return (
@@ -250,7 +251,7 @@ class ListRoleAssignment(command.Lister):
         data_parsed = []
         for assignment in data:
             data_parsed.append(
-                _format_role_assignment_(assignment, include_names)
+                _format_role_assignment_(assignment, bool(include_names))
             )
 
         return columns, tuple(data_parsed)

openstackclient/identity/v3/service.py

@@ -20,6 +20,7 @@ from collections.abc import Iterable, Sequence
 import logging
 from typing import Any
 
+from openstack.identity.v3 import service as _service
 from openstack import utils as sdk_utils
 from osc_lib import exceptions
 from osc_lib import utils
@@ -28,11 +29,12 @@ from openstackclient import command
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
-
 LOG = logging.getLogger(__name__)
 
 
-def _format_service(service: Any) -> tuple[tuple[str, ...], Any]:
+def _format_service(
+    service: _service.Service,
+) -> tuple[tuple[str, ...], tuple[Any, ...]]:
     columns = (
         'id',
         'name',

openstackclient/identity/v3/service_provider.py

@@ -18,6 +18,7 @@ from collections.abc import Iterable, Sequence
 import logging
 from typing import Any
 
+from openstack.identity.v3 import service_provider as _service_provider
 from openstack import utils as sdk_utils
 from osc_lib import exceptions
 from osc_lib import utils
@@ -25,11 +26,12 @@ from osc_lib import utils
 from openstackclient import command
 from openstackclient.i18n import _
 
-
 LOG = logging.getLogger(__name__)
 
 
-def _format_service_provider(sp: Any) -> tuple[tuple[str, ...], Any]:
+def _format_service_provider(
+    sp: _service_provider.ServiceProvider,
+) -> tuple[tuple[str, ...], tuple[Any, ...]]:
     column_headers = (
         'id',
         'enabled',

openstackclient/identity/v3/trust.py

@@ -21,6 +21,7 @@ import logging
 from typing import Any
 
 from openstack import exceptions as sdk_exceptions
+from openstack.identity.v3 import trust as _trust
 from openstack import utils as sdk_utils
 from osc_lib import exceptions
 from osc_lib import utils
@@ -29,11 +30,12 @@ from openstackclient import command
 from openstackclient.i18n import _
 from openstackclient.identity import common
 
-
 LOG = logging.getLogger(__name__)
 
 
-def _format_trust(trust: Any) -> tuple[tuple[str, ...], Any]:
+def _format_trust(
+    trust: _trust.Trust,
+) -> tuple[tuple[str, ...], tuple[Any, ...]]:
     columns = (
         'expires_at',
         'id',
@@ -371,9 +373,10 @@ class ListTrust(command.Lister):
                 except sdk_exceptions.ForbiddenException:
                     trustee = parsed_args.trustee
 
-            data = identity_client.trusts(
-                trustor_user_id=trustor,
-                trustee_user_id=trustee,
+            data = list(
+                identity_client.trusts(
+                    trustor_user_id=trustor, trustee_user_id=trustee
+                )
             )
 
         column_headers = (