Merge "Evaluate --inherited in role list"

Author: Jenkins

openstackclient/identity/v3/role.py

@@ -260,6 +260,7 @@ def take_action(self, parsed_args):
             data = identity_client.roles.list(
                 user=user,
                 domain=domain,
+                os_inherit_extension_inherited=parsed_args.inherited
             )
             for user_role in data:
                 user_role.user = user.name
@@ -269,6 +270,7 @@ def take_action(self, parsed_args):
             data = identity_client.roles.list(
                 user=user,
                 project=project,
+                os_inherit_extension_inherited=parsed_args.inherited
             )
             for user_role in data:
                 user_role.user = user.name
@@ -278,12 +280,14 @@ def take_action(self, parsed_args):
             data = identity_client.roles.list(
                 user=user,
                 domain='default',
+                os_inherit_extension_inherited=parsed_args.inherited
             )
         elif parsed_args.group and parsed_args.domain:
             columns = ('ID', 'Name', 'Domain', 'Group')
             data = identity_client.roles.list(
                 group=group,
                 domain=domain,
+                os_inherit_extension_inherited=parsed_args.inherited
             )
             for group_role in data:
                 group_role.group = group.name
@@ -293,6 +297,7 @@ def take_action(self, parsed_args):
             data = identity_client.roles.list(
                 group=group,
                 project=project,
+                os_inherit_extension_inherited=parsed_args.inherited
             )
             for group_role in data:
                 group_role.group = group.name

openstackclient/tests/identity/v3/test_role.py

@@ -383,6 +383,7 @@ def test_user_list_user(self):
         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(
@@ -415,6 +416,7 @@ def test_role_list_domain_user(self):
         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(
@@ -449,6 +451,7 @@ def test_role_list_domain_group(self):
         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(
@@ -483,6 +486,7 @@ def test_role_list_project_user(self):
         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(
@@ -517,6 +521,7 @@ def test_role_list_project_group(self):
         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(