From: Zane Bitter <zbitter@redhat.com>
Date: Tue, 15 Jan 2013 12:42:56 +0000 (+0100)
Subject: Add a convenience method for deleting nested stacks
X-Git-Tag: 2014.1~1007
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=aa871513c46a2ff5f19fbf51f93b0ee9e88e2681;p=openstack-build%2Fheat-build.git

Add a convenience method for deleting nested stacks

Add a convenience method to the stack.Stack abstract resource class for
deleting the underlying nested stack.

Change-Id: Ic91b1ebb2f358e40d9e201264944924045a1b044
Signed-off-by: Zane Bitter <zbitter@redhat.com>
---

diff --git a/heat/engine/resources/stack.py b/heat/engine/resources/stack.py
index 2d1d7491..db99b438 100644
--- a/heat/engine/resources/stack.py
+++ b/heat/engine/resources/stack.py
@@ -63,6 +63,15 @@ class Stack(resource.Resource):
         if self._nested.state != self._nested.CREATE_COMPLETE:
             raise exception.Error(self._nested.state_description)
 
+    def delete_nested(self):
+        try:
+            stack = self.nested()
+        except exception.NotFound:
+            logger.info("Stack not found to delete")
+        else:
+            if stack is not None:
+                stack.delete()
+
     def get_output(self, op):
         stack = self.nested()
         if not stack:
@@ -90,13 +99,7 @@ class NestedStack(Stack):
         return self.UPDATE_REPLACE
 
     def handle_delete(self):
-        try:
-            stack = self.nested()
-        except exception.NotFound:
-            logger.info("Stack not found to delete")
-        else:
-            if stack is not None:
-                stack.delete()
+        self.delete_nested()
 
     def FnGetRefId(self):
         return self.nested().identifier().arn()