openstack
/
heat
Code Issues Proposed changes

Revert "Use OutputDefinition to generate attributes schema" 

This reverts commit 85eff5fc3d.

Change-Id: I325593df0cd7a48cbc85edf7838cddbc0911b4b6
Closes-Bug: #1805589
Depends-On: https://review.openstack.org/620457
Depends-On: https://review.openstack.org/619786
This commit is contained in:
Zane Bitter 2018-11-28 12:12:07 -05:00
parent 3c86a75834
commit 614ba0a98f
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
heat/engine/attributes.py
View File

@ -200,9 +200,11 @@ class Attributes(collections.Mapping):
return outp
@staticmethod
def schema_from_outputs(outputs):
return dict((o.name, Schema(o.description()))
for o in outputs.values())
def schema_from_outputs(json_snippet):
if json_snippet:
return dict((k, Schema(v.get("Description")))
for k, v in json_snippet.items())
return {}
def _validate_type(self, attrib, value):
if attrib.schema.type == attrib.schema.STRING:

4
heat/engine/resources/stack_resource.py
View File

@ -92,8 +92,8 @@ class StackResource(resource.Resource):
return "nested_stack"
def _outputs_to_attribs(self, parsed_template):
outputs = parsed_template.outputs(None)
def _outputs_to_attribs(self, json_snippet):
outputs = json_snippet.get('Outputs')
if not self.attributes and outputs:
self.attributes_schema = (
attributes.Attributes.schema_from_outputs(outputs))

2
heat/engine/resources/template_resource.py
View File

@ -108,7 +108,7 @@ class TemplateResource(stack_resource.StackResource):
return ((properties.Properties.schema_from_params(
tmpl.param_schemata(param_defaults))),
(attributes.Attributes.schema_from_outputs(
tmpl.outputs(None))))
tmpl[tmpl.OUTPUTS])))
def _generate_schema(self):
self._parsed_nested = None