openstack/python-cinderclient
Code Issues Proposed changes

Merge "Add tenant uuid when running cinder list --all-tenants"

Browse Source
This commit is contained in:
Jenkins
2014-07-30 19:01:34 +00:00
committed by Gerrit Code Review
parent b4acbd2586 ae04b4b099
commit 172d0ea018
3 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cinderclient/tests/v1/test_shell.py
View File

@@ -95,6 +95,16 @@ class ShellTest(utils.TestCase):
args = Arguments(metadata=input[0])
self.assertEqual(shell_v1._extract_metadata(args), input[1])
def test_translate_volume_keys(self):
cs = fakes.FakeClient()
v = cs.volumes.list()[0]
setattr(v, 'os-vol-tenant-attr:tenant_id', 'fake_tenant')
setattr(v, '_info', {'attachments': [{'server_id': 1234}],
'id': 1234, 'name': 'sample-volume',
'os-vol-tenant-attr:tenant_id': 'fake_tenant'})
shell_v1._translate_volume_keys([v])
self.assertEqual(v.tenant_id, 'fake_tenant')
@httpretty.activate
def test_list(self):
self.register_keystone_auth_fixture()

12
cinderclient/v1/shell.py
View File

@@ -101,7 +101,8 @@ def _translate_keys(collection, convert):
def _translate_volume_keys(collection):
convert = [('displayName', 'display_name'), ('volumeType', 'volume_type')]
convert = [('displayName', 'display_name'), ('volumeType', 'volume_type'),
('os-vol-tenant-attr:tenant_id', 'tenant_id')]
_translate_keys(collection, convert)
@@ -179,8 +180,13 @@ def do_list(cs, args):
for vol in volumes:
servers = [s.get('server_id') for s in vol.attachments]
setattr(vol, 'attached_to', ','.join(map(str, servers)))
utils.print_list(volumes, ['ID', 'Status', 'Display Name',
'Size', 'Volume Type', 'Bootable', 'Attached to'])
if all_tenants:
key_list = ['ID', 'Tenant ID', 'Status', 'Display Name',
'Size', 'Volume Type', 'Bootable', 'Attached to']
else:
key_list = ['ID', 'Status', 'Display Name',
'Size', 'Volume Type', 'Bootable', 'Attached to']
utils.print_list(volumes, key_list)
@utils.arg('volume', metavar='<volume>', help='Volume name or ID.')

12
cinderclient/v2/shell.py
View File

@@ -97,7 +97,8 @@ def _translate_keys(collection, convert):
def _translate_volume_keys(collection):
convert = [('volumeType', 'volume_type')]
convert = [('volumeType', 'volume_type'),
('os-vol-tenant-attr:tenant_id', 'tenant_id')]
_translate_keys(collection, convert)
@@ -177,8 +178,13 @@ def do_list(cs, args):
servers = [s.get('server_id') for s in vol.attachments]
setattr(vol, 'attached_to', ','.join(map(str, servers)))
utils.print_list(volumes, ['ID', 'Status', 'Name',
'Size', 'Volume Type', 'Bootable', 'Attached to'])
if all_tenants:
key_list = ['ID', 'Tenant ID', 'Status', 'Name',
'Size', 'Volume Type', 'Bootable', 'Attached to']
else:
key_list = ['ID', 'Status', 'Name',
'Size', 'Volume Type', 'Bootable', 'Attached to']
utils.print_list(volumes, key_list)
@utils.arg('volume',