Merge "Doc: don't generate empty properties fields"
This commit is contained in:
commit
d7e91a1bc3
|
@ -115,14 +115,17 @@ class ResourcePages(Directive):
|
||||||
props.append('%s: %s' % (prop_key,
|
props.append('%s: %s' % (prop_key,
|
||||||
self._prop_syntax_example(prop)))
|
self._prop_syntax_example(prop)))
|
||||||
|
|
||||||
|
props_str = ''
|
||||||
|
if props:
|
||||||
|
props_str = '''\n properties:
|
||||||
|
%s''' % ('\n '.join(props))
|
||||||
|
|
||||||
template = '''heat_template_version: 2013-05-23
|
template = '''heat_template_version: 2013-05-23
|
||||||
...
|
...
|
||||||
resources:
|
resources:
|
||||||
...
|
...
|
||||||
the_resource:
|
the_resource:
|
||||||
type: %s
|
type: %s%s''' % (self.resource_type, props_str)
|
||||||
properties:
|
|
||||||
%s''' % (self.resource_type, '\n '.join(props))
|
|
||||||
|
|
||||||
block = nodes.literal_block('', template, language="hot")
|
block = nodes.literal_block('', template, language="hot")
|
||||||
section.append(block)
|
section.append(block)
|
||||||
|
@ -137,14 +140,17 @@ resources:
|
||||||
props.append('%s: %s' % (prop_key,
|
props.append('%s: %s' % (prop_key,
|
||||||
self._prop_syntax_example(prop)))
|
self._prop_syntax_example(prop)))
|
||||||
|
|
||||||
|
props_str = ''
|
||||||
|
if props:
|
||||||
|
props_str = '''\n Properties:
|
||||||
|
%s''' % ('\n '.join(props))
|
||||||
|
|
||||||
template = '''HeatTemplateFormatVersion: '2012-12-12'
|
template = '''HeatTemplateFormatVersion: '2012-12-12'
|
||||||
...
|
...
|
||||||
Resources:
|
Resources:
|
||||||
...
|
...
|
||||||
TheResource:
|
TheResource:
|
||||||
Type: %s
|
Type: %s%s''' % (self.resource_type, props_str)
|
||||||
Properties:
|
|
||||||
%s''' % (self.resource_type, '\n '.join(props))
|
|
||||||
|
|
||||||
block = nodes.literal_block('', template, language='yaml')
|
block = nodes.literal_block('', template, language='yaml')
|
||||||
section.append(block)
|
section.append(block)
|
||||||
|
@ -159,18 +165,23 @@ Resources:
|
||||||
and prop.support_status.status == support.SUPPORTED):
|
and prop.support_status.status == support.SUPPORTED):
|
||||||
props.append('"%s": %s' % (prop_key,
|
props.append('"%s": %s' % (prop_key,
|
||||||
self._prop_syntax_example(prop)))
|
self._prop_syntax_example(prop)))
|
||||||
|
|
||||||
|
props_str = ''
|
||||||
|
if props:
|
||||||
|
props_str = ''',\n "Properties": {
|
||||||
|
%s
|
||||||
|
}''' % (',\n '.join(props))
|
||||||
|
|
||||||
template = '''{
|
template = '''{
|
||||||
"AWSTemplateFormatVersion" : "2010-09-09",
|
"AWSTemplateFormatVersion" : "2010-09-09",
|
||||||
...
|
...
|
||||||
"Resources" : {
|
"Resources" : {
|
||||||
"TheResource": {
|
"TheResource": {
|
||||||
"Type": "%s",
|
"Type": "%s"%s
|
||||||
"Properties": {
|
|
||||||
%s
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}''' % (self.resource_type, props_str)
|
||||||
}''' % (self.resource_type, ',\n '.join(props))
|
|
||||||
block = nodes.literal_block('', template, language="json")
|
block = nodes.literal_block('', template, language="json")
|
||||||
section.append(block)
|
section.append(block)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue