From 84c04e38731d2d49e55f754e5ffeeb117c8b74f2 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Tue, 18 Sep 2012 13:28:49 +0100 Subject: [PATCH] heat engine : convert stack resource to physical_resource_name Covert stack.Stack to use physical_resource_name or nested stack references are not fully-qualified Ref #241 Change-Id: I6e38a7de5af5fe79ddc62cfee9dfe26cae30df6c Signed-off-by: Steven Hardy --- heat/engine/stack.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/heat/engine/stack.py b/heat/engine/stack.py index a3af810cbc..189f5b8216 100644 --- a/heat/engine/stack.py +++ b/heat/engine/stack.py @@ -60,7 +60,8 @@ class Stack(Resource): Handle the creation of the nested stack from a given JSON template. ''' template = parser.Template(child_template) - params = parser.Parameters(self.name, template, self._params()) + params = parser.Parameters(self.physical_resource_name(), template, + self._params()) self._nested = parser.Stack(self.context, self.physical_resource_name(), @@ -93,8 +94,8 @@ class Stack(Resource): def FnGetAtt(self, key): if not key.startswith('Outputs.'): - raise exception.InvalidTemplateAttribute(resource=self.name, - key=key) + raise exception.InvalidTemplateAttribute( + resource=self.physical_resource_name(), key=key) prefix, dot, op = key.partition('.') stack = self.nested() @@ -102,7 +103,7 @@ class Stack(Resource): # This seems like a hack, to get past validation return '' if op not in stack.outputs: - raise exception.InvalidTemplateAttribute(resource=self.name, - key=key) + raise exception.InvalidTemplateAttribute( + resource=self.physical_resource_name(), key=key) return stack.output(op)