heat db : fix per-object delete

Fixes problem where per-resource destroy() operations do not
delete the underlying database row because the model delete
method is broken

Change-Id: I3562c9048f8d4e54c1ea51090e74abe982ffb330
Signed-off-by: Steven Hardy <shardy@redhat.com>

diff --git a/heat/db/sqlalchemy/models.py b/heat/db/sqlalchemy/models.py
index c92bf13117636b67f1943f9f66c767bd8f9e39a3..63ec8ad95842ac37cc23783592e4875d25dc4bae 100644 (file)
--- a/heat/db/sqlalchemy/models.py
+++ b/heat/db/sqlalchemy/models.py
@@ -81,7 +81,12 @@ class HeatBase(object):
         """Delete this object."""
         self.deleted = True
         self.deleted_at = timeutils.utcnow()
-        self.save(session=session)
+        if not session:
+            session = Session.object_session(self)
+            if not session:
+                session = get_session()
+        session.delete(self)
+        session.flush()
 
     def __setitem__(self, key, value):
         setattr(self, key, value)