python-openstackclient 7.4.0__py3-none-any.whl → 8.0.0__py3-none-any.whl

openstackclient/identity/v3/ec2creds.py

@@ -156,9 +156,10 @@ class DeleteEC2Creds(command.Command):
 
         if result > 0:
             total = len(parsed_args.access_key)
-            msg = _(
-                "%(result)s of %(total)s EC2 keys failed " "to delete."
-            ) % {'result': result, 'total': total}
+            msg = _("%(result)s of %(total)s EC2 keys failed to delete.") % {
+                'result': result,
+                'total': total,
+            }
             raise exceptions.CommandError(msg)
 
 

openstackclient/identity/v3/endpoint.py

@@ -28,11 +28,31 @@ from openstackclient.identity import common
 LOG = logging.getLogger(__name__)
 
 
-def get_service_name(service):
-    if hasattr(service, 'name'):
-        return service.name
-    else:
-        return ''
+def _format_endpoint(endpoint, service):
+    columns = (
+        'is_enabled',
+        'id',
+        'interface',
+        'region_id',
+        'region_id',
+        'service_id',
+        'url',
+    )
+    column_headers = (
+        'enabled',
+        'id',
+        'interface',
+        'region',
+        'region_id',
+        'service_id',
+        'url',
+        'service_name',
+        'service_type',
+    )
+
+    data = utils.get_item_properties(endpoint, columns)
+    data += (getattr(service, 'name', ''), service.type)
+    return column_headers, data
 
 
 class AddProjectToEndpoint(command.Command):
@@ -44,15 +64,13 @@ class AddProjectToEndpoint(command.Command):
             'endpoint',
             metavar='<endpoint>',
             help=_(
-                'Endpoint to associate with ' 'specified project (name or ID)'
+                'Endpoint to associate with specified project (name or ID)'
             ),
         )
         parser.add_argument(
             'project',
             metavar='<project>',
-            help=_(
-                'Project to associate with ' 'specified endpoint name or ID)'
-            ),
+            help=_('Project to associate with specified endpoint name or ID)'),
         )
         common.add_project_domain_option_to_parser(parser)
         return parser
@@ -114,23 +132,23 @@ class CreateEndpoint(command.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
-        service = common.find_service(identity_client, parsed_args.service)
-
-        endpoint = identity_client.endpoints.create(
-            service=service.id,
-            url=parsed_args.url,
-            interface=parsed_args.interface,
-            region=parsed_args.region,
-            enabled=parsed_args.enabled,
-        )
+        identity_client = self.app.client_manager.sdk_connection.identity
+        service = common.find_service_sdk(identity_client, parsed_args.service)
+
+        kwargs = {}
+
+        kwargs['service_id'] = service.id
+        kwargs['url'] = parsed_args.url
+        kwargs['interface'] = parsed_args.interface
+        kwargs['is_enabled'] = parsed_args.enabled
+
+        if parsed_args.region:
+            region = identity_client.get_region(parsed_args.region)
+            kwargs['region_id'] = region.id
 
-        info = {}
-        endpoint._info.pop('links')
-        info.update(endpoint._info)
-        info['service_name'] = get_service_name(service)
-        info['service_type'] = service.type
-        return zip(*sorted(info.items()))
+        endpoint = identity_client.create_endpoint(**kwargs)
+
+        return _format_endpoint(endpoint, service=service)
 
 
 class DeleteEndpoint(command.Command):
@@ -147,14 +165,12 @@ class DeleteEndpoint(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
+        identity_client = self.app.client_manager.sdk_connection.identity
         result = 0
         for i in parsed_args.endpoint:
             try:
-                endpoint_id = utils.find_resource(
-                    identity_client.endpoints, i
-                ).id
-                identity_client.endpoints.delete(endpoint_id)
+                endpoint_id = identity_client.find_endpoint(i).id
+                identity_client.delete_endpoint(endpoint_id)
             except Exception as e:
                 result += 1
                 LOG.error(
@@ -167,9 +183,10 @@ class DeleteEndpoint(command.Command):
 
         if result > 0:
             total = len(parsed_args.endpoint)
-            msg = _(
-                "%(result)s of %(total)s endpoints failed " "to delete."
-            ) % {'result': result, 'total': total}
+            msg = _("%(result)s of %(total)s endpoints failed to delete.") % {
+                'result': result,
+                'total': total,
+            }
             raise exceptions.CommandError(msg)
 
 
@@ -209,28 +226,24 @@ class ListEndpoint(command.Lister):
         return parser
 
     def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
+        identity_client = self.app.client_manager.sdk_connection.identity
 
         endpoint = None
         if parsed_args.endpoint:
-            endpoint = utils.find_resource(
-                identity_client.endpoints, parsed_args.endpoint
-            )
+            endpoint = identity_client.find_endpoint(parsed_args.endpoint)
         project = None
         if parsed_args.project:
-            project = common.find_project(
-                identity_client,
+            project = identity_client.find_project(
                 parsed_args.project,
                 parsed_args.project_domain,
             )
 
         if endpoint:
-            columns = ('ID', 'Name')
-            data = identity_client.endpoint_filter.list_projects_for_endpoint(
-                endpoint=endpoint.id
-            )
+            column_headers: tuple[str, ...] = ('ID', 'Name')
+            columns: tuple[str, ...] = ('id', 'name')
+            data = identity_client.endpoint_projects(endpoint=endpoint.id)
         else:
-            columns = (
+            column_headers = (
                 'ID',
                 'Region',
                 'Service Name',
@@ -239,37 +252,41 @@ class ListEndpoint(command.Lister):
                 'Interface',
                 'URL',
             )
+            columns = (
+                'id',
+                'region_id',
+                'service_name',
+                'service_type',
+                'is_enabled',
+                'interface',
+                'url',
+            )
             kwargs = {}
             if parsed_args.service:
-                service = common.find_service(
+                service = common.find_service_sdk(
                     identity_client, parsed_args.service
                 )
-                kwargs['service'] = service.id
+                kwargs['service_id'] = service.id
             if parsed_args.interface:
                 kwargs['interface'] = parsed_args.interface
             if parsed_args.region:
-                kwargs['region'] = parsed_args.region
+                region = identity_client.get_region(parsed_args.region)
+                kwargs['region_id'] = region.id
 
             if project:
-                data = (
-                    identity_client.endpoint_filter.list_endpoints_for_project(
-                        project=project.id
-                    )
+                data = list(
+                    identity_client.project_endpoints(project=project.id)
                 )
             else:
-                data = identity_client.endpoints.list(**kwargs)
-
-            service_list = identity_client.services.list()
+                data = list(identity_client.endpoints(**kwargs))
 
             for ep in data:
-                service = common.find_service_in_list(
-                    service_list, ep.service_id
-                )
-                ep.service_name = get_service_name(service)
+                service = identity_client.find_service(ep.service_id)
+                ep.service_name = getattr(service, 'name', '')
                 ep.service_type = service.type
 
         return (
-            columns,
+            column_headers,
             (
                 utils.get_item_properties(
                     s,
@@ -290,14 +307,14 @@ class RemoveProjectFromEndpoint(command.Command):
             'endpoint',
             metavar='<endpoint>',
             help=_(
-                'Endpoint to dissociate from ' 'specified project (name or ID)'
+                'Endpoint to dissociate from specified project (name or ID)'
             ),
         )
         parser.add_argument(
             'project',
             metavar='<project>',
             help=_(
-                'Project to dissociate from ' 'specified endpoint name or ID)'
+                'Project to dissociate from specified endpoint name or ID)'
             ),
         )
         common.add_project_domain_option_to_parser(parser)
@@ -364,28 +381,34 @@ class SetEndpoint(command.Command):
         return parser
 
     def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
-        endpoint = utils.find_resource(
-            identity_client.endpoints, parsed_args.endpoint
-        )
+        identity_client = self.app.client_manager.sdk_connection.identity
+        endpoint = identity_client.find_endpoint(parsed_args.endpoint)
+
+        kwargs = {}
 
-        service_id = None
         if parsed_args.service:
-            service = common.find_service(identity_client, parsed_args.service)
-            service_id = service.id
-        enabled = None
+            service = common.find_service_sdk(
+                identity_client, parsed_args.service
+            )
+            kwargs['service_id'] = service.id
+
         if parsed_args.enabled:
-            enabled = True
+            kwargs['is_enabled'] = True
         if parsed_args.disabled:
-            enabled = False
+            kwargs['is_enabled'] = False
+
+        if parsed_args.url:
+            kwargs['url'] = parsed_args.url
+
+        if parsed_args.interface:
+            kwargs['interface'] = parsed_args.interface
 
-        identity_client.endpoints.update(
+        if parsed_args.region:
+            kwargs['region_id'] = parsed_args.region
+
+        identity_client.update_endpoint(
             endpoint.id,
-            service=service_id,
-            url=parsed_args.url,
-            interface=parsed_args.interface,
-            region=parsed_args.region,
-            enabled=enabled,
+            **kwargs,
         )
 
 
@@ -405,16 +428,9 @@ class ShowEndpoint(command.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
-        endpoint = utils.find_resource(
-            identity_client.endpoints, parsed_args.endpoint
-        )
+        identity_client = self.app.client_manager.sdk_connection.identity
+        endpoint = identity_client.find_endpoint(parsed_args.endpoint)
 
-        service = common.find_service(identity_client, endpoint.service_id)
+        service = common.find_service_sdk(identity_client, endpoint.service_id)
 
-        info = {}
-        endpoint._info.pop('links')
-        info.update(endpoint._info)
-        info['service_name'] = get_service_name(service)
-        info['service_type'] = service.type
-        return zip(*sorted(info.items()))
+        return _format_endpoint(endpoint, service)

openstackclient/identity/v3/endpoint_group.py

@@ -168,7 +168,7 @@ class DeleteEndpointGroup(command.Command):
         if result > 0:
             total = len(parsed_args.endpointgroup)
             msg = _(
-                "%(result)s of %(total)s endpointgroups failed " "to delete."
+                "%(result)s of %(total)s endpointgroups failed to delete."
             ) % {'result': result, 'total': total}
             raise exceptions.CommandError(msg)
 

openstackclient/identity/v3/group.py

@@ -230,7 +230,7 @@ class DeleteGroup(command.Command):
 
         if errors > 0:
             total = len(parsed_args.groups)
-            msg = _("%(errors)s of %(total)s groups failed " "to delete.") % {
+            msg = _("%(errors)s of %(total)s groups failed to delete.") % {
                 'errors': errors,
                 'total': total,
             }
@@ -278,10 +278,9 @@ class ListGroup(command.Lister):
             user = None
 
         # List groups
+        columns: tuple[str, ...] = ('ID', 'Name')
         if parsed_args.long:
-            columns = ('ID', 'Name', 'Domain ID', 'Description')
-        else:
-            columns = ('ID', 'Name')
+            columns += ('Domain ID', 'Description')
         data = identity_client.groups.list(
             domain=domain,
             user=user,

openstackclient/identity/v3/identity_provider.py

@@ -174,8 +174,7 @@ class DeleteIdentityProvider(command.Command):
         if result > 0:
             total = len(parsed_args.identity_provider)
             msg = _(
-                "%(result)s of %(total)s identity providers failed"
-                " to delete."
+                "%(result)s of %(total)s identity providers failed to delete."
             ) % {'result': result, 'total': total}
             raise exceptions.CommandError(msg)
 

openstackclient/identity/v3/limit.py

@@ -77,8 +77,7 @@ class CreateLimit(command.ShowOne):
         )
         region = None
         if parsed_args.region:
-            val = getattr(parsed_args, 'region', None)
-            if 'None' not in val:
+            if 'None' not in parsed_args.region:
                 # NOTE (vishakha): Due to bug #1799153 and for any another
                 # related case where GET resource API does not support the
                 # filter by name, osc_lib.utils.find_resource() method cannot
@@ -149,11 +148,7 @@ class ListLimit(command.Lister):
             )
         region = None
         if parsed_args.region:
-            region = utils.find_resource(
-                identity_client.regions, parsed_args.region
-            )
-            val = getattr(parsed_args, 'region', None)
-            if 'None' not in val:
+            if 'None' not in parsed_args.region:
                 # NOTE (vishakha): Due to bug #1799153 and for any another
                 # related case where GET resource API does not support the
                 # filter by name, osc_lib.utils.find_resource() method cannot
@@ -281,13 +276,13 @@ class DeleteLimit(command.Command):
             except Exception as e:
                 errors += 1
                 LOG.error(
-                    _("Failed to delete limit with ID " "'%(id)s': %(e)s"),
+                    _("Failed to delete limit with ID '%(id)s': %(e)s"),
                     {'id': limit_id, 'e': e},
                 )
 
         if errors > 0:
             total = len(parsed_args.limit_id)
-            msg = _("%(errors)s of %(total)s limits failed to " "delete.") % {
+            msg = _("%(errors)s of %(total)s limits failed to delete.") % {
                 'errors': errors,
                 'total': total,
             }

openstackclient/identity/v3/mapping.py

@@ -161,9 +161,10 @@ class DeleteMapping(command.Command):
 
         if result > 0:
             total = len(parsed_args.mapping)
-            msg = _(
-                "%(result)s of %(total)s mappings failed " "to delete."
-            ) % {'result': result, 'total': total}
+            msg = _("%(result)s of %(total)s mappings failed to delete.") % {
+                'result': result,
+                'total': total,
+            }
             raise exceptions.CommandError(msg)
 
 

openstackclient/identity/v3/policy.py

@@ -92,9 +92,7 @@ class DeletePolicy(command.Command):
 
         if result > 0:
             total = len(parsed_args.policy)
-            msg = _(
-                "%(result)s of %(total)s policies failed " "to delete."
-            ) % {
+            msg = _("%(result)s of %(total)s policies failed to delete.") % {
                 'result': result,
                 'total': total,
             }
@@ -115,12 +113,11 @@ class ListPolicy(command.Lister):
         return parser
 
     def take_action(self, parsed_args):
+        columns: tuple[str, ...] = ('ID', 'Type')
+        column_headers: tuple[str, ...] = columns
         if parsed_args.long:
-            columns = ('ID', 'Type', 'Blob')
-            column_headers = ('ID', 'Type', 'Rules')
-        else:
-            columns = ('ID', 'Type')
-            column_headers = columns
+            columns += ('Blob',)
+            column_headers += ('Rules',)
         data = self.app.client_manager.identity.policies.list()
         return (
             column_headers,

openstackclient/identity/v3/project.py

@@ -190,9 +190,10 @@ class DeleteProject(command.Command):
 
         if errors > 0:
             total = len(parsed_args.projects)
-            msg = _(
-                "%(errors)s of %(total)s projects failed " "to delete."
-            ) % {'errors': errors, 'total': total}
+            msg = _("%(errors)s of %(total)s projects failed to delete.") % {
+                'errors': errors,
+                'total': total,
+            }
             raise exceptions.CommandError(msg)
 
 
@@ -244,10 +245,9 @@ class ListProject(command.Lister):
 
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
+        columns: tuple[str, ...] = ('ID', 'Name')
         if parsed_args.long:
-            columns = ('ID', 'Name', 'Domain ID', 'Description', 'Enabled')
-        else:
-            columns = ('ID', 'Name')
+            columns += ('Domain ID', 'Description', 'Enabled')
         kwargs = {}
 
         domain_id = None

openstackclient/identity/v3/region.py

@@ -92,16 +92,13 @@ class DeleteRegion(command.Command):
             except Exception as e:
                 result += 1
                 LOG.error(
-                    _(
-                        "Failed to delete region with "
-                        "ID '%(region)s': %(e)s"
-                    ),
+                    _("Failed to delete region with ID '%(region)s': %(e)s"),
                     {'region': i, 'e': e},
                 )
 
         if result > 0:
             total = len(parsed_args.region)
-            msg = _("%(result)s of %(total)s regions failed " "to delete.") % {
+            msg = _("%(result)s of %(total)s regions failed to delete.") % {
                 'result': result,
                 'total': total,
             }

openstackclient/identity/v3/registered_limit.py

@@ -68,8 +68,7 @@ class CreateRegisteredLimit(command.ShowOne):
         )
         region = None
         if parsed_args.region:
-            val = getattr(parsed_args, 'region', None)
-            if 'None' not in val:
+            if 'None' not in parsed_args.region:
                 # NOTE (vishakha): Due to bug #1799153 and for any another
                 # related case where GET resource API does not support the
                 # filter by name, osc_lib.utils.find_resource() method cannot
@@ -137,8 +136,7 @@ class DeleteRegisteredLimit(command.Command):
         if errors > 0:
             total = len(parsed_args.registered_limit_id)
             msg = _(
-                "%(errors)s of %(total)s registered limits failed to "
-                "delete."
+                "%(errors)s of %(total)s registered limits failed to delete."
             ) % {'errors': errors, 'total': total}
             raise exceptions.CommandError(msg)
 
@@ -176,8 +174,7 @@ class ListRegisteredLimit(command.Lister):
             )
         region = None
         if parsed_args.region:
-            val = getattr(parsed_args, 'region', None)
-            if 'None' not in val:
+            if 'None' not in parsed_args.region:
                 # NOTE (vishakha): Due to bug #1799153 and for any another
                 # related case where GET resource API does not support the
                 # filter by name, osc_lib.utils.find_resource() method cannot
@@ -281,8 +278,7 @@ class SetRegisteredLimit(command.ShowOne):
 
         region = None
         if parsed_args.region:
-            val = getattr(parsed_args, 'region', None)
-            if 'None' not in val:
+            if 'None' not in parsed_args.region:
                 # NOTE (vishakha): Due to bug #1799153 and for any another
                 # related case where GET resource API does not support the
                 # filter by name, osc_lib.utils.find_resource() method cannot

openstackclient/identity/v3/role.py

@@ -402,7 +402,7 @@ class DeleteRole(command.Command):
 
         if errors > 0:
             total = len(parsed_args.roles)
-            msg = _("%(errors)s of %(total)s roles failed " "to delete.") % {
+            msg = _("%(errors)s of %(total)s roles failed to delete.") % {
                 'errors': errors,
                 'total': total,
             }
@@ -428,28 +428,27 @@ class ListRole(command.Lister):
             domain = identity_client.find_domain(
                 name_or_id=parsed_args.domain,
             )
-            columns = ('ID', 'Name', 'Domain')
             data = identity_client.roles(domain_id=domain.id)
+            return (
+                ('ID', 'Name', 'Domain'),
+                (
+                    utils.get_item_properties(s, ('id', 'name'))
+                    + (domain.name,)
+                    for s in data
+                ),
+            )
+
         else:
-            columns = ('ID', 'Name')
             data = identity_client.roles()
-
-        return (
-            columns,
-            (
-                utils.get_item_properties(
-                    s,
-                    columns,
-                    formatters={'Domain': lambda _: domain.name},
-                )
-                for s in data
-            ),
-        )
+            return (
+                ('ID', 'Name'),
+                (utils.get_item_properties(s, ('id', 'name')) for s in data),
+            )
 
 
 class RemoveRole(command.Command):
     _description = _(
-        "Removes a role assignment from system/domain/project : " "user/group"
+        "Removes a role assignment from system/domain/project : user/group"
     )
 
     def get_parser(self, prog_name):

openstackclient/identity/v3/service.py

@@ -135,9 +135,10 @@ class DeleteService(command.Command):
 
         if result > 0:
             total = len(parsed_args.service)
-            msg = _(
-                "%(result)s of %(total)s services failed " "to delete."
-            ) % {'result': result, 'total': total}
+            msg = _("%(result)s of %(total)s services failed to delete.") % {
+                'result': result,
+                'total': total,
+            }
             raise exceptions.CommandError(msg)
 
 
@@ -157,12 +158,11 @@ class ListService(command.Lister):
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.sdk_connection.identity
 
+        columns: tuple[str, ...] = ('id', 'name', 'type')
+        column_headers: tuple[str, ...] = ('ID', 'Name', 'Type')
         if parsed_args.long:
-            columns = ('id', 'name', 'type', 'description', 'is_enabled')
-            column_headers = ('ID', 'Name', 'Type', 'Description', 'Enabled')
-        else:
-            columns = ('id', 'name', 'type')
-            column_headers = ('ID', 'Name', 'Type')
+            columns += ('description', 'is_enabled')
+            column_headers += ('Description', 'Enabled')
 
         data = identity_client.services()
 

openstackclient/identity/v3/service_provider.py

@@ -77,8 +77,7 @@ class CreateServiceProvider(command.ShowOne):
             metavar='<sp-url>',
             required=True,
             help=_(
-                'A service URL where SAML assertions are being sent '
-                '(required)'
+                'A service URL where SAML assertions are being sent (required)'
             ),
         )
 
@@ -155,8 +154,7 @@ class DeleteServiceProvider(command.Command):
         if result > 0:
             total = len(parsed_args.service_provider)
             msg = _(
-                "%(result)s of %(total)s service providers failed"
-                " to delete."
+                "%(result)s of %(total)s service providers failed to delete."
             ) % {'result': result, 'total': total}
             raise exceptions.CommandError(msg)
 
@@ -204,8 +202,7 @@ class SetServiceProvider(command.ShowOne):
             '--auth-url',
             metavar='<auth-url>',
             help=_(
-                'New Authentication URL of remote '
-                'federated service provider'
+                'New Authentication URL of remote federated service provider'
             ),
         )