diff options
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/tests/volume/v2/fakes.py | 28 | ||||
| -rw-r--r-- | openstackclient/volume/v2/volume.py | 10 |
2 files changed, 36 insertions, 2 deletions
diff --git a/openstackclient/tests/volume/v2/fakes.py b/openstackclient/tests/volume/v2/fakes.py index 2fc5c8ff..cfc58bb4 100644 --- a/openstackclient/tests/volume/v2/fakes.py +++ b/openstackclient/tests/volume/v2/fakes.py @@ -17,6 +17,7 @@ import mock import random import uuid +from openstackclient.common import utils as common_utils from openstackclient.tests import fakes from openstackclient.tests.identity.v3 import fakes as identity_fakes from openstackclient.tests.image.v2 import fakes as image_fakes @@ -56,8 +57,31 @@ VOLUME = { "attachments": volume_attachments } -VOLUME_columns = tuple(sorted(VOLUME)) -VOLUME_data = tuple((VOLUME[x] for x in sorted(VOLUME))) +VOLUME_columns = ( + "attachments", + "availability_zone", + "description", + "id", + "name", + "properties", + "size", + "snapshot_id", + "status", + "type" +) + +VOLUME_data = ( + volume_attachments, + volume_availability_zone, + volume_description, + volume_id, + volume_name, + common_utils.format_dict(volume_metadata), + volume_size, + volume_snapshot_id, + volume_status, + volume_type +) snapshot_id = "cb2d364e-4d1c-451a-8c68-b5bbcb340fb2" diff --git a/openstackclient/volume/v2/volume.py b/openstackclient/volume/v2/volume.py index 436ec689..87affd07 100644 --- a/openstackclient/volume/v2/volume.py +++ b/openstackclient/volume/v2/volume.py @@ -394,6 +394,16 @@ class ShowVolume(command.ShowOne): volume_client = self.app.client_manager.volume volume = utils.find_resource(volume_client.volumes, parsed_args.volume) + # Special mapping for columns to make the output easier to read: + # 'metadata' --> 'properties' + # 'volume_type' --> 'type' + volume._info.update( + { + 'properties': utils.format_dict(volume._info.pop('metadata')), + 'type': volume._info.pop('volume_type'), + }, + ) + # Remove key links from being displayed volume._info.pop("links", None) return zip(*sorted(six.iteritems(volume._info))) |