Alter output format of volume types resources

* volumes types lists now fit in with the rest of our API
* Fixes bug 934435

Change-Id: Ia67318be363230fcb2819c0df976b44f19dd0876

2 files changed, 18 insertions, 12 deletions

diff --git a/nova/tests/api/openstack/compute/contrib/test_volume_types.py b/nova/tests/api/openstack/compute/contrib/test_volume_types.py
index 843287684..b8581b99d 100644
--- a/nova/tests/api/openstack/compute/contrib/test_volume_types.py
+++ b/nova/tests/api/openstack/compute/contrib/test_volume_types.py
@@ -87,10 +87,13 @@ class VolumeTypesApiTest(test.TestCase):
         req = fakes.HTTPRequest.blank('/v2/fake/os-volume-types')
         res_dict = self.controller.index(req)
 
-        self.assertEqual(3, len(res_dict))
-        for name in ['vol_type_1', 'vol_type_2', 'vol_type_3']:
-            self.assertEqual(name, res_dict[name]['name'])
-            self.assertEqual('value1', res_dict[name]['extra_specs']['key1'])
+        self.assertEqual(3, len(res_dict['volume_types']))
+
+        expected_names = ['vol_type_1', 'vol_type_2', 'vol_type_3']
+        actual_names = map(lambda e: e['name'], res_dict['volume_types'])
+        self.assertEqual(set(actual_names), set(expected_names))
+        for entry in res_dict['volume_types']:
+            self.assertEqual('value1', entry['extra_specs']['key1'])
 
     def test_volume_types_index_no_data(self):
         self.stubs.Set(volume_types, 'get_all_types',
@@ -99,7 +102,7 @@ class VolumeTypesApiTest(test.TestCase):
         req = fakes.HTTPRequest.blank('/v2/fake/os-volume-types')
         res_dict = self.controller.index(req)
 
-        self.assertEqual(0, len(res_dict))
+        self.assertEqual(0, len(res_dict['volume_types']))
 
     def test_volume_types_show(self):
         self.stubs.Set(volume_types, 'get_volume_type',
@@ -183,7 +186,7 @@ class VolumeTypesSerializerTest(test.TestCase):
 
         # Just getting some input data
         vtypes = return_volume_types_get_all_types(None)
-        text = serializer.serialize(vtypes)
+        text = serializer.serialize({'volume_types': vtypes.values()})
 
         print text
         tree = etree.fromstring(text)
diff --git a/nova/tests/api/openstack/volume/test_types.py b/nova/tests/api/openstack/volume/test_types.py
index 8178a989e..e16d853e5 100644
--- a/nova/tests/api/openstack/volume/test_types.py
+++ b/nova/tests/api/openstack/volume/test_types.py
@@ -87,10 +87,13 @@ class VolumeTypesApiTest(test.TestCase):
         req = fakes.HTTPRequest.blank('/v2/123/os-volume-types')
         res_dict = self.controller.index(req)
 
-        self.assertEqual(3, len(res_dict))
-        for name in ['vol_type_1', 'vol_type_2', 'vol_type_3']:
-            self.assertEqual(name, res_dict[name]['name'])
-            self.assertEqual('value1', res_dict[name]['extra_specs']['key1'])
+        self.assertEqual(3, len(res_dict['volume_types']))
+
+        expected_names = ['vol_type_1', 'vol_type_2', 'vol_type_3']
+        actual_names = map(lambda e: e['name'], res_dict['volume_types'])
+        self.assertEqual(set(actual_names), set(expected_names))
+        for entry in res_dict['volume_types']:
+            self.assertEqual('value1', entry['extra_specs']['key1'])
 
     def test_volume_types_index_no_data(self):
         self.stubs.Set(volume_types, 'get_all_types',
@@ -99,7 +102,7 @@ class VolumeTypesApiTest(test.TestCase):
         req = fakes.HTTPRequest.blank('/v2/123/os-volume-types')
         res_dict = self.controller.index(req)
 
-        self.assertEqual(0, len(res_dict))
+        self.assertEqual(0, len(res_dict['volume_types']))
 
     def test_volume_types_show(self):
         self.stubs.Set(volume_types, 'get_volume_type',
@@ -140,7 +143,7 @@ class VolumeTypesSerializerTest(test.TestCase):
 
         # Just getting some input data
         vtypes = return_volume_types_get_all_types(None)
-        text = serializer.serialize(vtypes)
+        text = serializer.serialize({'volume_types': vtypes.values()})
 
         print text
         tree = etree.fromstring(text)