summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--examples/source2.yaml4
-rw-r--r--examples/source2_lib_result.yaml16
-rw-r--r--examples/source_include_subkey.yaml10
-rw-r--r--examples/source_include_subkey_result.yaml14
-rw-r--r--merge.py40
-rw-r--r--test_merge.bash2
6 files changed, 84 insertions, 2 deletions
diff --git a/examples/source2.yaml b/examples/source2.yaml
new file mode 100644
index 00000000..f59f85ef
--- /dev/null
+++ b/examples/source2.yaml
@@ -0,0 +1,4 @@
+__include__:
+ path: examples/lib.yaml
+ params:
+ ImportantValue: Foo
diff --git a/examples/source2_lib_result.yaml b/examples/source2_lib_result.yaml
new file mode 100644
index 00000000..d4b19768
--- /dev/null
+++ b/examples/source2_lib_result.yaml
@@ -0,0 +1,16 @@
+Description: examples/source2.yaml
+HeatTemplateFormatVersion: '2012-12-12'
+Parameters:
+ GenericBImage:
+ Type: String
+ ImportantValue:
+ Default: a_default
+ Type: String
+Resources:
+ GenericB:
+ Metadata:
+ my_meta: Foo
+ Properties:
+ image:
+ Ref: GenericBImage
+ Type: OS::Nova::Server
diff --git a/examples/source_include_subkey.yaml b/examples/source_include_subkey.yaml
new file mode 100644
index 00000000..be344cd8
--- /dev/null
+++ b/examples/source_include_subkey.yaml
@@ -0,0 +1,10 @@
+Parameters:
+ Foo:
+ Type: String
+Resources:
+ __include__:
+ path: examples/lib.yaml
+ subkey: Resources
+ params:
+ BImage:
+ Ref: Foo
diff --git a/examples/source_include_subkey_result.yaml b/examples/source_include_subkey_result.yaml
new file mode 100644
index 00000000..f5ff80ea
--- /dev/null
+++ b/examples/source_include_subkey_result.yaml
@@ -0,0 +1,14 @@
+Description: examples/source_include_subkey.yaml
+HeatTemplateFormatVersion: '2012-12-12'
+Parameters:
+ GenericBImage:
+ Type: String
+Resources:
+ GenericB:
+ Metadata:
+ my_meta:
+ Ref: ImportantValue
+ Properties:
+ image:
+ Ref: GenericBImage
+ Type: OS::Nova::Server
diff --git a/merge.py b/merge.py
index 166359bd..3b7d2dd3 100644
--- a/merge.py
+++ b/merge.py
@@ -35,7 +35,7 @@ def resolve_params(item, param, value):
if isinstance(item, dict):
copy_item = dict(item)
for k, v in iter(copy_item.items()):
- item[k] = resolve_params(v, param, value)
+ item[k] = resolve_params(v, param, value)
elif isinstance(item, list):
copy_item = list(item)
new_item = []
@@ -50,12 +50,48 @@ MERGABLE_TYPES = {'OS::Nova::Server':
{'image': 'ImageId'},
}
+
+def resolve_includes(template, params=None):
+ new_template = {}
+ if params is None:
+ params = {}
+ for key, value in iter(template.items()):
+ if key == '__include__':
+ new_params = dict(params) # do not propagate up the stack
+ if not isinstance(value, dict):
+ raise ValueError('__include__ must be a mapping')
+ if 'path' not in value:
+ raise ValueError('__include__ must have path')
+ if 'params' in value:
+ if not isinstance(value['params'], dict):
+ raise ValueError('__include__ params must be a mapping')
+ new_params.update(value['params'])
+ with open(value['path']) as include_file:
+ sub_template = yaml.safe_load(include_file.read())
+ if 'subkey' in value:
+ if ((not isinstance(value['subkey'], int)
+ and not isinstance(sub_template, dict))):
+ raise RuntimeError('subkey requires mapping root or'
+ ' integer for list root')
+ sub_template = sub_template[value['subkey']]
+ for k, v in iter(new_params.items()):
+ sub_template = resolve_params(sub_template, k, v)
+ new_template.update(resolve_includes(sub_template))
+ else:
+ if isinstance(value, dict):
+ new_template[key] = resolve_includes(value)
+ else:
+ new_template[key] = value
+ return new_template
+
errors = []
end_template={'HeatTemplateFormatVersion': '2012-12-12',
'Description': []}
resource_changes=[]
for template_path in templates:
template = yaml.safe_load(open(template_path))
+ # Resolve __include__ tags
+ template = resolve_includes(template)
end_template['Description'].append(template.get('Description',
template_path))
new_parameters = template.get('Parameters', {})
@@ -160,7 +196,7 @@ def fix_ref(item, old, new):
for change in resource_changes:
fix_ref(end_template, change[0], change[1])
-
+
if errors:
for e in errors:
sys.stderr.write("ERROR: %s\n" % e)
diff --git a/test_merge.bash b/test_merge.bash
index 004a613e..0eeb2262 100644
--- a/test_merge.bash
+++ b/test_merge.bash
@@ -24,6 +24,8 @@ run_test() {
}
echo
run_test "python merge.py examples/source.yaml" examples/source_lib_result.yaml
+run_test "python merge.py examples/source2.yaml" examples/source2_lib_result.yaml
+run_test "python merge.py examples/source_include_subkey.yaml" examples/source_include_subkey_result.yaml
echo
trap - EXIT
exit $fail