diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-20 21:03:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-20 21:03:29 +0000 |
| commit | 7442c018d2b52cc88372ecc966436a88fe7c96ac (patch) | |
| tree | cd6d0582c4f47186122dc180606c125f82fb99f4 /openstackclient | |
| parent | 061e0a36700d0ed1d9711d54d3cd0a0486ca701a (diff) | |
| parent | a6d5f3f94cb5d709c593c9638f44b3519222b4ca (diff) | |
| download | python-openstackclient-7442c018d2b52cc88372ecc966436a88fe7c96ac.tar.gz | |
Merge "Format volume type properties when showing"
Diffstat (limited to 'openstackclient')
| -rw-r--r-- | openstackclient/tests/volume/v2/fakes.py | 11 | ||||
| -rw-r--r-- | openstackclient/tests/volume/v2/test_type.py | 4 | ||||
| -rw-r--r-- | openstackclient/volume/v2/volume_type.py | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/openstackclient/tests/volume/v2/fakes.py b/openstackclient/tests/volume/v2/fakes.py index 4f5f9cfd..c896ed6d 100644 --- a/openstackclient/tests/volume/v2/fakes.py +++ b/openstackclient/tests/volume/v2/fakes.py @@ -93,6 +93,17 @@ TYPE = { TYPE_columns = tuple(sorted(TYPE)) TYPE_data = tuple((TYPE[x] for x in sorted(TYPE))) +formatted_type_properties = "foo='bar'" +TYPE_FORMATTED = { + 'id': type_id, + 'name': type_name, + 'description': type_description, + 'properties': formatted_type_properties +} +TYPE_FORMATTED_columns = tuple(sorted(TYPE_FORMATTED)) +TYPE_FORMATTED_data = tuple((TYPE_FORMATTED[x] for x in + sorted(TYPE_FORMATTED))) + backup_id = "3c409fe6-4d03-4a06-aeab-18bdcdf3c8f4" backup_volume_id = "bdbae8dc-e6ca-43c0-8076-951cc1b093a4" backup_name = "fake_backup" diff --git a/openstackclient/tests/volume/v2/test_type.py b/openstackclient/tests/volume/v2/test_type.py index 6cc988b2..a6e91e8d 100644 --- a/openstackclient/tests/volume/v2/test_type.py +++ b/openstackclient/tests/volume/v2/test_type.py @@ -51,8 +51,8 @@ class TestTypeShow(TestType): columns, data = self.cmd.take_action(parsed_args) self.types_mock.get.assert_called_with(volume_fakes.type_id) - self.assertEqual(volume_fakes.TYPE_columns, columns) - self.assertEqual(volume_fakes.TYPE_data, data) + self.assertEqual(volume_fakes.TYPE_FORMATTED_columns, columns) + self.assertEqual(volume_fakes.TYPE_FORMATTED_data, data) class TestTypeDelete(TestType): diff --git a/openstackclient/volume/v2/volume_type.py b/openstackclient/volume/v2/volume_type.py index ae5cc8b8..c724d867 100644 --- a/openstackclient/volume/v2/volume_type.py +++ b/openstackclient/volume/v2/volume_type.py @@ -65,4 +65,6 @@ class ShowVolumeType(show.ShowOne): volume_client = self.app.client_manager.volume volume_type = utils.find_resource( volume_client.volume_types, parsed_args.volume_type) + properties = utils.format_dict(volume_type._info.pop('extra_specs')) + volume_type._info.update({'properties': properties}) return zip(*sorted(six.iteritems(volume_type._info))) |