Merge "Remove deprecated identity commands and args"

Author: Zuul

doc/source/cli/backwards-incompatible.rst

@@ -31,6 +31,24 @@ Release 4.0
   * Removed in: 4.0
   * Commit: https://review.opendev.org/612781
 
+3. Remove ``service create`` option ``--type``.  Service type is
+   a positional argument.
+
+  * Removed in: 4.0
+  * Commit: https://review.opendev.org/612798
+
+4. Remove ``role list`` options ``--project`` and ``--user``.
+   Use ``role assignment list`` options ``--project`` and ``--user`` instead.
+
+  * Removed in: 4.0
+  * Commit: https://review.opendev.org/612798
+
+5. Remove ``user role list`` command.
+   Use ``role assignment list`` options ``--project`` and ``--user`` instead.
+
+  * Removed in: 4.0
+  * Commit: https://review.opendev.org/612798
+
 .. 1. Change ``volume transfer request accept`` to use new option ``--auth-key``
 ..    rather than a second positional argument.
 

doc/source/cli/command-objects/role.rst

@@ -146,68 +146,12 @@ List roles
 .. code:: bash
 
     openstack role list
-        --domain <domain> | --project <project> [--project-domain <project-domain>]
-        --user <user> [--user-domain <user-domain>] | --group <group> [--group-domain <group-domain>]
-        --inherited
+        [--domain <domain>]
 
 .. option:: --domain <domain>
 
     Filter roles by <domain> (name or ID)
 
-    (Deprecated if being used to list assignments in conjunction with the
-    ``--user <user>``, option, please use ``role assignment list`` instead)
-
-.. option:: --project <project>
-
-    Filter roles by <project> (name or ID)
-
-    (Deprecated, please use ``role assignment list`` instead)
-
-.. option:: --user <user>
-
-    Filter roles by <user> (name or ID)
-
-    (Deprecated, please use ``role assignment list`` instead)
-
-.. option:: --group <group>
-
-    Filter roles by <group> (name or ID)
-
-    (Deprecated, please use ``role assignment list`` instead)
-
-.. option:: --user-domain <user-domain>
-
-    Domain the user belongs to (name or ID).
-    This can be used in case collisions between user names exist.
-
-    (Deprecated, please use ``role assignment list`` instead)
-
-    .. versionadded:: 3
-
-.. option:: --group-domain <group-domain>
-
-    Domain the group belongs to (name or ID).
-    This can be used in case collisions between group names exist.
-
-    (Deprecated, please use ``role assignment list`` instead)
-
-    .. versionadded:: 3
-
-.. option:: --project-domain <project-domain>
-
-    Domain the project belongs to (name or ID).
-    This can be used in case collisions between project names exist.
-
-    (Deprecated, please use ``role assignment list`` instead)
-
-    .. versionadded:: 3
-
-.. option:: --inherited
-
-    Specifies if the role grant is inheritable to the sub projects.
-
-    (Deprecated, please use ``role assignment list`` instead)
-
     .. versionadded:: 3
 
 role remove

doc/source/cli/command-objects/user-role.rst

@@ -148,155 +148,11 @@ def take_action(self, parsed_args):
 class ListRole(command.Lister):
     _description = _("List roles")
 
-    def get_parser(self, prog_name):
-        parser = super(ListRole, self).get_parser(prog_name)
-        parser.add_argument(
-            '--project',
-            metavar='<project>',
-            help=_('Filter roles by <project> (name or ID)'),
-        )
-        parser.add_argument(
-            '--user',
-            metavar='<user>',
-            help=_('Filter roles by <user> (name or ID)'),
-        )
-        return parser
-
     def take_action(self, parsed_args):
-
-        def _deprecated():
-            # NOTE(henry-nash): Deprecated as of Newton, so we should remove
-            # this in the 'P' release.
-            self.log.warning(_('Listing assignments using role list is '
-                               'deprecated as of the Newton release. Use role '
-                               'assignment list --user <user-name> --project '
-                               '<project-name> --names instead.'))
-
         identity_client = self.app.client_manager.identity
