Merge "Use template_format.parse for local stack parsing"

1 files changed, 18 insertions, 15 deletions

diff --git a/heatclient/v1/shell.py b/heatclient/v1/shell.py
index 87dca4f..5c0774b 100644
--- a/heatclient/v1/shell.py
+++ b/heatclient/v1/shell.py
@@ -17,6 +17,7 @@ import os
 import urllib
 import yaml
 
+from heatclient.common import template_format
 from heatclient.common import utils
 from heatclient.openstack.common import jsonutils
 from heatclient.openstack.common.py3kcompat import urlutils
@@ -27,31 +28,33 @@ import heatclient.exc as exc
 def _set_template_fields(hc, args, fields):
     if args.template_file:
         tpl = open(args.template_file).read()
-        if tpl.startswith('{'):
-            try:
-                fields['template'] = jsonutils.loads(tpl)
-            except ValueError as e:
-                raise exc.CommandError(
-                    "Cannot parse template file: %s" % e)
-        else:
-            fields['template'] = tpl
-    elif args.template_url:
+        try:
+            fields['template'] = template_format.parse(tpl)
+        except ValueError as e:
+            raise exc.CommandError(
+                "Cannot parse template file: %s" % e)
+        return args.template_file
+
+    if args.template_url:
         fields['template_url'] = args.template_url
-    elif args.template_object:
+        return args.template_url
+
+    if args.template_object:
         template_body = hc.http_client.raw_request('GET', args.template_object)
         if template_body:
             try:
-                fields['template'] = jsonutils.loads(template_body)
+                fields['template'] = template_format.parse(template_body)
             except ValueError as e:
                 raise exc.CommandError(
                     "Cannot parse template file: %s" % e)
         else:
             raise exc.CommandError('Could not fetch template from %s'
                                    % args.template_object)
-    else:
-        raise exc.CommandError('Need to specify exactly one of '
-                               '--template-file, --template-url '
-                               'or --template-object')
+        return args.template_object
+
+    raise exc.CommandError('Need to specify exactly one of '
+                           '--template-file, --template-url '
+                           'or --template-object')
 
 
 def _get_file_contents(resource_registry, fields, base_url='',