openstack/heat
Code Issues Proposed changes

Merge "Use template directly instead of stack.tmpl"

Browse Source
This commit is contained in:
Jenkins 2014-12-08 02:35:52 +00:00 committed by Gerrit Code Review
commit 8c1da0bd8e
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/engine/stack_resource.py
View File

@ -125,7 +125,7 @@ class StackResource(resource.Resource):
parsed_child_template = child_template parsed_child_template = child_template
if isinstance(parsed_child_template, template.Template): if isinstance(parsed_child_template, template.Template):
parsed_child_template = parsed_child_template.t parsed_child_template = parsed_child_template.t
return parser.tmpl.Template(parsed_child_template, return template.Template(parsed_child_template,
files=self.stack.t.files) files=self.stack.t.files)
def _parse_nested_stack(self, stack_name, child_template, child_params, def _parse_nested_stack(self, stack_name, child_template, child_params,

4
heat/tests/test_engine_service.py
View File

@ -211,7 +211,7 @@ def get_wordpress_stack(stack_name, ctx):
def get_wordpress_stack_no_params(stack_name, ctx): def get_wordpress_stack_no_params(stack_name, ctx):
t = template_format.parse(wp_template) t = template_format.parse(wp_template)
template = parser.tmpl.Template(t) template = templatem.Template(t)
stack = parser.Stack(ctx, stack_name, template, stack = parser.Stack(ctx, stack_name, template,
environment.Environment({})) environment.Environment({}))
return stack return stack
@ -994,7 +994,7 @@ class StackServiceCreateUpdateDeleteTest(common.HeatTestCase):
s = db_api.stack_get(self.ctx, sid) s = db_api.stack_get(self.ctx, sid)
t = template_format.parse(wp_template_no_default) t = template_format.parse(wp_template_no_default)
template = parser.tmpl.Template(t) template = templatem.Template(t)
env = environment.Environment({'parameters': with_params, env = environment.Environment({'parameters': with_params,
'resource_registry': {'rsc': 'test'}}) 'resource_registry': {'rsc': 'test'}})
stack = parser.Stack(self.ctx, stack_name, template, env) stack = parser.Stack(self.ctx, stack_name, template, env)

2
heat/tests/test_stack_resource.py
View File

@ -109,7 +109,7 @@ class StackResourceTest(common.HeatTestCase):
resource._register_class('GenericResource', resource._register_class('GenericResource',
generic_rsrc.GenericResource) generic_rsrc.GenericResource)
self.ws_resname = "provider_resource" self.ws_resname = "provider_resource"
t = parser.tmpl.Template( t = templatem.Template(
{'HeatTemplateFormatVersion': '2012-12-12', {'HeatTemplateFormatVersion': '2012-12-12',
'Resources': {self.ws_resname: ws_res_snippet}}) 'Resources': {self.ws_resname: ws_res_snippet}})
self.parent_stack = parser.Stack(utils.dummy_context(), 'test_stack', self.parent_stack = parser.Stack(utils.dummy_context(), 'test_stack',

3
heat/tests/test_swiftsignal.py
View File

@ -30,6 +30,7 @@ from heat.engine import resource
from heat.engine import rsrc_defn from heat.engine import rsrc_defn
from heat.engine import scheduler from heat.engine import scheduler
from heat.engine import stack from heat.engine import stack
from heat.engine import template as templatem
from heat.tests import common from heat.tests import common
from heat.tests import utils from heat.tests import utils
@ -83,7 +84,7 @@ obj_header = {
def create_stack(template, stack_id=None): def create_stack(template, stack_id=None):
tmpl = template_format.parse(template) tmpl = template_format.parse(template)
template = stack.tmpl.Template(tmpl) template = templatem.Template(tmpl)
ctx = utils.dummy_context(tenant_id='test_tenant') ctx = utils.dummy_context(tenant_id='test_tenant')
st = stack.Stack(ctx, 'test_st', template, st = stack.Stack(ctx, 'test_st', template,
environment.Environment(), environment.Environment(),