From: Angus Salkeld <asalkeld@redhat.com>
Date: Thu, 5 Apr 2012 00:12:44 +0000 (+1000)
Subject: Fix describe and delete
X-Git-Tag: 2014.1~2086
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d9ab5bdad44a231fa10b8a34ca31d43cea4fbd66;p=openstack-build%2Fheat-build.git

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 1378b147..10210fa4 100644
--- 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 bf367226..373fd49e 100644
--- 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