openstack
/
python-cinderclient
Code Issues Proposed changes

Merge "Fix: cinder group-list not working with non-admin user"

This commit is contained in:
Zuul 2019-02-25 23:09:27 +00:00 committed by Gerrit Code Review
parent 0ca31c0425 532aef0c73
commit dc6e24f7d7
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cinderclient/tests/unit/v3/test_shell.py
View File

@ -140,28 +140,28 @@ class ShellTest(utils.TestCase):
{'command':
'group-list --filters name=456',
'expected':
'/groups/detail?all_tenants=0&name=456'},
'/groups/detail?name=456'},
{'command':
'group-list --filters status=available',
'expected':
'/groups/detail?all_tenants=0&status=available'},
'/groups/detail?status=available'},
{'command':
'group-list --filters name~=456',
'expected':
'/groups/detail?all_tenants=0&name~=456'},
'/groups/detail?name~=456'},
# testcases for list group-snapshot
{'command':
'group-snapshot-list --status=error --filters status=available',
'expected':
'/group_snapshots/detail?all_tenants=0&status=available'},
'/group_snapshots/detail?status=available'},
{'command':
'group-snapshot-list --filters availability_zone=123',
'expected':
'/group_snapshots/detail?all_tenants=0&availability_zone=123'},
'/group_snapshots/detail?availability_zone=123'},
{'command':
'group-snapshot-list --filters status~=available',
'expected':
'/group_snapshots/detail?all_tenants=0&status~=available'},
'/group_snapshots/detail?status~=available'},
# testcases for list message
{'command':
'message-list --event_id=123 --filters event_id=456',
@ -632,7 +632,7 @@ class ShellTest(utils.TestCase):
def test_group_list(self):
self.run_command('--os-volume-api-version 3.13 group-list')
self.assert_called_anytime('GET', '/groups/detail?all_tenants=0')
self.assert_called_anytime('GET', '/groups/detail')
def test_group_list__with_all_tenant(self):
self.run_command(
@ -692,7 +692,7 @@ class ShellTest(utils.TestCase):
def test_group_snapshot_list(self):
self.run_command('--os-volume-api-version 3.14 group-snapshot-list')
self.assert_called_anytime('GET',
'/group_snapshots/detail?all_tenants=0')
'/group_snapshots/detail')
def test_group_snapshot_show(self):
self.run_command('--os-volume-api-version 3.14 '

8
cinderclient/v3/shell.py
View File

@ -1324,7 +1324,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,
@ -1599,7 +1599,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>',
@ -1623,10 +1623,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,
}