summaryrefslogtreecommitdiff
path: root/cinderclient/v3
diff options
context:
space:
mode:
authorwhoami-rajat <rajatdhasmana@gmail.com>2018-12-26 07:26:10 +0000
committerwhoami-rajat <rajatdhasmana@gmail.com>2019-02-18 14:34:35 +0530
commit532aef0c738edc937dbfa1b54efd8d7773af2204 (patch)
treef25241d00646a56ec045c2577e60d70a7a1b58b3 /cinderclient/v3
parent3c143d95b3b270f77bf9fa55c16ae06505fe107c (diff)
downloadpython-cinderclient-532aef0c738edc937dbfa1b54efd8d7773af2204.tar.gz
Fix: cinder group-list not working with non-admin user
The all_tenants filter is passed to API when it's value is 0 (when not specified) which shouldn't be the case. This patch only allows adding of all_tenants when specified manually by user. Change-Id: Ic7810c4d6e9f4be7c28c7a8778d57bb5ccb996a0 Closes-Bug: #1808621 Closes-Bug: #1808622
Diffstat (limited to 'cinderclient/v3')
-rw-r--r--cinderclient/v3/shell.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/cinderclient/v3/shell.py b/cinderclient/v3/shell.py
index 1de0a3f..3573ff2 100644
--- a/cinderclient/v3/shell.py
+++ b/cinderclient/v3/shell.py
@@ -1291,7 +1291,7 @@ def do_manageable_list(cs, args):
nargs='?',
type=int,
const=1,
- default=utils.env('ALL_TENANTS', default=0),
+ default=utils.env('ALL_TENANTS', default=None),
help='Shows details for all tenants. Admin only.')
@utils.arg('--filters',
type=six.text_type,
@@ -1566,7 +1566,7 @@ def do_group_list_replication_targets(cs, args):
nargs='?',
type=int,
const=1,
- default=0,
+ default=utils.env('ALL_TENANTS', default=None),
help='Shows details for all tenants. Admin only.')
@utils.arg('--status',
metavar='<status>',
@@ -1590,10 +1590,8 @@ def do_group_list_replication_targets(cs, args):
def do_group_snapshot_list(cs, args):
"""Lists all group snapshots."""
- all_tenants = int(os.environ.get("ALL_TENANTS", args.all_tenants))
-
search_opts = {
- 'all_tenants': all_tenants,
+ 'all_tenants': args.all_tenants,
'status': args.status,
'group_id': args.group_id,
}