From afd08e07b50203d85f9967a13883f9a4a939784d Mon Sep 17 00:00:00 2001 From: Anant Patil Date: Thu, 11 Feb 2016 11:22:38 +0530 Subject: [PATCH] Convergence: Avoid cache when resolving input data While constructing input-data for building the cache, the resource attributes must resolve without hitting the cache again. It is unnecessary to look into cache for resolving attributes of a freshly baked resource. Change-Id: I0893c17d87c687ca5cf370c4443f471160bd2f3c --- heat/engine/worker.py | 6 +++--- heat/tests/engine/test_engine_worker.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/heat/engine/worker.py b/heat/engine/worker.py index 11be888399..be3f23d0c4 100644 --- a/heat/engine/worker.py +++ b/heat/engine/worker.py @@ -334,15 +334,15 @@ def construct_input_data(rsrc, curr_stack): for attr in attributes: try: if isinstance(attr, six.string_types): - resolved_attributes[attr] = rsrc.FnGetAtt(attr) + resolved_attributes[attr] = rsrc.get_attribute(attr) else: - resolved_attributes[attr] = rsrc.FnGetAtt(*attr) + resolved_attributes[attr] = rsrc.get_attribute(*attr) except exception.InvalidTemplateAttribute as ita: LOG.info(six.text_type(ita)) input_data = {'id': rsrc.id, 'name': rsrc.name, - 'reference_id': rsrc.FnGetRefId(), + 'reference_id': rsrc.get_reference_id(), 'attrs': resolved_attributes, 'status': rsrc.status, 'action': rsrc.action, diff --git a/heat/tests/engine/test_engine_worker.py b/heat/tests/engine/test_engine_worker.py index e3243cb878..5d50f9593e 100644 --- a/heat/tests/engine/test_engine_worker.py +++ b/heat/tests/engine/test_engine_worker.py @@ -621,7 +621,7 @@ class MiscMethodsTest(common.HeatTestCase): 'uuid': mock.ANY, 'action': mock.ANY, 'status': mock.ANY} - self.resource.FnGetAtt = mock.Mock( + self.resource.get_attribute = mock.Mock( side_effect=exception.InvalidTemplateAttribute(resource='A', key='value')) actual_input_data = worker.construct_input_data(self.resource,