openstack/heat
Code Issues Proposed changes

Merge "Record the updated_time for nested_stack"

Browse Source
This commit is contained in:
Jenkins
2014-11-03 15:30:57 +00:00
committed by Gerrit Code Review
parent 9bf59c7347 b3aa1058e0
commit c1b3eb22f7
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
heat/engine/stack_resource.py
View File

@@ -214,7 +214,7 @@ class StackResource(resource.Resource):
stack = self._parse_nested_stack(name, child_template, user_params, stack = self._parse_nested_stack(name, child_template, user_params,
timeout_mins) timeout_mins)
stack.parameters.set_stack_id(nested_stack.identifier()) stack.parameters.set_stack_id(nested_stack.identifier())
nested_stack.updated_time = self.updated_time
updater = scheduler.TaskRunner(nested_stack.update_task, stack) updater = scheduler.TaskRunner(nested_stack.update_task, stack)
updater.start() updater.start()
return updater return updater

7
heat/tests/test_stack_resource.py
View File

@@ -11,6 +11,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from datetime import datetime
import six import six
import uuid import uuid
@@ -379,6 +380,8 @@ class StackResourceTest(common.HeatTestCase):
new_templ = self.simple_template.copy() new_templ = self.simple_template.copy()
inst_snippet = new_templ["Resources"]["WebServer"].copy() inst_snippet = new_templ["Resources"]["WebServer"].copy()
new_templ["Resources"]["WebServer2"] = inst_snippet new_templ["Resources"]["WebServer2"] = inst_snippet
self.parent_resource.updated_time = datetime(2014, 10, 24, 15, 40)
updater = self.parent_resource.update_with_template( updater = self.parent_resource.update_with_template(
new_templ, {}) new_templ, {})
updater.run_to_completion() updater.run_to_completion()
@@ -388,11 +391,15 @@ class StackResourceTest(common.HeatTestCase):
self.assertEqual(set(["WebServer", "WebServer2"]), self.assertEqual(set(["WebServer", "WebServer2"]),
set(self.stack.keys())) set(self.stack.keys()))
self.assertIsNone(self.stack.timeout_mins) self.assertIsNone(self.stack.timeout_mins)
self.assertIsNotNone(self.stack.updated_time)
# The stack's owner_id is maintained. # The stack's owner_id is maintained.
saved_stack = parser.Stack.load( saved_stack = parser.Stack.load(
self.parent_stack.context, self.stack.id) self.parent_stack.context, self.stack.id)
self.assertEqual(self.parent_stack.id, saved_stack.owner_id) self.assertEqual(self.parent_stack.id, saved_stack.owner_id)
# Check the stack's updated_time is saved and same as the resource
self.assertEqual(self.parent_resource.updated_time,
saved_stack.updated_time)
def test_update_with_template_timeout_mins(self): def test_update_with_template_timeout_mins(self):
self.assertIsNone(self.parent_stack.timeout_mins) self.assertIsNone(self.parent_stack.timeout_mins)