From 25568e75c335fb3deef534d17853c6496f9911c1 Mon Sep 17 00:00:00 2001
From: Tomas Sedovic <tomas@sedovic.cz>
Date: Thu, 3 May 2012 16:33:53 +0200
Subject: [PATCH] Fix cfn-get-metadata params and output

Marked the `--stack` and `--resource` parameters as required and set it to
actually write the metadata out.

Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>
---
 heat/cfntools/cfn-get-metadata | 12 ++++++++++--
 heat/cfntools/cfn_helper.py    |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/heat/cfntools/cfn-get-metadata b/heat/cfntools/cfn-get-metadata
index 9a9468b8..61a078cc 100755
--- a/heat/cfntools/cfn-get-metadata
+++ b/heat/cfntools/cfn-get-metadata
@@ -34,11 +34,11 @@ parser = argparse.ArgumentParser(description=description)
 parser.add_argument('-s', '--stack',
         dest="stack_name",
         help="A Heat stack name",
-        required=False)
+        required=True)
 parser.add_argument('-r', '--resource',
         dest="logical_resource_id",
         help="A Heat logical resource ID",
-        required=False)
+        required=True)
 parser.add_argument('--access-key',
         dest="access_key",
         help="A Keystone access key",
@@ -65,6 +65,14 @@ parser.add_argument('-k', '--key',
         required=False)
 args = parser.parse_args()
 
+if not args.stack_name:
+    print 'The Stack name must not be empty.'
+    exit(1)
+
+if not args.logical_resource_id:
+    print 'The Resource ID must not be empty'
+    exit(1)
+
 log_format = '%(levelname)s [%(asctime)s] %(message)s'
 logging.basicConfig(format=log_format, level=logging.DEBUG)
 
diff --git a/heat/cfntools/cfn_helper.py b/heat/cfntools/cfn_helper.py
index 5322cb36..24bfbb9d 100644
--- a/heat/cfntools/cfn_helper.py
+++ b/heat/cfntools/cfn_helper.py
@@ -767,7 +767,7 @@ class Metadata(object):
             self._metadata = self._data
 
     def __str__(self):
-        return self._metadata
+        return json.dumps(self._metadata)
 
     def _is_valid_metadata(self):
         """
-- 
2.45.2