Handle outputs with an OutputDefinition class

This is the last remaining area of the code where we were slinging around
CloudFormation-formatted snippets of template. Replace it with a proper API
along the lines of ResourceDefinition.

The default implementation of the new template.Template.outputs() method is
equivalent to what we have previously done spread throughout the code, so
that third-party Template plugins will not be affected until they have had
time to write their own custom implementations.

Change-Id: Ib65dad6db55ae5dafab473bebba67e841ca9a984

1 files changed, 4 insertions, 6 deletions

diff --git a/heat/tests/test_template.py b/heat/tests/test_template.py
index 46e243b8d..4965b3fe7 100644
--- a/heat/tests/test_template.py
+++ b/heat/tests/test_template.py
@@ -387,18 +387,16 @@ class TestTemplateConditionParser(common.HeatTestCase):
                           self.tmpl)
 
         # test condition name is invalid
-        stk.outputs['foo']['condition'] = 'invalid_cd'
+        self.tmpl.t['outputs']['foo']['condition'] = 'invalid_cd'
         ex = self.assertRaises(exception.InvalidConditionReference,
-                               self.tmpl.parse_outputs_conditions,
-                               stk.outputs, stk)
+                               lambda: stk.outputs)
         self.assertIn('Invalid condition "invalid_cd" '
                       '(in outputs.foo.condition)',
                       six.text_type(ex))
         # test condition name is not string
-        stk.outputs['foo']['condition'] = 222
+        self.tmpl.t['outputs']['foo']['condition'] = 222
         ex = self.assertRaises(exception.InvalidConditionReference,
-                               self.tmpl.parse_outputs_conditions,
-                               stk.outputs, stk)
+                               lambda: stk.outputs)
         self.assertIn('Invalid condition "222" (in outputs.foo.condition)',
                       six.text_type(ex))