diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-07-31 22:30:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-07-31 22:30:12 +0000 |
| commit | f293027815f43371b1133fcdf6283c6a19530556 (patch) | |
| tree | 56ddcea45b5bc53ed99881a444b96cd88cec9348 /openstackclient/volume/v1 | |
| parent | 0f63f46a07fcb58fe325e3034eedeffc4a15ad8b (diff) | |
| parent | 7d138b94eccdc30487d3aa95c8bd6338933eefe6 (diff) | |
| download | python-openstackclient-0.2.alpha1.tar.gz | |
Merge "Remove tenant round 3 - other commands"0.2.alpha1
Diffstat (limited to 'openstackclient/volume/v1')
| -rw-r--r-- | openstackclient/volume/v1/volume.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/openstackclient/volume/v1/volume.py b/openstackclient/volume/v1/volume.py index 97f8d31d..c6690fd6 100644 --- a/openstackclient/volume/v1/volume.py +++ b/openstackclient/volume/v1/volume.py @@ -179,10 +179,10 @@ class ListVolume(lister.Lister): help='Filter results by name', ) parser.add_argument( - '--all-tenants', + '--all-projects', action='store_true', default=False, - help='Display information from all tenants (admin only)', + help='Include all projects (admin only)', ) parser.add_argument( '--long', @@ -232,7 +232,7 @@ class ListVolume(lister.Lister): 'Attached', ) search_opts = { - 'all_tenants': parsed_args.all_tenants, + 'all_tenants': parsed_args.all_projects, 'display_name': parsed_args.name, 'status': parsed_args.status, } @@ -322,7 +322,11 @@ class ShowVolume(show.ShowOne): volume._info.update( {'properties': utils.format_dict(volume._info.pop('metadata'))} ) - + if 'os-vol-tenant-attr:tenant_id' in volume._info: + volume._info.update( + {'project_id': volume._info.pop( + 'os-vol-tenant-attr:tenant_id')} + ) return zip(*sorted(six.iteritems(volume._info))) |