search for: dump_response

The first commit removes the --dcpath parameter, which just makes the following stuff simpler. Since libvirt has supported getting datacenterpath from VMware since Oct 2015, it's time to drop this hairy parameter. The rest is quite a complicated series of refactorings, followed by a very simple change to add handling of snapshots taken from old virt-v2v. Rich.

Patch 1 was previously posted here: https://www.redhat.com/archives/libguestfs/2020-June/msg00086.html to handle this bug: https://bugzilla.redhat.com/show_bug.cgi?id=1848862 I was able to observe this bug and for me at least disabling readahead seems to cure it. Patches 2 and 3 are simplifications, removing a now-undocumented feature of virt-v2v-copy-to-local and thus simplifying greatly the

See earlier thread on libvir-list: https://www.redhat.com/archives/libvir-list/2015-September/thread.html#00201 Libvirt >= 1.2.20 supplies the correct dcPath parameter. If it is available in the libvirt XML, use it, otherwise fall back to the old method of trying to guess it from the vpx:// path. Patches 1, 2 and 4 are just refactoring around this change. Rich.

.../vCenter.ml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/v2v/vCenter.ml b/v2v/vCenter.ml index c28a4ced..4c128b0c 100644 --- a/v2v/vCenter.ml +++ b/v2v/vCenter.ml @@ -190,7 +190,9 @@ and fetch_headers_from_url password_file uri sslverify https_url = | [] -> dump_response stderr; error (f_"vcenter: no status code in output of ‘curl’ command. Is ‘curl’ installed?") - | ss -> String.sub (List.hd (List.rev ss)) 9 3 in + | ss -> + let s = List.hd (List.rev ss) in + String.sub s (String.index s ' ' + 1) 3 in let heade...

...enter_https: source: server %s" server; diff --git a/v2v/vCenter.ml b/v2v/vCenter.ml index 586ea3e2..33120e88 100644 --- a/v2v/vCenter.ml +++ b/v2v/vCenter.ml @@ -189,7 +189,7 @@ and fetch_headers_from_url password_file uri sslverify https_url = match statuses with | [] -> dump_response stderr; - error (f_"vcenter: no status code in output of ‘curl’ command. Is ‘curl’ installed?") + error (f_"vcenter: no status code in output of ‘curl’ command.") | ss -> let s = List.hd (List.rev ss) in String.sub s (String.index s ' '...

...+ push curl_args ("user", Some (user ^ ":" ^ password)) + ); + if not sslverify then push curl_args ("insecure", None); - let curl_h = Curl.create curl_args in + let curl_h = Curl.create !curl_args in let lines = Curl.run curl_h in let dump_response chan = -- 2.7.4

These patches add the --password-file parameter, allowing you to pass a single password via a file. https://bugzilla.redhat.com/show_bug.cgi?id=1158526 Rich.

...let get_session_cookie password scheme uri sslverify url = let curl_args = if not sslverify then ("insecure", None) :: curl_args else curl_args in - let lines = Curl.run curl_args in + let curl_h = Curl.create curl_args in + let lines = Curl.run curl_h in let dump_response chan = - Curl.print_curl_command chan curl_args; + Curl.print chan curl_h; (* Dump out the output of the command. *) List.iter (fun x -> fprintf chan "%s\n" x) lines; -- 2.7.4

...let get_session_cookie password scheme uri sslverify url = let curl_args = if not sslverify then ("insecure", None) :: curl_args else curl_args in - let lines = Curl.run curl_args in + let curl_h = Curl.create curl_args in + let lines = Curl.run curl_h in let dump_response chan = - Curl.print_curl_command chan curl_args; + Curl.print chan curl_h; (* Dump out the output of the command. *) List.iter (fun x -> fprintf chan "%s\n" x) lines; -- 2.7.4

...-ic,--if,--no-trim,--oa,--oc,--of,--on,--os,--vmtype diff --git a/v2v/vCenter.ml b/v2v/vCenter.ml index 41bdbdd01..e244ff4d5 100644 --- a/v2v/vCenter.ml +++ b/v2v/vCenter.ml @@ -86,7 +86,7 @@ let get_session_cookie password scheme uri sslverify url = if status = "404" then ( dump_response stderr; - error (f_"vcenter: URL not found: %s\n\nThe ‘--dcpath’ parameter may be useful. See the explanation in the virt-v2v(1) man page OPTIONS section.") url + error (f_"vcenter: URL not found: %s") url ); if status <> "200" then ( @@ -1...

Use -ip instead of --password-file, and various refactorings. It strikes me that we should probably deprecate and eventually remove virt-v2v-copy-to-local. With the introduction of the new SSH and VDDK transports, and with RHEL 5 Xen becoming more irrelevant, it's no longer needed. Rich.

...t;qemu-img command failed, see earlier errors"); diff --git a/v2v/vCenter.ml b/v2v/vCenter.ml index 76113b3..d41f223 100644 --- a/v2v/vCenter.ml +++ b/v2v/vCenter.ml @@ -73,7 +73,7 @@ let get_session_cookie password scheme uri sslverify url = flush chan in - if verbose () then dump_response stdout; + if verbose () then dump_response stderr; (* Look for the last HTTP/x.y NNN status code in the output. *) let status = ref "" in @@ -240,8 +240,7 @@ let map_source_to_uri readahead dcPath password uri scheme server path = | None -> json_params | Some c...

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

Move the Curl wrapper module from virt-v2v to mllib. Use the module when virt-builder issues curl calls. Rich.

v2 -> v3: - Changes to the Curl API suggested by Pino.

v1 -> v2: - Fixed the bug with precedence of if / @. - Add some imperative list operators inspired by Perl, and use those for constructing the Curl arguments, and more. Rich.

...; in - fun verbose password scheme uri sslverify url -> + fun password scheme uri sslverify url -> if !session_cookie <> "" then Some !session_cookie else ( @@ -83,7 +83,7 @@ let rec get_session_cookie = flush chan in - if verbose then dump_response stdout; + if verbose () then dump_response stdout; (* Look for the last HTTP/x.y NNN status code in the output. *) let status = ref "" in @@ -210,7 +210,7 @@ let get_datacenter uri scheme = *) let source_re = Str.regexp "^\\[\\(.*\\)\\] \\(.*\\)\\.vmdk$"...

...| None -> None in diff --git a/v2v/vCenter.ml b/v2v/vCenter.ml index f6e4288f2..468261d3d 100644 --- a/v2v/vCenter.ml +++ b/v2v/vCenter.ml @@ -85,7 +85,7 @@ let get_session_cookie password scheme uri sslverify url = let status = !status in if status = "" then ( dump_response stderr; - error (f_"vcenter: no status code in output of 'curl' command. Is 'curl' installed?") + error (f_"vcenter: no status code in output of ‘curl’ command. Is ‘curl’ installed?") ); if status = "401" then ( @@ -99,7 +99,7 @@...

.. and a lot of refactoring. https://bugzilla.redhat.com/show_bug.cgi?id=1167623 Rich.

https://bugzilla.redhat.com/show_bug.cgi?id=1167623