-        auth_ref = self.app.client_manager.auth_ref
-
-        # No user or project specified, list all roles in the system
-        if not parsed_args.user and not parsed_args.project:
-            columns = ('ID', 'Name')
-            data = identity_client.roles.list()
-        elif parsed_args.user and parsed_args.project:
-            user = utils.find_resource(
-                identity_client.users,
-                parsed_args.user,
-            )
-            project = utils.find_resource(
-                identity_client.projects,
-                parsed_args.project,
-            )
-            _deprecated()
-            data = identity_client.roles.roles_for_user(user.id, project.id)
-
-        elif parsed_args.user:
-            user = utils.find_resource(
-                identity_client.users,
-                parsed_args.user,
-            )
-            if self.app.client_manager.auth_ref:
-                project = utils.find_resource(
-                    identity_client.projects,
-                    auth_ref.project_id
-                )
-            else:
-                msg = _("Project must be specified")
-                raise exceptions.CommandError(msg)
-            _deprecated()
-            data = identity_client.roles.roles_for_user(user.id, project.id)
-        elif parsed_args.project:
-            project = utils.find_resource(
-                identity_client.projects,
-                parsed_args.project,
-            )
-            if self.app.client_manager.auth_ref:
-                user = utils.find_resource(
-                    identity_client.users,
-                    auth_ref.user_id
-                )
-            else:
-                msg = _("User must be specified")
-                raise exceptions.CommandError(msg)
-            _deprecated()
-            data = identity_client.roles.roles_for_user(user.id, project.id)
-
-        if parsed_args.user or parsed_args.project:
-            columns = ('ID', 'Name', 'Project', 'User')
-            for user_role in data:
-                user_role.user = user.name
-                user_role.project = project.name
-
-        return (columns,
-                (utils.get_item_properties(
-                    s, columns,
-                    formatters={},
-                ) for s in data))
-
-
-class ListUserRole(command.Lister):
-    _description = _("List user-role assignments")
-
-    def get_parser(self, prog_name):
-        parser = super(ListUserRole, self).get_parser(prog_name)
-        parser.add_argument(
-            'user',
-            metavar='<user>',
-            nargs='?',
-            help=_('User to list (name or ID)'),
-        )
-        parser.add_argument(
-            '--project',
-            metavar='<project>',
-            help=_('Filter users by <project> (name or ID)'),
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        identity_client = self.app.client_manager.identity
-        auth_ref = self.app.client_manager.auth_ref
-
-        # Project and user are required, if not included in command args
-        # default to the values used for authentication.  For token-flow
-        # authentication they must be included on the command line.
-        if (not parsed_args.project and
-                self.app.client_manager.auth_ref.project_id):
-            parsed_args.project = auth_ref.project_id
-        if not parsed_args.project:
-            msg = _("Project must be specified")
-            raise exceptions.CommandError(msg)
-
-        if (not parsed_args.user and
-                self.app.client_manager.auth_ref.user_id):
-            parsed_args.user = auth_ref.user_id
-        if not parsed_args.user:
-            msg = _("User must be specified")
-            raise exceptions.CommandError(msg)
-
-        self.log.warning(_('Listing assignments using user role list is '
-                           'deprecated as of the Newton release. Use role '
-                           'assignment list --user <user-name> --project '
-                           '<project-name> --names instead.'))
-        project = utils.find_resource(
-            identity_client.tenants,
-            parsed_args.project,
-        )
-        user = utils.find_resource(identity_client.users, parsed_args.user)
-
-        data = identity_client.roles.roles_for_user(user.id, project.id)
-
-        columns = (
-            'ID',
-            'Name',
-            'Project',
-            'User',
-        )
 
-        # Add the names to the output even though they will be constant
-        for role in data:
-            role.user = user.name
-            role.project = project.name
+        columns = ('ID', 'Name')
+        data = identity_client.roles.list()
 
         return (columns,
                 (utils.get_item_properties(

openstackclient/identity/v2_0/role.py

@@ -15,7 +15,6 @@
 
 """Service action implementations"""
 
-import argparse
 import logging
 
 from osc_lib.command import command
@@ -36,17 +35,11 @@ class CreateService(command.ShowOne):
     def get_parser(self, prog_name):
         parser = super(CreateService, self).get_parser(prog_name)
         parser.add_argument(
-            'type_or_name',
+            'type',
             metavar='<type>',
             help=_('New service type (compute, image, identity, volume, etc)'),
         )
-        type_or_name_group = parser.add_mutually_exclusive_group()
-        type_or_name_group.add_argument(
-            '--type',
-            metavar='<type>',
-            help=argparse.SUPPRESS,
-        )
-        type_or_name_group.add_argument(
+        parser.add_argument(
             '--name',
             metavar='<name>',
             help=_('New service name'),
@@ -61,29 +54,14 @@ def get_parser(self, prog_name):
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
 
-        type_or_name = parsed_args.type_or_name
         name = parsed_args.name
         type = parsed_args.type
 
-        # If only a single positional is present, it's a <type>.
-        # This is not currently legal so it is considered a new case.
-        if not type and not name:
-            type = type_or_name
-        # If --type option is present then positional is handled as <name>;
-        # display deprecation message.
-        elif type:
-            name = type_or_name
-            LOG.warning(_('The argument --type is deprecated, use service'
-                          ' create --name <service-name> type instead.'))
-        # If --name option is present the positional is handled as <type>.
-        # Making --type optional is new, but back-compatible
-        elif name:
-            type = type_or_name
-
         service = identity_client.services.create(
             name,
             type,
-            parsed_args.description)
+            parsed_args.description,
+        )
 
         info = {}
         info.update(service._info)