Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: Allow the output to be in YAML format
......................................................................
Allow the output to be in YAML format
Because YAML is so much cooler than JSON.
Change-Id: I2a4a38939a75af94727f552c78a2fbd0efe567b6
---
M conftool/cli/tool.py
1 file changed, 11 insertions(+), 2 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/conftool/cli/tool.py b/conftool/cli/tool.py
index fff8e20..7d850aa 100644
--- a/conftool/cli/tool.py
+++ b/conftool/cli/tool.py
@@ -4,6 +4,7 @@
from collections import defaultdict
import logging
import json
+import yaml
import os
import re
import sys
@@ -54,7 +55,10 @@
all = KVObject.backend.driver.ls(cur_dir)
objlist = [k for (k, v) in all]
if self._action == "get":
- print json.dumps(dict(all))
+ if self.args.yaml:
+ print yaml.dump(dict(all), default_flow_style=False)
+ else:
+ print json.dumps(dict(all))
return []
else:
retval = objlist
@@ -183,7 +187,10 @@
dir = os.path.dirname(obj.key).replace(self.entity.base_path(), '')
tag_hosts[dir].append(obj.name)
print "The selector you chose has selected the following objects:"
- print json.dumps(tag_hosts)
+ if self.args.yaml:
+ print yaml.dump(tag_hosts, default_flow_style=False)
+ else:
+ print json.dumps(tag_hosts)
print "Ok to continue? [y/N]"
a = raw_input("confctl>")
if a.lower() != 'y':
@@ -200,6 +207,8 @@
parser.add_argument('--config', help="Config file",
default="/etc/conftool/config.yaml")
parser.add_argument('--object-type', dest="object_type",
choices=ToolCli.object_types.keys(), default='node')
+ parser.add_argument('--yaml', action="store_true",
+ default=False, help="output values in YAML")
parser.add_argument('--debug', action="store_true",
default=False, help="print debug info")
parser.add_argument('--quiet', action="store_true", dest='quiet',
--
To view, visit https://gerrit.wikimedia.org/r/288632
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a4a38939a75af94727f552c78a2fbd0efe567b6
Gerrit-PatchSet: 2
Gerrit-Project: operations/software/conftool
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
