openstack/deb-heat
Code Issues Proposed changes

Merge "Set nested_depth when creating Stack from db"

Browse Source
This commit is contained in:
Jenkins 2016-06-14 12:25:16 +00:00 committed by Gerrit Code Review
commit 9722a78840
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
heat/engine/stack.py
View File

@ -528,7 +528,8 @@ class Stack(collections.Mapping):
username=stack.username, convergence=stack.convergence, username=stack.username, convergence=stack.convergence,
current_traversal=stack.current_traversal, current_traversal=stack.current_traversal,
prev_raw_template_id=stack.prev_raw_template_id, prev_raw_template_id=stack.prev_raw_template_id,
current_deps=stack.current_deps, cache_data=cache_data) current_deps=stack.current_deps, cache_data=cache_data,
nested_depth=stack.nested_depth)
def get_kwargs_for_cloning(self, keep_status=False, only_db=False): def get_kwargs_for_cloning(self, keep_status=False, only_db=False):
"""Get common kwargs for calling Stack() for cloning. """Get common kwargs for calling Stack() for cloning.

3
heat/tests/test_stack.py
View File

@ -386,7 +386,8 @@ class StackTest(common.HeatTestCase):
convergence=False, convergence=False,
current_traversal=self.stack.current_traversal, current_traversal=self.stack.current_traversal,
prev_raw_template_id=None, prev_raw_template_id=None,
current_deps=None, cache_data=None) current_deps=None, cache_data=None,
nested_depth=0)
self.m.ReplayAll() self.m.ReplayAll()
stack.Stack.load(self.ctx, stack_id=self.stack.id) stack.Stack.load(self.ctx, stack_id=self.stack.id)