diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-08 09:09:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-08 09:09:26 +0000 |
| commit | ef33132c3967acc32719202351102010e68f9fd1 (patch) | |
| tree | 6520ba910c47cf4e6f6f9ea78e77c9392b60659a /openstackclient/identity | |
| parent | 51ae8c78b913a72826f8409e84155148986b7b09 (diff) | |
| parent | 94a8805a9a96daa2ada2b38db1fac86e06525620 (diff) | |
| download | python-openstackclient-ef33132c3967acc32719202351102010e68f9fd1.tar.gz | |
Merge "Inherited info/option when listing role assignment"
Diffstat (limited to 'openstackclient/identity')
| -rw-r--r-- | openstackclient/identity/v3/role_assignment.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/openstackclient/identity/v3/role_assignment.py b/openstackclient/identity/v3/role_assignment.py index 92168498..169c6cb9 100644 --- a/openstackclient/identity/v3/role_assignment.py +++ b/openstackclient/identity/v3/role_assignment.py @@ -64,12 +64,12 @@ class ListRoleAssignment(lister.Lister): help='Project to filter (name or ID)', ) common.add_project_domain_option_to_parser(parser) - + common.add_inherited_option_to_parser(parser) return parser def _as_tuple(self, assignment): return (assignment.role, assignment.user, assignment.group, - assignment.project, assignment.domain) + assignment.project, assignment.domain, assignment.inherited) def take_action(self, parsed_args): self.log.debug('take_action(%s)' % parsed_args) @@ -115,14 +115,17 @@ class ListRoleAssignment(lister.Lister): effective = True if parsed_args.effective else False self.log.debug('take_action(%s)' % parsed_args) - columns = ('Role', 'User', 'Group', 'Project', 'Domain') + columns = ('Role', 'User', 'Group', 'Project', 'Domain', 'Inherited') + + inherited_to = 'projects' if parsed_args.inherited else None data = identity_client.role_assignments.list( domain=domain, user=user, group=group, project=project, role=role, - effective=effective) + effective=effective, + os_inherit_extension_inherited_to=inherited_to) data_parsed = [] for assignment in data: @@ -139,6 +142,9 @@ class ListRoleAssignment(lister.Lister): assignment.domain = '' assignment.project = '' + inherited = scope.get('OS-INHERIT:inherited_to') == 'projects' + assignment.inherited = inherited + del assignment.scope if hasattr(assignment, 'user'): |