openstack/heat
Code Issues Proposed changes

Merge "Update template paths for environment-mapped TemplateResources"

Browse Source
This commit is contained in:
Jenkins 2015-05-07 15:56:58 +00:00 committed by Gerrit Code Review
commit 798f205a79
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,9 +50,21 @@ class TemplateResource(stack_resource.StackResource):
self.stack = stack self.stack = stack
self.validation_exception = None self.validation_exception = None
tri = stack.env.get_resource_info( tri = self._get_resource_info(json_snippet)
json_snippet['Type'],
resource_name=name, self.properties_schema = {}
self.attributes_schema = {}
# run Resource.__init__() so we can call self.nested()
super(TemplateResource, self).__init__(name, json_snippet, stack)
self.resource_info = tri
if self.validation_exception is None:
self._generate_schema(self.t)
def _get_resource_info(self, rsrc_defn):
tri = self.stack.env.get_resource_info(
rsrc_defn.resource_type,
resource_name=rsrc_defn.name,
registry_type=environment.TemplateResourceInfo) registry_type=environment.TemplateResourceInfo)
if tri is None: if tri is None:
self.validation_exception = ValueError(_( self.validation_exception = ValueError(_(
@ -66,13 +78,7 @@ class TemplateResource(stack_resource.StackResource):
else: else:
self.allowed_schemes = ('http', 'https', 'file') self.allowed_schemes = ('http', 'https', 'file')
# run Resource.__init__() so we can call self.nested() return tri
self.properties_schema = {}
self.attributes_schema = {}
super(TemplateResource, self).__init__(name, json_snippet, stack)
self.resource_info = tri
if self.validation_exception is None:
self._generate_schema(self.t)
@staticmethod @staticmethod
def get_template_file(template_name, allowed_schemes): def get_template_file(template_name, allowed_schemes):
@ -261,6 +267,7 @@ class TemplateResource(stack_resource.StackResource):
self.metadata_set(self.t.metadata()) self.metadata_set(self.t.metadata())
def handle_update(self, json_snippet, tmpl_diff, prop_diff): def handle_update(self, json_snippet, tmpl_diff, prop_diff):
self._get_resource_info(json_snippet)
self._generate_schema(json_snippet) self._generate_schema(json_snippet)
return self.update_with_template(self.child_template(), return self.update_with_template(self.child_template(),
self.child_params()) self.child_params())