Fix describe and delete

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

diff --git a/heat/api/v1/stacks.py b/heat/api/v1/stacks.py
index 1378b147a75e9d453c8a54ac781db16956e4b2d6..10210fa4230db6bb0660b63fdee98cecebda36d3 100644 (file)
--- a/heat/api/v1/stacks.py
+++ b/heat/api/v1/stacks.py
@@ -70,10 +70,9 @@ class StackController(object):
         stack_list = rpc.call(con, 'engine',
                               {'method': 'show_stack',
                                'args': {'stack_name': req.params['StackName']}})
-        stack_list = c.show_stack(req.params['StackName'])
         res = {'DescribeStacksResult': {'Stacks': [] } }
         stacks = res['DescribeStacksResult']['Stacks']
-        for s in stack_list:
+        for s in stack_list['stacks']:
             mem = {'member': s}
             stacks.append(mem)
 
@@ -157,12 +156,17 @@ class StackController(object):
         """
         Returns the following information for all stacks:
         """
-        logger.info('in api delete ')
         con = context.get_admin_context()
 
-        return rpc.call(con, 'engine',
-                        {'method': 'delete_stack',
-                         'args': {'stack_name': req.params['StackName']}})
+        res = rpc.call(con, 'engine',
+                       {'method': 'delete_stack',
+                        'args': {'stack_name': req.params['StackName']}})
+
+        if res == None:
+            return {'DeleteStackResult': ''}
+        else:
+            return {'DeleteStackResult': res['Error']}
+
 
     def events_list(self, req):
         """

diff --git a/heat/engine/manager.py b/heat/engine/manager.py
index bf36722699c2b6839f56a1d94c34bbd348259ce0..373fd49eec6859d75e2aab01223d421a5d52e101 100644 (file)
--- a/heat/engine/manager.py
+++ b/heat/engine/manager.py
@@ -84,10 +84,6 @@ class EngineManager(manager.Manager):
                 mem['TemplateDescription'] = 'No description'
                 mem['StackStatus'] = 'unknown'
             res['stacks'].append(mem)
-        else:
-            #return webob.exc.HTTPNotFound('No stack by that name')
-                       #TODO
-                       pass
 
         return res