python-openstackclient 8.2.0__py3-none-any.whl → 9.0.0__py3-none-any.whl

openstackclient/identity/v3/limit.py

@@ -15,16 +15,38 @@
 
 import logging
 
-from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 
+from openstackclient import command
 from openstackclient.i18n import _
 from openstackclient.identity import common as common_utils
 
 LOG = logging.getLogger(__name__)
 
 
+def _format_limit(limit):
+    columns = (
+        "description",
+        "id",
+        "project_id",
+        "region_id",
+        "resource_limit",
+        "resource_name",
+        "service_id",
+    )
+    column_headers = (
+        "description",
+        "id",
+        "project_id",
+        "region_id",
+        "resource_limit",
+        "resource_name",
+        "service_id",
+    )
+    return (column_headers, utils.get_item_properties(limit, columns))
+
+
 class CreateLimit(command.ShowOne):
     _description = _("Create a limit")
 
@@ -46,6 +68,7 @@ class CreateLimit(command.ShowOne):
             required=True,
             help=_('Project to associate the resource limit to'),
         )
+        common_utils.add_project_domain_option_to_parser(parser)
         parser.add_argument(
             '--service',
             metavar='<service>',
@@ -67,47 +90,33 @@ class CreateLimit(command.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
-
-        project = common_utils.find_project(
-            identity_client, parsed_args.project
+        identity_client = self.app.client_manager.sdk_connection.identity
+
+        kwargs = {
+            "resource_name": parsed_args.resource_name,
+            "resource_limit": parsed_args.resource_limit,
+        }
+        if parsed_args.description:
+            kwargs["description"] = parsed_args.description
+
+        kwargs["project_id"] = common_utils.find_project_id_sdk(
+            identity_client,
+            parsed_args.project,
+            domain_name_or_id=parsed_args.project_domain,
         )
-        service = common_utils.find_service(
+
+        kwargs["service_id"] = common_utils.find_service_sdk(
             identity_client, parsed_args.service
-        )
-        region = None
+        ).id
+
         if parsed_args.region:
-            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
-                # be used because that method try to fall back to list all the
-                # resource if requested resource cannot be get via name. Which
-                # ends up with NoUniqueMatch error.
-                # So osc_lib.utils.find_resource() function cannot be used for
-                # 'regions', using common_utils.get_resource() instead.
-                region = common_utils.get_resource(
-                    identity_client.regions, parsed_args.region
-                )
-            else:
-                self.log.warning(
-                    _(
-                        "Passing 'None' to indicate no region is deprecated. "
-                        "Instead, don't pass --region."
-                    )
-                )
+            kwargs["region_id"] = identity_client.get_region(
+                parsed_args.region
+            ).id
 
-        limit = identity_client.limits.create(
-            project,
-            service,
-            parsed_args.resource_name,
-            parsed_args.resource_limit,
-            description=parsed_args.description,
-            region=region,
-        )
+        limit = identity_client.create_limit(**kwargs)
 
-        limit._info.pop('links', None)
-        return zip(*sorted(limit._info.items()))
+        return _format_limit(limit)
 
 
 class ListLimit(command.Lister):
@@ -136,50 +145,41 @@ class ListLimit(command.Lister):
             metavar='<project>',
             help=_('List resource limits associated with project'),
         )
+        common_utils.add_project_domain_option_to_parser(parser)
+
         return parser
 
     def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
+        identity_client = self.app.client_manager.sdk_connection.identity
 
-        service = None
+        kwargs = {}
         if parsed_args.service:
-            service = common_utils.find_service(
+            kwargs["service_id"] = common_utils.find_service_sdk(
                 identity_client, parsed_args.service
             )
-        region = None
+
         if parsed_args.region:
-            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
-                # be used because that method try to fall back to list all the
-                # resource if requested resource cannot be get via name. Which
-                # ends up with NoUniqueMatch error.
-                # So osc_lib.utils.find_resource() function cannot be used for
-                # 'regions', using common_utils.get_resource() instead.
-                region = common_utils.get_resource(
-                    identity_client.regions, parsed_args.region
-                )
-            else:
-                self.log.warning(
-                    _(
-                        "Passing 'None' to indicate no region is deprecated. "
-                        "Instead, don't pass --region."
-                    )
-                )
+            kwargs["region_id"] = identity_client.get_region(
+                parsed_args.region
+            ).id
 
-        project = None
         if parsed_args.project:
-            project = utils.find_resource(
-                identity_client.projects, parsed_args.project
+            project_domain_id = None
+            if parsed_args.project_domain:
+                project_domain_id = common_utils.find_domain_id_sdk(
+                    identity_client, parsed_args.project_domain
+                )
+
+            kwargs["project_id"] = common_utils._find_sdk_id(
+                identity_client.find_project,
+                name_or_id=parsed_args.project,
+                domain_id=project_domain_id,
             )
 
-        limits = identity_client.limits.list(
-            service=service,
-            resource_name=parsed_args.resource_name,
-            region=region,
-            project=project,
-        )
+        if parsed_args.resource_name:
+            kwargs["resource_name"] = parsed_args.resource_name
+
+        limits = identity_client.limits(**kwargs)
 
         columns = (
             'ID',
@@ -209,10 +209,9 @@ class ShowLimit(command.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
-        limit = identity_client.limits.get(parsed_args.limit_id)
-        limit._info.pop('links', None)
-        return zip(*sorted(limit._info.items()))
+        identity_client = self.app.client_manager.sdk_connection.identity
+        limit = identity_client.get_limit(parsed_args.limit_id)
+        return _format_limit(limit)
 
 
 class SetLimit(command.ShowOne):
@@ -240,17 +239,16 @@ class SetLimit(command.ShowOne):
         return parser
 
     def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
-
-        limit = identity_client.limits.update(
-            parsed_args.limit_id,
-            description=parsed_args.description,
-            resource_limit=parsed_args.resource_limit,
-        )
+        identity_client = self.app.client_manager.sdk_connection.identity
 
-        limit._info.pop('links', None)
+        kwargs = {}
+        if parsed_args.description:
+            kwargs["description"] = parsed_args.description
+        if parsed_args.resource_limit:
+            kwargs["resource_limit"] = parsed_args.resource_limit
+        limit = identity_client.update_limit(parsed_args.limit_id, **kwargs)
 
-        return zip(*sorted(limit._info.items()))
+        return _format_limit(limit)
 
 
 class DeleteLimit(command.Command):
@@ -262,17 +260,20 @@ class DeleteLimit(command.Command):
             'limit_id',
             metavar='<limit-id>',
             nargs="+",
-            help=_('Limit to delete (ID)'),
+            help=_(
+                'Limit to delete (ID) '
+                '(repeat option to remove multiple limits)'
+            ),
         )
         return parser
 
     def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
+        identity_client = self.app.client_manager.sdk_connection.identity
 
         errors = 0
         for limit_id in parsed_args.limit_id:
             try:
-                identity_client.limits.delete(limit_id)
+                identity_client.delete_limit(limit_id)
             except Exception as e:
                 errors += 1
                 LOG.error(

openstackclient/identity/v3/mapping.py

@@ -18,10 +18,10 @@
 import json
 import logging
 
-from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 
+from openstackclient import command
 from openstackclient.i18n import _
 
 

openstackclient/identity/v3/policy.py

@@ -17,10 +17,10 @@
 
 import logging
 
-from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
 
+from openstackclient import command
 from openstackclient.i18n import _