Making delete stack work

heat/db/sqlalchemy/api.py

@@ -14,6 +14,7 @@
 #    under the License.
 
 '''Implementation of SQLAlchemy backend.'''
+from sqlalchemy.orm.session import Session
 
 from nova import utils
 from heat.db.sqlalchemy import models
@@ -134,9 +135,16 @@ def stack_delete(context, stack_name):
     if not s:
         raise Exception('Attempt to delete a stack with id: %s that does not exist' % stack_name)
 
-    #for e in s.events:
-    #    e.delete()
-    s.delete()
+    session = Session.object_session(s)
+
+    for e in s.events:
+        session.delete(e)
+
+    for r in s.resources:
+        session.delete(r)
+
+    session.delete(s)
+    session.flush()
 
 def event_get(context, event_id):
     result = model_query(context, models.Event).\

heat/engine/manager.py

@@ -125,7 +125,7 @@ class EngineManager(manager.Manager):
         for r in ps.resources:
             ps.resources[r].stop()
         db_api.stack_delete(None, stack_name)
-        return list_stacks(context, stack_name, params)
+        return None 
         
     def list_events(self, context, stack_name):
         return db_api.event_get_all_by_stack(None, stack_name)