Merge "Remove deprecated identity commands and args"

2 files changed, 0 insertions, 73 deletions

diff --git a/openstackclient/tests/functional/identity/v2/test_role.py b/openstackclient/tests/functional/identity/v2/test_role.py
index 82e19aab..124603d8 100644
--- a/openstackclient/tests/functional/identity/v2/test_role.py
+++ b/openstackclient/tests/functional/identity/v2/test_role.py
@@ -29,38 +29,6 @@ class RoleTests(common.IdentityTests):
         items = self.parse_listing(raw_output)
         self.assert_table_structure(items, common.BASIC_LIST_HEADERS)
 
-    def test_role_list_with_user_project(self):
-        project_name = self._create_dummy_project()
-        role_name = self._create_dummy_role()
-        username = self._create_dummy_user()
-        raw_output = self.openstack(
-            'role add '
-            '--project %(project)s '
-            '--user %(user)s '
-            '%(role)s' % {'project': project_name,
-                          'user': username,
-                          'role': role_name})
-        self.addCleanup(
-            self.openstack,
-            'role remove '
-            '--project %(project)s '
-            '--user %(user)s '
-            '%(role)s' % {'project': project_name,
-                          'user': username,
-                          'role': role_name})
-        items = self.parse_show(raw_output)
-        self.assert_show_fields(items, self.ROLE_FIELDS)
-
-        raw_output = self.openstack(
-            'role list '
-            '--project %(project)s '
-            '--user %(user)s '
-            '' % {'project': project_name,
-                  'user': username})
-        items = self.parse_listing(raw_output)
-        self.assert_table_structure(items, common.BASIC_LIST_HEADERS)
-        self.assertEqual(1, len(items))
-
     def test_role_show(self):
         role_name = self._create_dummy_role()
         raw_output = self.openstack('role show %s' % role_name)
diff --git a/openstackclient/tests/functional/identity/v3/test_role.py b/openstackclient/tests/functional/identity/v3/test_role.py
index fb9e0614..38bfff71 100644
--- a/openstackclient/tests/functional/identity/v3/test_role.py
+++ b/openstackclient/tests/functional/identity/v3/test_role.py
@@ -31,47 +31,6 @@ class RoleTests(common.IdentityTests):
         items = self.parse_listing(raw_output)
         self.assert_table_structure(items, common.BASIC_LIST_HEADERS)
 
-    def test_role_list_with_user_project(self):
-        role_name = self._create_dummy_role()
-        username = self._create_dummy_user()
-        raw_output = self.openstack(
-            'role add '
-            '--project %(project)s '
-            '--project-domain %(project_domain)s '
-            '--user %(user)s '
-            '--user-domain %(user_domain)s '
-            '%(role)s' % {'project': self.project_name,
-                          'project_domain': self.domain_name,
-                          'user': username,
-                          'user_domain': self.domain_name,
-                          'role': role_name})
-        self.addCleanup(
-            self.openstack,
-            'role remove '
-            '--project %(project)s '
-            '--project-domain %(project_domain)s '
-            '--user %(user)s '
-            '--user-domain %(user_domain)s '
-            '%(role)s' % {'project': self.project_name,
-                          'project_domain': self.domain_name,
-                          'user': username,
-                          'user_domain': self.domain_name,
-                          'role': role_name})
-        self.assertEqual(0, len(raw_output))
-        raw_output = self.openstack(
-            'role list '
-            '--project %(project)s '
-            '--project-domain %(project_domain)s '
-            '--user %(user)s '
-            '--user-domain %(user_domain)s '
-            '' % {'project': self.project_name,
-                  'project_domain': self.domain_name,
-                  'user': username,
-                  'user_domain': self.domain_name})
-        items = self.parse_listing(raw_output)
-        self.assert_table_structure(items, common.BASIC_LIST_HEADERS)
-        self.assertEqual(1, len(items))
-
     def test_role_show(self):
         role_name = self._create_dummy_role()
         raw_output = self.openstack('role show %s' % role_name)