ReST API: Improve format of resource_types response

Wrap the list in a JSON object for consistency with other APIs, both in
Heat and the rest of OpenStack.

Change-Id: I626f1c2446416c8e869fdc7d4f3772ec6c6d191c
Signed-off-by: Zane Bitter <zbitter@redhat.com>

diff --git a/heat/api/openstack/v1/stacks.py b/heat/api/openstack/v1/stacks.py
index b6d693ec9db95551f4774e392c113f08404c03c3..70894f472747f73602480d3463ce25fba76ebdce 100644 (file)
--- a/heat/api/openstack/v1/stacks.py
+++ b/heat/api/openstack/v1/stacks.py
@@ -316,7 +316,7 @@ class StackController(object):
         except rpc_common.RemoteError as ex:
             raise exc.HTTPInternalServerError(explanation=str(ex))
 
-        return types
+        return {'resource_types': types}
 
 
 def create_resource(options):

diff --git a/heat/tests/test_api_openstack_v1.py b/heat/tests/test_api_openstack_v1.py
index 4511762aaad776ea4c49dd8a0694cefb3709aed3..e65447611f13812a3ab9220cb27bf281bce15c4a 100644 (file)
--- a/heat/tests/test_api_openstack_v1.py
+++ b/heat/tests/test_api_openstack_v1.py
@@ -809,7 +809,7 @@ class StackControllerTest(ControllerTest, unittest.TestCase):
         self.m.ReplayAll()
         response = self.controller.list_resource_types(req,
                                                        tenant_id=self.tenant)
-        self.assertEqual(response, engine_response)
+        self.assertEqual(response, {'resource_types': engine_response})
         self.m.VerifyAll()
 
     def test_list_resource_types_error(self):