"version" section should be required in template

Adding the version checking to keep place with heat.

Change-Id: Ib2f0b55c3c9e8b0a8f26e972b37a979d8d703f7c
Closes-Bug: #1273980

1 files changed, 5 insertions, 18 deletions

diff --git a/heatclient/common/template_format.py b/heatclient/common/template_format.py
index 0a7432f..2600449 100644
--- a/heatclient/common/template_format.py
+++ b/heatclient/common/template_format.py
@@ -59,22 +59,9 @@ def parse(tmpl_str):
         else:
             if tpl is None:
                 tpl = {}
-            if u'heat_template_version' not in tpl:
-                default_for_missing(tpl, u'HeatTemplateFormatVersion',
-                                    HEAT_VERSIONS)
+    # Looking for supported version keys in the loaded template
+    if not ('HeatTemplateFormatVersion' in tpl
+            or 'heat_template_version' in tpl
+            or 'AWSTemplateFormatVersion' in tpl):
+        raise ValueError("Template format version not found.")
     return tpl
-
-
-def default_for_missing(tpl, version_param, versions):
-    '''Checks a parsed template for missing version and sections.
-
-    This is currently only applied to YAML templates.
-    '''
-    # if version is missing, implicitly use the lastest one
-    if version_param not in tpl:
-        tpl[version_param] = versions[-1]
-
-    # create empty placeholders for any of the main dict sections
-    for param in (u'Parameters', u'Mappings', u'Resources', u'Outputs'):
-        if param not in tpl:
-            tpl[param] = {}