Add functional tests and examples for merge

merge.py is undocumented and untested, which is undesirable, as it does
not seem to be going away any time soon.

Change-Id: I7e4870e58a32c567e5947b9a48893b8210ad4d65

3 files changed, 50 insertions, 0 deletions

diff --git a/examples/lib.yaml b/examples/lib.yaml
new file mode 100644
index 00000000..e527d83f
--- /dev/null
+++ b/examples/lib.yaml
@@ -0,0 +1,11 @@
+Parameters:
+  ImportantValue:
+  Default: a_default
+  Type: String
+Resources:
+  GenericB:
+    Type: OS::Nova::Server
+    Properties:
+      image: {Ref: BImage}
+    Metadata:
+      my_meta: {Ref: ImportantValue}
diff --git a/examples/source.yaml b/examples/source.yaml
new file mode 100644
index 00000000..89707a7b
--- /dev/null
+++ b/examples/source.yaml
@@ -0,0 +1,15 @@
+Parameters:
+  SourceImage:
+  Type: String
+  Default: my_image
+Resources:
+  A:
+    Type: OS::Nova::Server
+    Properties:
+      image: {Ref: SourceImage}
+  B:
+    Type: FileInclude
+    Path: examples/lib.yaml
+    SubKey: Resources.GenericB
+    Parameters:
+      ImportantValue: {'Fn::Join': [ '', ['one', 'two', 'three']]}
diff --git a/examples/source_lib_result.yaml b/examples/source_lib_result.yaml
new file mode 100644
index 00000000..a165cabf
--- /dev/null
+++ b/examples/source_lib_result.yaml
@@ -0,0 +1,24 @@
+Description: examples/source.yaml
+HeatTemplateFormatVersion: '2012-12-12'
+Parameters:
+  AImage: null
+  Default: my_image
+  Type: String
+Resources:
+  A:
+    Properties:
+      image:
+        Ref: AImage
+    Type: OS::Nova::Server
+  B:
+    Metadata:
+      my_meta:
+        Fn::Join:
+        - ''
+        - - one
+          - two
+          - three
+    Properties:
+      image:
+        Ref: BImage
+    Type: OS::Nova::Server