Remove deprecated identity commands and args

The following were deprecated over two years ago and can now be
removed/changed:

* Remove ``service create`` option ``--type``
* Remove ``role list`` options ``--project`` and ``--user``
* Remove ``user role list`` command

These are backwards incompatible changes and will require a major
version bump after they are merged.

Change-Id: I29e2fc9516dffbfd83eef0bc91e834dde99b4105
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
Signed-off-by: Dean Troyer <dtroyer@gmail.com>

3 files changed, 8 insertions, 402 deletions

diff --git a/openstackclient/tests/unit/identity/v2_0/test_role.py b/openstackclient/tests/unit/identity/v2_0/test_role.py
index 684ce803..643d77f6 100644
--- a/openstackclient/tests/unit/identity/v2_0/test_role.py
+++ b/openstackclient/tests/unit/identity/v2_0/test_role.py
@@ -278,7 +278,7 @@ class TestRoleList(TestRole):
         # Get the command object to test
         self.cmd = role.ListRole(self.app, None)
 
-    def test_role_list_no_options(self):
+    def test_role_list(self):
         arglist = []
         verifylist = []
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -299,137 +299,6 @@ class TestRoleList(TestRole):
         self.assertEqual(datalist, tuple(data))
 
 
-class TestUserRoleList(TestRole):
-
-    columns = (
-        'ID',
-        'Name',
-        'Project',
-        'User'
-    )
-
-    def setUp(self):
-        super(TestUserRoleList, self).setUp()
-
-        self.projects_mock.get.return_value = self.fake_project
-
-        self.users_mock.get.return_value = self.fake_user
-
-        self.roles_mock.roles_for_user.return_value = [self.fake_role]
-
-        # Get the command object to test
-        self.cmd = role.ListUserRole(self.app, None)
-
-    def test_user_role_list_no_options_unscoped_token(self):
-        auth_ref = identity_fakes.fake_auth_ref(
-            identity_fakes.UNSCOPED_TOKEN,
-            fake_service=self.fake_service,
-        )
-        self.ar_mock = mock.PropertyMock(return_value=auth_ref)
-        type(self.app.client_manager).auth_ref = self.ar_mock
-
-        arglist = []
-        verifylist = []
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        # This argument combination should raise a CommandError
-        self.assertRaises(
-            exceptions.CommandError,
-            self.cmd.take_action,
-            parsed_args,
-        )
-
-    def test_user_role_list_no_options_scoped_token(self):
-        arglist = []
-        verifylist = []
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        # In base command class Lister in cliff, abstract method take_action()
-        # returns a tuple containing the column names and an iterable
-        # containing the data to be listed.
-        columns, data = self.cmd.take_action(parsed_args)
-
-        self.roles_mock.roles_for_user.assert_called_with(
-            self.fake_user.id,
-            self.fake_project.id,
-        )
-
-        collist = ('ID', 'Name', 'Project', 'User')
-        self.assertEqual(collist, columns)
-        datalist = ((
-            self.fake_role.id,
-            self.fake_role.name,
-            self.fake_project.name,
-            self.fake_user.name,
-        ), )
-        self.assertEqual(datalist, tuple(data))
-
-    def test_user_role_list_project_unscoped_token(self):
-        auth_ref = identity_fakes.fake_auth_ref(
-            identity_fakes.UNSCOPED_TOKEN,
-            fake_service=self.fake_service,
-        )
-        self.ar_mock = mock.PropertyMock(return_value=auth_ref)
-        type(self.app.client_manager).auth_ref = self.ar_mock
-
-        self.projects_mock.get.return_value = self.fake_project
-        arglist = [
-            '--project', self.fake_project.name,
-        ]
-        verifylist = [
-            ('project', self.fake_project.name),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        # In base command class Lister in cliff, abstract method take_action()
-        # returns a tuple containing the column names and an iterable
-        # containing the data to be listed.
-        columns, data = self.cmd.take_action(parsed_args)
-
-        self.roles_mock.roles_for_user.assert_called_with(
-            self.fake_user.id,
-            self.fake_project.id,
-        )
-
-        self.assertEqual(columns, columns)
-        datalist = ((
-            self.fake_role.id,
-            self.fake_role.name,
-            self.fake_project.name,
-            self.fake_user.name,
-        ), )
-        self.assertEqual(datalist, tuple(data))
-
-    def test_user_role_list_project_scoped_token(self):
-        self.projects_mock.get.return_value = self.fake_project
-        arglist = [
-            '--project', self.fake_project.name,
-        ]
-        verifylist = [
-            ('project', self.fake_project.name),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        # In base command class Lister in cliff, abstract method take_action()
-        # returns a tuple containing the column names and an iterable
-        # containing the data to be listed.
-        columns, data = self.cmd.take_action(parsed_args)
-
-        self.roles_mock.roles_for_user.assert_called_with(
-            self.fake_user.id,
-            self.fake_project.id,
-        )
-
-        self.assertEqual(columns, columns)
-        datalist = ((
-            self.fake_role.id,
-            self.fake_role.name,
-            self.fake_project.name,
-            self.fake_user.name,
-        ), )
-        self.assertEqual(datalist, tuple(data))
-
-
 class TestRoleRemove(TestRole):
 
     def setUp(self):
diff --git a/openstackclient/tests/unit/identity/v2_0/test_service.py b/openstackclient/tests/unit/identity/v2_0/test_service.py
index 1948bf4a..6c4374ef 100644
--- a/openstackclient/tests/unit/identity/v2_0/test_service.py
+++ b/openstackclient/tests/unit/identity/v2_0/test_service.py
@@ -55,43 +55,14 @@ class TestServiceCreate(TestService):
         # Get the command object to test
         self.cmd = service.CreateService(self.app, None)
 
-    def test_service_create_with_type_positional(self):
+    def test_service_create(self):
         arglist = [
             self.fake_service_c.type,
         ]
         verifylist = [
-            ('type_or_name', self.fake_service_c.type),
-            ('type', None),
-            ('description', None),
-            ('name', None),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        # In base command class ShowOne in cliff, abstract method take_action()
-        # returns a two-part tuple with a tuple of column names and a tuple of
-        # data to be shown.
-        columns, data = self.cmd.take_action(parsed_args)
-
-        # ServiceManager.create(name, service_type, description)
-        self.services_mock.create.assert_called_with(
-            None,
-            self.fake_service_c.type,
-            None,
-        )
-
-        self.assertEqual(self.columns, columns)
-        self.assertEqual(self.datalist, data)
-
-    def test_service_create_with_type_option(self):
-        arglist = [
-            '--type', self.fake_service_c.type,
-            self.fake_service_c.name,
-        ]
-        verifylist = [
-            ('type_or_name', self.fake_service_c.name),
             ('type', self.fake_service_c.type),
-            ('description', None),
             ('name', None),
+            ('description', None),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -102,7 +73,7 @@ class TestServiceCreate(TestService):
 
         # ServiceManager.create(name, service_type, description)
         self.services_mock.create.assert_called_with(
-            self.fake_service_c.name,
+            None,
             self.fake_service_c.type,
             None,
         )
@@ -116,10 +87,9 @@ class TestServiceCreate(TestService):
             self.fake_service_c.type,
         ]
         verifylist = [
-            ('type_or_name', self.fake_service_c.type),
-            ('type', None),
-            ('description', None),
+            ('type', self.fake_service_c.type),
             ('name', self.fake_service_c.name),
+            ('description', None),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -145,10 +115,9 @@ class TestServiceCreate(TestService):
             self.fake_service_c.type,
         ]
         verifylist = [
-            ('type_or_name', self.fake_service_c.type),
-            ('type', None),
-            ('description', self.fake_service_c.description),
+            ('type', self.fake_service_c.type),
             ('name', self.fake_service_c.name),
+            ('description', self.fake_service_c.description),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
diff --git a/openstackclient/tests/unit/identity/v3/test_role.py b/openstackclient/tests/unit/identity/v3/test_role.py
index 281d530c..99f3a2de 100644
--- a/openstackclient/tests/unit/identity/v3/test_role.py
+++ b/openstackclient/tests/unit/identity/v3/test_role.py
@@ -508,21 +508,6 @@ class TestRoleList(TestRole):
             copy.deepcopy(identity_fakes.DOMAIN),
             loaded=True,
         )
-        self.projects_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.PROJECT),
-            loaded=True,
-        )
-        self.users_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.USER),
-            loaded=True,
-        )
-        self.groups_mock.get.return_value = fakes.FakeResource(
-            None,
-            copy.deepcopy(identity_fakes.GROUP),
-            loaded=True,
-        )
 
         # Get the command object to test
         self.cmd = role.ListRole(self.app, None)
