search for: string_of_doc

...Fifth Floor, Boston, MA 02110-1301 USA. + *) + +(* This file tests the JSON module. *) + +open OUnit + +(* Utils. *) +let assert_equal_string = assert_equal ~printer:(fun x -> x) + +(* "basic" suite. *) +let test_empty () = + let doc = [] in + assert_equal_string "{}" (JSON.string_of_doc doc); + assert_equal_string "{ +}" (JSON.string_of_doc ~fmt:JSON.Indented doc) + +let test_string () = + let doc = [ "test_string", JSON.String "foo"; ] in + assert_equal_string "{ \"test_string\": \"foo\" }" + (JSON.string_of_doc do...

--- mllib/common_utils_tests.ml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/mllib/common_utils_tests.ml b/mllib/common_utils_tests.ml index 09d5c51..283e9a1 100644 --- a/mllib/common_utils_tests.ml +++ b/mllib/common_utils_tests.ml @@ -27,6 +27,7 @@ let prog = "common_utils_tests" let assert_equal_string = assert_equal ~printer:(fun x -> x) let

...+18,19 @@ (* This file tests the JSON module. *) -open OUnit +open OUnit2 (* Utils. *) let assert_equal_string = assert_equal ~printer:(fun x -> x) (* "basic" suite. *) -let test_empty () = +let test_empty ctx = let doc = [] in assert_equal_string "{}" (JSON.string_of_doc doc); assert_equal_string "{ }" (JSON.string_of_doc ~fmt:JSON.Indented doc) -let test_string () = +let test_string ctx = let doc = [ "test_string", JSON.String "foo"; ] in assert_equal_string "{ \"test_string\": \"foo\" }"...

...4; + + let json = [ + "file.driver", JSON.String "null-co"; + "file.size", JSON.String "1E"; + ] in + + let cmd = + sprintf "qemu-img convert -n -f raw -O raw %s json:%s >/dev/null%s" + (quote tmp) + (quote (JSON.string_of_doc ~fmt:JSON.Compact json)) + (if verbose () then "" else " 2>&1") in + debug "%s" cmd; + let r = 0 = Sys.command cmd in + Unix.unlink tmp; + debug "qemu-img supports the null-co device: %b" r; + r + class output_null = + (* Create a tem...

...t;\012" "\\f" in + let str = replace_str str "\n" "\\n" in + let str = replace_str str "\r" "\\r" in + let str = replace_str str "\t" "\\t" in + let str = replace_str str "\011" "\\v" in + str + +let string_of_doc fields = + "{ " ^ + String.concat ", " ( + List.map ( + function + | (n, String v) -> + sprintf "\"%s\" : \"%s\"" n (json_quote v) + | (n, Int v) -> + sprintf "\"%s\" : %d" n...

...) filenames + | Some {pr} -> + let json = [ + "type", JSON.String "data"; + "data", JSON.Dict [ + "saved_overlays", + JSON.List (List.map (fun s -> JSON.String s) filenames); + ] + ] in + pr "%s\n" (JSON.string_of_doc json) (* Request guest caps based on source configuration. *) and rcaps_from_source source = -- 2.23.0

Not tested yet, am running the tests now. Rich.

...let json = [ "message", JSON.String msg; - "timestamp", JSON.String (c_rfc3999_date_time_string ()); + "timestamp", JSON.String (c_rfc3339_date_time_string ()); "type", JSON.String msgtype; ] in pr "%s\n" (JSON.string_of_doc ~fmt:JSON.Compact json) diff --git a/lib/guestfs.pod b/lib/guestfs.pod index 3c1d635c5..af944ddb7 100644 --- a/lib/guestfs.pod +++ b/lib/guestfs.pod @@ -3295,7 +3295,7 @@ within a single line, below it is indented for readability): C<type> can be: C<message> for progress messages, C&lt...

An evolution of: https://www.redhat.com/archives/libguestfs/2018-August/msg00155.html

...or_if_libvirt_backend (); error_if_no_ssh_agent (); @@ -88,8 +87,7 @@ object | None -> json_params | Some user -> ("file.user", JSON.String user) :: json_params in - if verbose () then - printf "ssh: json parameters: %s\n" (JSON.string_of_doc json_params); + debug "ssh: json parameters: %s" (JSON.string_of_doc json_params); (* Turn the JSON parameters into a 'json:' protocol string. *) let qemu_uri = "json: " ^ JSON.string_of_doc json_params in diff --git a/v2v/input_libvirtxml.ml b...

...let json = [ > + "type", JSON.String "data"; > + "data", JSON.Dict [ > + "saved_overlays", > + JSON.List (List.map (fun s -> JSON.String s) filenames); > + ] > + ] in > + pr "%s\n" (JSON.string_of_doc json) > > (* Request guest caps based on source configuration. *) > and rcaps_from_source source = > -- > 2.23.0 -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-top is...

Add a Common_utils.debug function for printing messages only when in verbose mode. Rich.

...None + (* List of disk UUIDs. *) + val mutable disks_uuids = [] method precheck () = Python_script.error_unless_python_interpreter_found (); @@ -374,23 +376,21 @@ If the messages above are not sufficient to diagnose the problem then add the TargetURI ("json:" ^ JSON.string_of_doc json_params) ) overlays - method create_metadata source targets _ guestcaps inspect target_firmware = - (* Get the UUIDs of each disk image. These files are written - * out by the nbdkit plugins on successful finalization of the + method disk_copied t i nr_disks = + (* Get the U...

...han in + if run_command ~stdout_fd:fd !cmd <> 0 then + error (f_"qemu-img measure failed, see earlier errors"); + (* Note that run_command closes fd. *) + + let json = json_parser_tree_parse_file json in + debug "qemu-img measure output parsed as: %s" + (JSON.string_of_doc ~fmt:JSON.Indented ["", json]); + + (* We're expecting the tree to contain nodes: + * Dict [ "required", Int number; "fully-allocated", Int number ] + * Of course the array could appear in any order. + *) + object_get_number "required" json diff -...

...measure failed, see earlier errors"); + (* Note that run_command closes fd. *) + + let json = read_whole_file json in + debug "qemu-img measure output: %s" json; + let json = json_parser_tree_parse json in + debug "qemu-img measure output parsed as: %s" + (JSON.string_of_doc ~fmt:JSON.Indented ["", json]); + + (* We're expecting the tree to contain nodes: + * Dict [ "required", Int number; "fully-allocated", Int number ] + * Of course the array could appear in any order. + *) + object_get_number "required" json diff -...

On Fri, Mar 22, 2019 at 04:33:41PM +0100, Pino Toscano wrote: > Enhance the helper printf function for machine readable output to always > flush after each string: this way, readers of the machine readable > stream can get the output as soon as it is outputted. > --- > common/mltools/tools_utils.ml | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff

v6: - Make the text output a bit nicer. - Changes as suggested to Measure_disk module temp file & json parsing. - Use jq to test JSON output. - Retest.

..."size", JSON.Int 512; + "file", JSON.Dict [ + "filename", JSON.String tmp2 + ] + ] + ] in + + let cmd = + sprintf "qemu-img create %s -f qcow2 -b 'json:%s'%s" + (quote tmp1) + (quote (JSON.string_of_doc ~fmt:JSON.Compact json)) + (if verbose () then "" else " >/dev/null 2>&1") in + + let r = Sys.command cmd in + + Unix.unlink tmp1; + Unix.unlink tmp2; + + r = 0 let find_file_in_tar tar filename = let lines = external_command (sprintf "tar tRv...

v5: - Normal output modified approx as suggested in previous email. - Machine readable output uses JSON.

...dir // t.target_overlay.ov_sd in - { t with target_file = target_file } - ) targets + let json_params = [ + "file.driver", JSON.String "null-co"; + "file.size", JSON.String "1E"; + ] in + let target_file = "json:" ^ JSON.string_of_doc json_params in + (* XXX It's not really right to set target_format here, but + * it works. + *) + let target_format = "raw" in + List.map (fun t -> { t with target_file; target_format }) targets method create_metadata _ _ _ _ _ _ = () + + (* Stops the main pr...