openstack/python-openstackclient
Code Issues Proposed changes

Format volume type properties when showing

Browse Source 
Currently, the properties of a volume type are unformatted.
Use the formatter to keep things consistent with the way
properties are represented in OSC.

Change-Id: I81c6bd3fdbc30568c269e501c740473b2a1ffb4e
This commit is contained in:
Steve Martinelli
2015-07-19 17:36:34 -07:00
parent 469ba41b51
commit a6d5f3f94c
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
openstackclient/tests/volume/v2/fakes.py
View File

@@ -93,6 +93,17 @@ TYPE = {
TYPE_columns = tuple(sorted(TYPE)) TYPE_columns = tuple(sorted(TYPE))
TYPE_data = tuple((TYPE[x] for x in 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_id = "3c409fe6-4d03-4a06-aeab-18bdcdf3c8f4"
backup_volume_id = "bdbae8dc-e6ca-43c0-8076-951cc1b093a4" backup_volume_id = "bdbae8dc-e6ca-43c0-8076-951cc1b093a4"
backup_name = "fake_backup" backup_name = "fake_backup"

4
openstackclient/tests/volume/v2/test_type.py
View File

@@ -51,8 +51,8 @@ class TestTypeShow(TestType):
columns, data = self.cmd.take_action(parsed_args) columns, data = self.cmd.take_action(parsed_args)
self.types_mock.get.assert_called_with(volume_fakes.type_id) self.types_mock.get.assert_called_with(volume_fakes.type_id)
self.assertEqual(volume_fakes.TYPE_columns, columns) self.assertEqual(volume_fakes.TYPE_FORMATTED_columns, columns)
self.assertEqual(volume_fakes.TYPE_data, data) self.assertEqual(volume_fakes.TYPE_FORMATTED_data, data)
class TestTypeDelete(TestType): class TestTypeDelete(TestType):

2
openstackclient/volume/v2/volume_type.py
View File

@@ -65,4 +65,6 @@ class ShowVolumeType(show.ShowOne):
volume_client = self.app.client_manager.volume volume_client = self.app.client_manager.volume
volume_type = utils.find_resource( volume_type = utils.find_resource(
volume_client.volume_types, parsed_args.volume_type) 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))) return zip(*sorted(six.iteritems(volume_type._info)))