Merge "Format volume type properties when showing"

Author: Jenkins

openstackclient/tests/volume/v2/fakes.py

@@ -93,6 +93,17 @@
 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"

openstackclient/tests/volume/v2/test_type.py

@@ -51,8 +51,8 @@ def test_type_show(self):
         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):

openstackclient/volume/v2/volume_type.py

@@ -65,4 +65,6 @@ def take_action(self, parsed_args):
         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)))