@@ -542,212 +527,6 @@ class TestRoleList(TestRole):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.datalist, tuple(data))
 
-    def test_user_list_inherited(self):
-        arglist = [
-            '--user', identity_fakes.user_id,
-            '--inherited',
-        ]
-        verifylist = [
-            ('user', identity_fakes.user_id),
-            ('inherited', True),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        # In base command class Lister in cliff, abstract method take_action()
-        # returns a tuple containing the column names and an iterable
-        # containing the data to be listed.
-        columns, data = self.cmd.take_action(parsed_args)
-
-        # Set expected values
-        kwargs = {
-            'domain': 'default',
-            'user': self.users_mock.get(),
-            'os_inherit_extension_inherited': True,
-        }
-        # RoleManager.list(user=, group=, domain=, project=, **kwargs)
-        self.roles_mock.list.assert_called_with(
-            **kwargs
-        )
-
-        self.assertEqual(self.columns, columns)
-        self.assertEqual(self.datalist, tuple(data))
-
-    def test_user_list_user(self):
-        arglist = [
-            '--user', identity_fakes.user_id,
-        ]
-        verifylist = [
-            ('user', identity_fakes.user_id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        # In base command class Lister in cliff, abstract method take_action()
-        # returns a tuple containing the column names and an iterable
-        # containing the data to be listed.
-        columns, data = self.cmd.take_action(parsed_args)
-
-        # Set expected values
-        kwargs = {
-            'domain': 'default',
-            'user': self.users_mock.get(),
-            'os_inherit_extension_inherited': False
-        }
-        # RoleManager.list(user=, group=, domain=, project=, **kwargs)
-        self.roles_mock.list.assert_called_with(
-            **kwargs
-        )
-
-        self.assertEqual(self.columns, columns)
-        self.assertEqual(self.datalist, tuple(data))
-
-    def test_role_list_domain_user(self):
-        arglist = [
-            '--domain', identity_fakes.domain_name,
-            '--user', identity_fakes.user_id,
-        ]
-        verifylist = [
-            ('domain', identity_fakes.domain_name),
-            ('user', identity_fakes.user_id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        # In base command class Lister in cliff, abstract method take_action()
-        # returns a tuple containing the column names and an iterable
-        # containing the data to be listed.
-        columns, data = self.cmd.take_action(parsed_args)
-
-        # Set expected values
-        kwargs = {
-            'domain': self.domains_mock.get(),
-            'user': self.users_mock.get(),
-            'os_inherit_extension_inherited': False
-        }
-        # RoleManager.list(user=, group=, domain=, project=, **kwargs)
-        self.roles_mock.list.assert_called_with(
-            **kwargs
-        )
-
-        collist = ('ID', 'Name', 'Domain', 'User')
-        self.assertEqual(collist, columns)
-        datalist = ((
-            identity_fakes.role_id,
-            identity_fakes.role_name,
-            identity_fakes.domain_name,
-            identity_fakes.user_name,
-        ), )
-        self.assertEqual(datalist, tuple(data))
-
-    def test_role_list_domain_group(self):
-        arglist = [
-            '--domain', identity_fakes.domain_name,
-            '--group', identity_fakes.group_id,
-        ]
-        verifylist = [
-            ('domain', identity_fakes.domain_name),
-            ('group', identity_fakes.group_id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        # In base command class Lister in cliff, abstract method take_action()
-        # returns a tuple containing the column names and an iterable
-        # containing the data to be listed.
-        columns, data = self.cmd.take_action(parsed_args)
-
-        # Set expected values
-        kwargs = {
-            'domain': self.domains_mock.get(),
-            'group': self.groups_mock.get(),
-            'os_inherit_extension_inherited': False
-        }
-        # RoleManager.list(user=, group=, domain=, project=, **kwargs)
-        self.roles_mock.list.assert_called_with(
-            **kwargs
-        )
-
-        collist = ('ID', 'Name', 'Domain', 'Group')
-        self.assertEqual(collist, columns)
-        datalist = ((
-            identity_fakes.role_id,
-            identity_fakes.role_name,
-            identity_fakes.domain_name,
-            identity_fakes.group_name,
-        ), )
-        self.assertEqual(datalist, tuple(data))
-
-    def test_role_list_project_user(self):
-        arglist = [
-            '--project', identity_fakes.project_name,
-            '--user', identity_fakes.user_id,
-        ]
-        verifylist = [
-            ('project', identity_fakes.project_name),
-            ('user', identity_fakes.user_id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        # In base command class Lister in cliff, abstract method take_action()
-        # returns a tuple containing the column names and an iterable
-        # containing the data to be listed.
-        columns, data = self.cmd.take_action(parsed_args)
-
-        # Set expected values
-        kwargs = {
-            'project': self.projects_mock.get(),
-            'user': self.users_mock.get(),
-            'os_inherit_extension_inherited': False
-        }
-        # RoleManager.list(user=, group=, domain=, project=, **kwargs)
-        self.roles_mock.list.assert_called_with(
-            **kwargs
-        )
-
-        collist = ('ID', 'Name', 'Project', 'User')
-        self.assertEqual(collist, columns)
-        datalist = ((
-            identity_fakes.role_id,
-            identity_fakes.role_name,
-            identity_fakes.project_name,
-            identity_fakes.user_name,
-        ), )
-        self.assertEqual(datalist, tuple(data))
-
-    def test_role_list_project_group(self):
-        arglist = [
-            '--project', identity_fakes.project_name,
-            '--group', identity_fakes.group_id,
-        ]
-        verifylist = [
-            ('project', identity_fakes.project_name),
-            ('group', identity_fakes.group_id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        # In base command class Lister in cliff, abstract method take_action()
-        # returns a tuple containing the column names and an iterable
-        # containing the data to be listed.
-        columns, data = self.cmd.take_action(parsed_args)
-
-        # Set expected values
-        kwargs = {
-            'project': self.projects_mock.get(),
-            'group': self.groups_mock.get(),
-            'os_inherit_extension_inherited': False
-        }
-        # RoleManager.list(user=, group=, domain=, project=, **kwargs)
-        self.roles_mock.list.assert_called_with(
-            **kwargs
-        )
-
-        collist = ('ID', 'Name', 'Project', 'Group')
-        self.assertEqual(collist, columns)
-        datalist = ((
-            identity_fakes.role_id,
-            identity_fakes.role_name,
-            identity_fakes.project_name,
-            identity_fakes.group_name,
-        ), )
-        self.assertEqual(datalist, tuple(data))
-
     def test_role_list_domain_role(self):
         self.roles_mock.list.return_value = [
             fakes.FakeResource(
@@ -787,17 +566,6 @@ class TestRoleList(TestRole):
         ), )
         self.assertEqual(datalist, tuple(data))
 
-    def test_role_list_group_with_error(self):
-        arglist = [
-            '--group', identity_fakes.group_id,
-        ]
-        verifylist = [
-            ('group', identity_fakes.group_id),
-        ]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.assertRaises(exceptions.CommandError,
-                          self.cmd.take_action, parsed_args)
-
 
 class TestRoleRemove(TestRole):