RPC API: Clean up show_stack results

Just return a list, rather than wrapping it in an object. The client API
processes can (and do) do whatever wrapping they need.

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

diff --git a/heat/api/cfn/v1/stacks.py b/heat/api/cfn/v1/stacks.py
index 15b630e8461b09779c6b6acdbb340386f15bba45..31adeb944edf89f2bb8c7c67d979205ac4a0a86f 100644 (file)
--- a/heat/api/cfn/v1/stacks.py
+++ b/heat/api/cfn/v1/stacks.py
@@ -214,7 +214,7 @@ class StackController(object):
         except rpc_common.RemoteError as ex:
             return exception.map_remote_error(ex)
 
-        res = {'Stacks': [format_stack(s) for s in stack_list['stacks']]}
+        res = {'Stacks': [format_stack(s) for s in stack_list]}
 
         return api_utils.format_response('DescribeStacks', res)
 

diff --git a/heat/api/openstack/v1/stacks.py b/heat/api/openstack/v1/stacks.py
index 70894f472747f73602480d3463ce25fba76ebdce..ab80f3299067bfd7650dbe43307bd9acbfc0abe7 100644 (file)
--- a/heat/api/openstack/v1/stacks.py
+++ b/heat/api/openstack/v1/stacks.py
@@ -220,10 +220,10 @@ class StackController(object):
         except rpc_common.RemoteError as ex:
             return util.remote_error(ex)
 
-        if not stack_list['stacks']:
+        if not stack_list:
             raise exc.HTTPInternalServerError()
 
-        stack = stack_list['stacks'][0]
+        stack = stack_list[0]
 
         return {'stack': format_stack(req, stack)}
 

diff --git a/heat/engine/service.py b/heat/engine/service.py
index b4fb9957fcf3df2f8c082b73f8d19349a92f7dff..ac864ca1a4973560aff696467f80cf2a023f592c 100644 (file)
--- a/heat/engine/service.py
+++ b/heat/engine/service.py
@@ -155,7 +155,7 @@ class EngineService(service.Service):
             stack = parser.Stack.load(context, stack=s)
             return api.format_stack(stack)
 
-        return {'stacks': [format_stack_detail(s) for s in stacks]}
+        return [format_stack_detail(s) for s in stacks]
 
     @request_context
     def list_stacks(self, context):

diff --git a/heat/tests/test_api_cfn_v1.py b/heat/tests/test_api_cfn_v1.py
index a28540902d4cba0b54fc72a5ddcdf4d6520bf5fa..0baef2c7be8667b224497220f5adbc7acb89587a 100644 (file)
--- a/heat/tests/test_api_cfn_v1.py
+++ b/heat/tests/test_api_cfn_v1.py
@@ -159,32 +159,31 @@ class StackControllerTest(unittest.TestCase):
         # Stub out the RPC call to the engine with a pre-canned response
         # Note the engine returns a load of keys we don't actually use
         # so this is a subset of the real response format
-        engine_resp = {u'stacks':
-                       [{u'stack_identity':
-                         {u'tenant': u't',
-                          u'stack_name': u'wordpress',
-                          u'stack_id': u'6',
-                          u'path': u''},
-                         u'updated_time': u'2012-07-09T09:13:11Z',
-                         u'parameters': {u'DBUsername': u'admin',
-                                         u'LinuxDistribution': u'F17',
-                                         u'InstanceType': u'm1.large',
-                                         u'DBRootPassword': u'admin',
-                                         u'DBPassword': u'admin',
-                                         u'DBName': u'wordpress'},
-                        u'outputs':
-                        [{u'output_key': u'WebsiteURL',
-                          u'description': u'URL for Wordpress wiki',
-                          u'output_value': u'http://10.0.0.8/wordpress'}],
-                        u'stack_status_reason': u'Stack successfully created',
-                        u'creation_time': u'2012-07-09T09:12:45Z',
-                        u'stack_name': u'wordpress',
-                        u'notification_topics': [],
-                        u'stack_status': u'CREATE_COMPLETE',
-                        u'description': u'blah',
-                        u'disable_rollback': True,
-                        u'timeout_mins':60,
-                        u'capabilities':[]}]}
+        engine_resp = [{u'stack_identity':
+                        {u'tenant': u't',
+                         u'stack_name': u'wordpress',
+                         u'stack_id': u'6',
+                         u'path': u''},
+                        u'updated_time': u'2012-07-09T09:13:11Z',
+                        u'parameters': {u'DBUsername': u'admin',
+                                        u'LinuxDistribution': u'F17',
+                                        u'InstanceType': u'm1.large',
+                                        u'DBRootPassword': u'admin',
+                                        u'DBPassword': u'admin',
+                                        u'DBName': u'wordpress'},
+                       u'outputs':
+                       [{u'output_key': u'WebsiteURL',
+                         u'description': u'URL for Wordpress wiki',
+                         u'output_value': u'http://10.0.0.8/wordpress'}],
+                       u'stack_status_reason': u'Stack successfully created',
+                       u'creation_time': u'2012-07-09T09:12:45Z',
+                       u'stack_name': u'wordpress',
+                       u'notification_topics': [],
+                       u'stack_status': u'CREATE_COMPLETE',
+                       u'description': u'blah',
+                       u'disable_rollback': True,
+                       u'timeout_mins':60,
+                       u'capabilities':[]}]
 
         self.m.StubOutWithMock(rpc, 'call')
         rpc.call(dummy_req.context, self.topic,
@@ -247,31 +246,30 @@ class StackControllerTest(unittest.TestCase):
         # Stub out the RPC call to the engine with a pre-canned response
         # Note the engine returns a load of keys we don't actually use
         # so this is a subset of the real response format
-        engine_resp = {u'stacks':
-                       [{u'stack_identity': {u'tenant': u't',
-                                             u'stack_name': u'wordpress',
-                                             u'stack_id': u'6',
-                                             u'path': u''},
-                         u'updated_time': u'2012-07-09T09:13:11Z',
-                         u'parameters': {u'DBUsername': u'admin',
-                                         u'LinuxDistribution': u'F17',
-                                         u'InstanceType': u'm1.large',
-                                         u'DBRootPassword': u'admin',
-                                         u'DBPassword': u'admin',
-                                         u'DBName': u'wordpress'},
-                         u'outputs':
-                         [{u'output_key': u'WebsiteURL',
-                           u'description': u'URL for Wordpress wiki',
-                           u'output_value': u'http://10.0.0.8/wordpress'}],
-                         u'stack_status_reason': u'Stack successfully created',
-                         u'creation_time': u'2012-07-09T09:12:45Z',
-                         u'stack_name': u'wordpress',
-                         u'notification_topics': [],
-                         u'stack_status': u'CREATE_COMPLETE',
-                         u'description': u'blah',
-                         u'disable_rollback': True,
-                         u'timeout_mins':60,
-                         u'capabilities':[]}]}
+        engine_resp = [{u'stack_identity': {u'tenant': u't',
+                                            u'stack_name': u'wordpress',
+                                            u'stack_id': u'6',
+                                            u'path': u''},
+                        u'updated_time': u'2012-07-09T09:13:11Z',
+                        u'parameters': {u'DBUsername': u'admin',
+                                        u'LinuxDistribution': u'F17',
+                                        u'InstanceType': u'm1.large',
+                                        u'DBRootPassword': u'admin',
+                                        u'DBPassword': u'admin',
+                                        u'DBName': u'wordpress'},
+                        u'outputs':
+                        [{u'output_key': u'WebsiteURL',
+                          u'description': u'URL for Wordpress wiki',
+                          u'output_value': u'http://10.0.0.8/wordpress'}],
+                        u'stack_status_reason': u'Stack successfully created',
+                        u'creation_time': u'2012-07-09T09:12:45Z',
+                        u'stack_name': u'wordpress',
+                        u'notification_topics': [],
+                        u'stack_status': u'CREATE_COMPLETE',
+                        u'description': u'blah',
+                        u'disable_rollback': True,
+                        u'timeout_mins':60,
+                        u'capabilities':[]}]
 
         self.m.StubOutWithMock(rpc, 'call')
         rpc.call(dummy_req.context, self.topic,

diff --git a/heat/tests/test_api_openstack_v1.py b/heat/tests/test_api_openstack_v1.py
index d702aced154e9b7fc6e0f72c185af41c78c198ad..6c728e5bc99090d9bfbd335ec395e50e2a5f11ae 100644 (file)
--- a/heat/tests/test_api_openstack_v1.py
+++ b/heat/tests/test_api_openstack_v1.py
@@ -508,25 +508,23 @@ class StackControllerTest(ControllerTest, unittest.TestCase):
                     u'description': u'URL for Wordpress wiki',
                     u'output_value': u'http://10.0.0.8/wordpress'}]
 
