From 7f1cacf44d3ed9eb73320ed552c7b38cfd5b8b86 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Tue, 26 Feb 2013 16:34:28 +0000 Subject: [PATCH] heat engine : fix variable/import shadowing in service.py The resources import is shadowed by a variable declaration in validate template, which is confusing, so add a prefix to differentiate the variable from the import bug 1133434 Change-Id: Ia7c451c3a2588ddff114da9897b3bcf58e68cf0c --- heat/engine/service.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/heat/engine/service.py b/heat/engine/service.py index 889e3c3e..c00bf1a4 100644 --- a/heat/engine/service.py +++ b/heat/engine/service.py @@ -280,12 +280,12 @@ class EngineService(service.Service): return webob.exc.HTTPBadRequest(explanation=msg) tmpl = parser.Template(template) - resources = template.get('Resources', []) + tmpl_resources = template.get('Resources', []) - if not resources: + if not tmpl_resources: return {'Error': 'At least one Resources member must be defined.'} - for res in resources.values(): + for res in tmpl_resources.values(): if not res.get('Type'): return {'Error': 'Every Resources object must contain a Type member.'} -- 2.45.2