Standardise resource names in Invalid Attribute errors

These should always refer to the resource name in the template (i.e.
logical resource name), and never the physcial resource name (since these
errors necessarily occur during validation, before any physical resource is
created).

Change-Id: I6cf6625cf32a90acb27adc6348695c086dc5e119

diff --git a/heat/engine/resources/stack.py b/heat/engine/resources/stack.py
index c745c1f405745a3f6f8f58f5b37d8817c57ee169..4366f412327f07b5f17a36de7785cf9f998a5c5b 100644 (file)
--- a/heat/engine/resources/stack.py
+++ b/heat/engine/resources/stack.py
@@ -55,7 +55,7 @@ class NestedStack(stack_resource.StackResource):
     def FnGetAtt(self, key):
         if not key.startswith('Outputs.'):
             raise exception.InvalidTemplateAttribute(
-                resource=self.physical_resource_name(), key=key)
+                resource=self.name, key=key)
 
         prefix, dot, op = key.partition('.')
         return unicode(self.get_output(op))

diff --git a/heat/engine/resources/user.py b/heat/engine/resources/user.py
index 80059e1cbf9a555c2a768a79bc296b827f14962b..d09c9dd0b2f0da0227e03e63df1c89309816f16b 100644 (file)
--- a/heat/engine/resources/user.py
+++ b/heat/engine/resources/user.py
@@ -93,7 +93,7 @@ class User(resource.Resource):
     def FnGetAtt(self, key):
         #TODO(asalkeld) Implement Arn attribute
         raise exception.InvalidTemplateAttribute(
-            resource=self.physical_resource_name(), key=key)
+            resource=self.name, key=key)
 
     def access_allowed(self, resource_name):
         policies = (self.properties['Policies'] or [])

diff --git a/heat/engine/stack_resource.py b/heat/engine/stack_resource.py
index 507c0fd7b93e32470beb025fcc4d1b5b3de44562..b09f4a2ca6281047f55aa6f1b00a75afdbee0336 100644 (file)
--- a/heat/engine/stack_resource.py
+++ b/heat/engine/stack_resource.py
@@ -103,6 +103,6 @@ class StackResource(resource.Resource):
             return None
         if op not in stack.outputs:
             raise exception.InvalidTemplateAttribute(
-                resource=self.physical_resource_name(), key=op)
+                resource=self.name, key=op)
 
         return stack.output(op)