openstack
/
heat
Code Issues Proposed changes

Merge "Don't query raw_template in stacks uselessly"

This commit is contained in:
Jenkins 2016-11-17 01:07:35 +00:00 committed by Gerrit Code Review
parent ac0f0cda46 c59865870b
commit 8625175277
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
heat/objects/stack.py
View File

@ -66,11 +66,15 @@ class Stack(
def _from_db_object(context, stack, db_stack):
for field in stack.fields:
if field == 'raw_template':
stack['raw_template'] = (
raw_template.RawTemplate.from_db_object(
context,
raw_template.RawTemplate(),
db_stack['raw_template']))
raw_template_obj = db_stack.__dict__.get('raw_template')
if raw_template_obj is not None:
# Object is already lazy loaded
raw_template_obj = (
raw_template.RawTemplate.from_db_object(
context,
raw_template.RawTemplate(),
raw_template_obj))
stack['raw_template'] = raw_template_obj
else:
stack[field] = db_stack.__dict__.get(field)
stack._context = context