Merge lp:~cprov/tanuki-agent/api-example-contrib into lp:tanuki-agent

[Celso Providelo]

Contributed changes to allow passing JSON contents from a file.

Contributed changes to allow passing JSON contents from a file.

[Paul Larson (pwlars)]

+1 from me if that matters :)

review: Approve

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'scripts/api_example.py'
--- scripts/api_example.py	2015-08-27 21:05:54 +0000
+++ scripts/api_example.py	2015-09-29 17:44:18 +0000
@@ -6,14 +6,15 @@
   api_example.py [options] <configfile> <url>
 
 Options:
-  -h --help             Show this screen
-  -d, --data data       POST Data
-  -X method             HTTP Method
-  -v                    Verbose debug output
+  -h --help                 Show this screen
+  -d, --data data|@<file>   POST Data
+  -X method                 HTTP Method
+  -v                        Verbose debug output
 """
 
 import json
 import logging
+import os
 import sys
 
 from configparser import ConfigParser
@@ -39,7 +40,12 @@
         self.method = arguments.get('-X')
         self.url = arguments.get('<url>')
         pd = arguments.get('--data')
-        self.post_data = json.loads(pd) if pd else None
+        if pd and pd.startswith('@'):
+            # Filename specified, replace pd with data from the file
+            with open(os.path.expanduser(pd[1:])) as datafile:
+                self.post_data = json.load(datafile)
+        else:
+            self.post_data = json.loads(pd) if pd else None
 
         if arguments.get('-v'):
             logger.setLevel(logging.DEBUG)