Merge "Change metavar name for registered limit delete"

Zuul · openstack-gerrit · commit f8effe997e7c · 2025-11-26T12:29:54.000Z
diff --git a/openstackclient/identity/v3/registered_limit.py b/openstackclient/identity/v3/registered_limit.py
@@ -44,7 +44,10 @@ def get_parser(self, prog_name):
             '--service',
             metavar='<service>',
             required=True,
-            help=_('Service responsible for the resource to limit (required)'),
+            help=_(
+                'Service responsible for the resource to limit (required) '
+                '(name or ID)'
+            ),
         )
         parser.add_argument(
             '--default-limit',
@@ -106,18 +109,18 @@ class DeleteRegisteredLimit(command.Command):
     def get_parser(self, prog_name):
         parser = super().get_parser(prog_name)
         parser.add_argument(
-            'registered_limit_id',
-            metavar='<registered-limit-id>',
+            'registered_limits',
+            metavar='<registered-limits>',
             nargs="+",
-            help=_('Registered limit to delete (ID)'),
+            help=_('Registered limit(s) to delete (ID)'),
         )
         return parser
 
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
 
         errors = 0
-        for registered_limit_id in parsed_args.registered_limit_id:
+        for registered_limit_id in parsed_args.registered_limits:
             try:
                 identity_client.registered_limits.delete(registered_limit_id)
             except Exception as e:
@@ -134,7 +137,7 @@ def take_action(self, parsed_args):
                 )
 
         if errors > 0:
-            total = len(parsed_args.registered_limit_id)
+            total = len(parsed_args.registered_limits)
             msg = _(
                 "%(errors)s of %(total)s registered limits failed to delete."
             ) % {'errors': errors, 'total': total}
@@ -149,7 +152,9 @@ def get_parser(self, prog_name):
         parser.add_argument(
             '--service',
             metavar='<service>',
-            help=_('Service responsible for the resource to limit'),
+            help=_(
+                'Service responsible for the resource to limit (name or ID)'
+            ),
         )
         parser.add_argument(
             '--resource-name',
@@ -228,9 +233,9 @@ def get_parser(self, prog_name):
             '--service',
             metavar='<service>',
             help=_(
-                'Service to be updated responsible for the resource to '
-                'limit. Either --service, --resource-name or --region must '
-                'be different than existing value otherwise it will be '
+                'Service to be updated responsible for the resource to limit '
+                '(name or ID). Either --service, --resource-name or --region '
+                'must be different than existing value otherwise it will be '
                 'duplicate entry'
             ),
         )
diff --git a/openstackclient/tests/unit/identity/v3/test_registered_limit.py b/openstackclient/tests/unit/identity/v3/test_registered_limit.py
@@ -168,7 +168,7 @@ def test_registered_limit_delete(self):
 
         arglist = [identity_fakes.registered_limit_id]
         verifylist = [
-            ('registered_limit_id', [identity_fakes.registered_limit_id])
+            ('registered_limits', [identity_fakes.registered_limit_id])
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -184,7 +184,7 @@ def test_registered_limit_delete_with_exception(self):
         self.registered_limit_mock.delete.side_effect = return_value
 
         arglist = ['fake-registered-limit-id']
-        verifylist = [('registered_limit_id', ['fake-registered-limit-id'])]
+        verifylist = [('registered_limits', ['fake-registered-limit-id'])]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         try:
