cpu-gather: Allow gathering and parsing data in one step.

Make
  ./cpu-gather.py --gather --parse
an alias of
  ./cpu-gather.py [--gather] | ./cpu-gather.py --parse

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tests/cputestdata/cpu-gather.py b/tests/cputestdata/cpu-gather.py
index fe660c486e3874afa3627feb1013127c99cf80c0..46997c8a48155ef39cc499ec8a6cea5fe987503f 100755 (executable)
--- a/tests/cputestdata/cpu-gather.py
+++ b/tests/cputestdata/cpu-gather.py
@@ -282,9 +282,7 @@ def output_json(data, filename):
             f.write("\n")
 
 
-def parse(args):
-    data = json.load(sys.stdin)
-
+def parse(data):
     filename = parse_filename(data)
     filename_xml = "{}.xml".format(filename)
     filename_json = "{}.json".format(filename)
@@ -320,16 +318,16 @@ def main():
         help="Path to qemu. "
         "If unset, will try '/usr/bin/qemu-system-x86_64', "
         "'/usr/bin/qemu-kvm', and '/usr/libexec/qemu-kvm'.")
-
-    mode = parser.add_mutually_exclusive_group()
-    mode.add_argument(
+    parser.add_argument(
         "--gather",
         action="store_true",
-        help="Acquire data on target system. This is the default.")
-    mode.add_argument(
+        help="Acquire data on target system. This is the default. "
+        "If '--parse' is not set, outputs data on stdout.")
+    parser.add_argument(
         "--parse",
         action="store_true",
-        help="Parse data for libvirt use.")
+        help="Parse data for libvirt use. "
+        "If '--gather' is not set, expects input on stdin.")
 
     args = parser.parse_args()
 
@@ -348,9 +346,13 @@ def main():
 
     if args.gather:
         data = gather(args)
-        json.dump(data, sys.stdout, indent=2)
-    else:
-        parse(args)
+        if not args.parse:
+            json.dump(data, sys.stdout, indent=2)
+
+    if args.parse:
+        if not args.gather:
+            data = json.load(sys.stdin)
+        parse(data)
 
 
 if __name__ == "__main__":