-        engine_resp = {
-            u'stacks': [
-                {
-                    u'stack_identity': dict(identity),
-                    u'updated_time': u'2012-07-09T09:13:11Z',
-                    u'parameters': parameters,
-                    u'outputs': outputs,
-                    u'stack_status_reason': u'Stack successfully created',
-                    u'creation_time': u'2012-07-09T09:12:45Z',
-                    u'stack_name': identity.stack_name,
-                    u'notification_topics': [],
-                    u'stack_status': u'CREATE_COMPLETE',
-                    u'description': u'blah',
-                    u'disable_rollback': True,
-                    u'timeout_mins':60,
-                    u'capabilities': [],
-                }
-            ]
-        }
+        engine_resp = [
+            {
+                u'stack_identity': dict(identity),
+                u'updated_time': u'2012-07-09T09:13:11Z',
+                u'parameters': parameters,
+                u'outputs': outputs,
+                u'stack_status_reason': u'Stack successfully created',
+                u'creation_time': u'2012-07-09T09:12:45Z',
+                u'stack_name': identity.stack_name,
+                u'notification_topics': [],
+                u'stack_status': u'CREATE_COMPLETE',
+                u'description': u'blah',
+                u'disable_rollback': True,
+                u'timeout_mins':60,
+                u'capabilities': [],
+            }
+        ]
         self.m.StubOutWithMock(rpc, 'call')
         rpc.call(req.context, self.topic,
                  {'method': 'show_stack',

diff --git a/heat/tests/test_engine_service.py b/heat/tests/test_engine_service.py
index 965c8c3844e630fd0d2f5d2247d103f67508c75e..eb3b5d161e2cd44b87fd0c57669edec4ff20e520 100644 (file)
--- a/heat/tests/test_engine_service.py
+++ b/heat/tests/test_engine_service.py
@@ -500,9 +500,9 @@ class stackServiceTest(unittest.TestCase):
     def test_stack_describe(self):
         sl = self.man.show_stack(self.ctx, self.stack_identity)
 
-        self.assertEqual(len(sl['stacks']), 1)
+        self.assertEqual(len(sl), 1)
 
-        s = sl['stacks'][0]
+        s = sl[0]
         self.assertTrue('creation_time' in s)
         self.assertTrue('updated_time' in s)
         self.assertTrue('stack_identity' in s)
@@ -518,9 +518,9 @@ class stackServiceTest(unittest.TestCase):
     def test_stack_describe_all(self):
         sl = self.man.show_stack(self.ctx, None)
 
-        self.assertEqual(len(sl['stacks']), 1)
+        self.assertEqual(len(sl), 1)
 
-        s = sl['stacks'][0]
+        s = sl[0]
         self.assertTrue('creation_time' in s)
         self.assertTrue('updated_time' in s)
         self.assertTrue('stack_identity' in s)
@@ -540,7 +540,7 @@ class stackServiceTest(unittest.TestCase):
 
         sl = self.man.show_stack(self.ctx, None)
 
-        self.assertEqual(len(sl['stacks']), 0)
+        self.assertEqual(len(sl), 0)
 
     def test_list_resource_types(self):
         resources = self.man.list_resource_types(self.ctx)