Set Stack id to None when deleted

If a Stack object has been removed from the database, we should reset its
ID to None so that if the object is used further, it will not be assumed
that it is represented in the database.

Change-Id: Iaa7e9327324f101487847362973bd7f8386ce44b

diff --git a/heat/engine/parser.py b/heat/engine/parser.py
index 81c782fc6fd8a97c8ea622a92cd0b677dca2fb80..d11c76050a21c936038fe03844f2815d5c2b4262 100644 (file)
--- a/heat/engine/parser.py
+++ b/heat/engine/parser.py
@@ -525,6 +525,7 @@ class Stack(object):
             elif action == self.ROLLBACK:
                 self.state_set(self.ROLLBACK_COMPLETE, 'Rollback completed')
             db_api.stack_delete(self.context, self.id)
+            self.id = None
 
     def output(self, key):
         '''

diff --git a/heat/tests/utils.py b/heat/tests/utils.py
index fed91f67d0f0a51821f77ef3f1ca250560aebfa3..3b5d5ffdb3101949ee679836f2feaaca3fc57f78 100644 (file)
--- a/heat/tests/utils.py
+++ b/heat/tests/utils.py
@@ -45,7 +45,8 @@ def stack_delete_after(test_fn):
             test_fn(test_cls)
         finally:
             try:
-                test_cls.stack.delete()
+                if test_cls.stack.id is not None:
+                    test_cls.stack.delete()
             except AttributeError:
                 pass
     return wrapped_test