Merge "Return names in list role assignments"

3 files changed, 152 insertions, 13 deletions

diff --git a/openstackclient/identity/v3/role_assignment.py b/openstackclient/identity/v3/role_assignment.py
index d766be68..e2b0fe1f 100644
--- a/openstackclient/identity/v3/role_assignment.py
+++ b/openstackclient/identity/v3/role_assignment.py
@@ -34,6 +34,11 @@ class ListRoleAssignment(command.Lister):
             metavar='<role>',
             help='Role to filter (name or ID)',
         )
+        parser.add_argument(
+            '--names',
+            action="store_true",
+            help='Display names instead of IDs',
+        )
         user_or_group = parser.add_mutually_exclusive_group()
         user_or_group.add_argument(
             '--user',
@@ -107,6 +112,7 @@ class ListRoleAssignment(command.Lister):
                 parsed_args.group_domain,
             )
 
+        include_names = True if parsed_args.names else False
         effective = True if parsed_args.effective else False
         columns = ('Role', 'User', 'Group', 'Project', 'Domain', 'Inherited')
 
@@ -118,17 +124,26 @@ class ListRoleAssignment(command.Lister):
             project=project,
             role=role,
             effective=effective,
-            os_inherit_extension_inherited_to=inherited_to)
+            os_inherit_extension_inherited_to=inherited_to,
+            include_names=include_names)
 
         data_parsed = []
         for assignment in data:
             # Removing the extra "scope" layer in the assignment json
             scope = assignment.scope
             if 'project' in scope:
-                setattr(assignment, 'project', scope['project']['id'])
+                if include_names:
+                    prj = '@'.join([scope['project']['name'],
+                                   scope['project']['domain']['name']])
+                    setattr(assignment, 'project', prj)
+                else:
+                    setattr(assignment, 'project', scope['project']['id'])
                 assignment.domain = ''
             elif 'domain' in scope:
-                setattr(assignment, 'domain', scope['domain']['id'])
+                if include_names:
+                    setattr(assignment, 'domain', scope['domain']['name'])
+                else:
+                    setattr(assignment, 'domain', scope['domain']['id'])
                 assignment.project = ''
 
             else:
@@ -141,17 +156,30 @@ class ListRoleAssignment(command.Lister):
             del assignment.scope
 
             if hasattr(assignment, 'user'):
-                setattr(assignment, 'user', assignment.user['id'])
+                if include_names:
+                    usr = '@'.join([assignment.user['name'],
+                                    assignment.user['domain']['name']])
+                    setattr(assignment, 'user', usr)
+                else:
+                    setattr(assignment, 'user', assignment.user['id'])
                 assignment.group = ''
             elif hasattr(assignment, 'group'):
-                setattr(assignment, 'group', assignment.group['id'])
+                if include_names:
+                    grp = '@'.join([assignment.group['name'],
+                                    assignment.group['domain']['name']])
+                    setattr(assignment, 'group', grp)
+                else:
+                    setattr(assignment, 'group', assignment.group['id'])
                 assignment.user = ''
             else:
                 assignment.user = ''
                 assignment.group = ''
 
             if hasattr(assignment, 'role'):
-                setattr(assignment, 'role', assignment.role['id'])
+                if include_names:
+                    setattr(assignment, 'role', assignment.role['name'])
+                else:
+                    setattr(assignment, 'role', assignment.role['id'])
             else:
                 assignment.role = ''
 
diff --git a/openstackclient/tests/identity/v3/fakes.py b/openstackclient/tests/identity/v3/fakes.py
index d0a2ef53..a06802c5 100644
--- a/openstackclient/tests/identity/v3/fakes.py
+++ b/openstackclient/tests/identity/v3/fakes.py
@@ -314,6 +314,22 @@ ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID = {
     'role': {'id': role_id},
 }
 
+ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID_INCLUDE_NAMES = {
+    'scope': {
+        'project': {
+            'domain': {'id': domain_id,
+                       'name': domain_name},
+            'id': project_id,
+            'name': project_name}},
+    'user': {
+        'domain': {'id': domain_id,
+                   'name': domain_name},
+        'id': user_id,
+        'name': user_name},
+    'role': {'id': role_id,
+             'name': role_name},
+}
+
 ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID_INHERITED = {
     'scope': {'project': {'id': project_id},
               'OS-INHERIT:inherited_to': 'projects'},
@@ -333,6 +349,19 @@ ASSIGNMENT_WITH_DOMAIN_ID_AND_USER_ID = {
     'role': {'id': role_id},
 }
 
+ASSIGNMENT_WITH_DOMAIN_ID_AND_USER_ID_INCLUDE_NAMES = {
+    'scope': {
+        'domain': {'id': domain_id,
+                   'name': domain_name}},
+    'user': {
+        'domain': {'id': domain_id,
+                   'name': domain_name},
+        'id': user_id,
+        'name': user_name},
+    'role': {'id': role_id,
+             'name': role_name},
+}
+
 ASSIGNMENT_WITH_DOMAIN_ID_AND_USER_ID_INHERITED = {
     'scope': {'domain': {'id': domain_id},
               'OS-INHERIT:inherited_to': 'projects'},
diff --git a/openstackclient/tests/identity/v3/test_role_assignment.py b/openstackclient/tests/identity/v3/test_role_assignment.py
index c7ed289b..5def7632 100644
--- a/openstackclient/tests/identity/v3/test_role_assignment.py
+++ b/openstackclient/tests/identity/v3/test_role_assignment.py
@@ -98,7 +98,8 @@ class TestRoleAssignmentList(TestRoleAssignment):
             role=None,
             user=None,
             project=None,
-            os_inherit_extension_inherited_to=None)
+            os_inherit_extension_inherited_to=None,
+            include_names=False)
 
         self.assertEqual(self.columns, columns)
         datalist = ((
@@ -145,6 +146,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
             ('role', None),
             ('effective', False),
             ('inherited', False),
+            ('names', False),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -160,7 +162,8 @@ class TestRoleAssignmentList(TestRoleAssignment):
             project=None,
             role=None,
             effective=False,
-            os_inherit_extension_inherited_to=None)
+            os_inherit_extension_inherited_to=None,
+            include_names=False)
 
         self.assertEqual(self.columns, columns)
         datalist = ((
@@ -207,6 +210,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
             ('role', None),
             ('effective', False),
             ('inherited', False),
+            ('names', False),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -222,7 +226,8 @@ class TestRoleAssignmentList(TestRoleAssignment):
             project=None,
             role=None,
             user=None,
-            os_inherit_extension_inherited_to=None)
+            os_inherit_extension_inherited_to=None,
+            include_names=False)
 
         self.assertEqual(self.columns, columns)
         datalist = ((
@@ -269,6 +274,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
             ('role', None),
             ('effective', False),
             ('inherited', False),
+            ('names', False),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -284,7 +290,8 @@ class TestRoleAssignmentList(TestRoleAssignment):
             project=None,
             role=None,
             user=None,
-            os_inherit_extension_inherited_to=None)
+            os_inherit_extension_inherited_to=None,
+            include_names=False)
 
         self.assertEqual(self.columns, columns)
         datalist = ((
@@ -331,6 +338,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
             ('role', None),
             ('effective', False),
             ('inherited', False),
+            ('names', False),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -346,7 +354,8 @@ class TestRoleAssignmentList(TestRoleAssignment):
             project=self.projects_mock.get(),
             role=None,
             user=None,
-            os_inherit_extension_inherited_to=None)
+            os_inherit_extension_inherited_to=None,
+            include_names=False)
 
         self.assertEqual(self.columns, columns)
         datalist = ((
@@ -391,6 +400,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
             ('role', None),
             ('effective', True),
             ('inherited', False),
+            ('names', False),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -406,7 +416,8 @@ class TestRoleAssignmentList(TestRoleAssignment):
             project=None,
             role=None,
             user=None,
-            os_inherit_extension_inherited_to=None)
+            os_inherit_extension_inherited_to=None,
+            include_names=False)
 
         self.assertEqual(self.columns, columns)
         datalist = ((
@@ -453,6 +464,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
             ('role', None),
             ('effective', False),
             ('inherited', True),
+            ('names', False),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
@@ -468,7 +480,8 @@ class TestRoleAssignmentList(TestRoleAssignment):
             project=None,
             role=None,
             user=None,
-            os_inherit_extension_inherited_to='projects')
+            os_inherit_extension_inherited_to='projects',
+            include_names=False)
 
         self.assertEqual(self.columns, columns)
         datalist = ((
@@ -486,3 +499,72 @@ class TestRoleAssignmentList(TestRoleAssignment):
             True
             ),)
         self.assertEqual(datalist, tuple(data))
+
+    def test_role_assignment_list_include_names(self):
+
+        self.role_assignments_mock.list.return_value = [
+            fakes.FakeResource(
+                None,
+                copy.deepcopy(
+                    identity_fakes
+                    .ASSIGNMENT_WITH_PROJECT_ID_AND_USER_ID_INCLUDE_NAMES),
+                loaded=True,
+            ),
+            fakes.FakeResource(
+                None,
+                copy.deepcopy(
+                    identity_fakes
+                    .ASSIGNMENT_WITH_DOMAIN_ID_AND_USER_ID_INCLUDE_NAMES),
+                loaded=True,
+            ),
+        ]
+
+        arglist = ['--names']
+        verifylist = [
+            ('user', None),
+            ('group', None),
+            ('domain', None),
+            ('project', None),
+            ('role', None),
+            ('effective', False),
+            ('inherited', False),
+            ('names', True),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # DisplayCommandBase.take_action() returns two tuples
+
+        # This test will not run correctly until the patch in the python
+        # client is merged. Once that is done 'data' should return the
+        # correct information
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.role_assignments_mock.list.assert_called_with(
+            domain=None,
+            group=None,
+            effective=False,
+            project=None,
+            role=None,
+            user=None,
+            os_inherit_extension_inherited_to=None,
+            include_names=True)
+
+        collist = ('Role', 'User', 'Group', 'Project', 'Domain', 'Inherited')
+        self.assertEqual(columns, collist)
+
+        datalist1 = ((
+            identity_fakes.role_name,
+            '@'.join([identity_fakes.user_name, identity_fakes.domain_name]),
+            '',
+            '@'.join([identity_fakes.project_name,
+                     identity_fakes.domain_name]),
+            '',
+            False
+        ), (identity_fakes.role_name,
+            '@'.join([identity_fakes.user_name, identity_fakes.domain_name]),
+            '',
+            '',
+            identity_fakes.domain_name,
+            False
+            ),)
+        self.assertEqual(tuple(data), datalist1)