openstack
/
heat
Code Issues Proposed changes

Merge "Use show_output in TemplateResource.get_reference_id()" into stable/pike

This commit is contained in:
Jenkins 2017-10-04 00:25:26 +00:00 committed by Gerrit Code Review
parent 537e021d3b d00f1a40f8
commit 633da7fe9f
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
heat/engine/resource.py
View File

@ -1043,9 +1043,12 @@ class Resource(status.ResourceStatus):
for e in get_attrs(out_attrs - dep_attrs, cacheable_only=True):
pass
# Calculate attribute values *before* reference ID, to potentially
# save an extra RPC call in TemplateResource
attribute_values = dict(get_attrs(dep_attrs))
return node_data.NodeData(self.id, self.name, self.uuid,
self.FnGetRefId(),
dict(get_attrs(dep_attrs)),
self.FnGetRefId(), attribute_values,
self.action, self.status)
def preview(self):

24
heat/engine/resources/template_resource.py
View File

@ -25,11 +25,14 @@ from heat.engine import environment
from heat.engine import properties
from heat.engine.resources import stack_resource
from heat.engine import template
from heat.rpc import api as rpc_api
REMOTE_SCHEMES = ('http', 'https')
LOCAL_SCHEMES = ('file',)
STACK_ID_OUTPUT = 'OS::stack_id'
def generate_class_from_template(name, data, param_defaults):
tmpl = template.Template(template_format.parse(data))
@ -300,10 +303,25 @@ class TemplateResource(stack_resource.StackResource):
if self.resource_id is None:
return six.text_type(self.name)
stack_identity = self.nested_identifier()
try:
return self.get_output('OS::stack_id')
except exception.InvalidTemplateAttribute:
return self.nested_identifier().arn()
if self._outputs is not None:
return self.get_output(STACK_ID_OUTPUT)
output = self.rpc_client().show_output(self.context,
dict(stack_identity),
STACK_ID_OUTPUT)
if rpc_api.OUTPUT_ERROR in output:
raise exception.TemplateOutputError(
resource=self.name,
attribute=STACK_ID_OUTPUT,
message=output[rpc_api.OUTPUT_ERROR])
except (exception.InvalidTemplateAttribute, exception.NotFound):
pass
else:
return output[rpc_api.OUTPUT_VALUE]
return stack_identity.arn()
def get_attribute(self, key, *path):
if self.resource_id is None: