search for: curl_arg

...nloader.ml b/builder/downloader.ml index 3c9ba18..2a3f76f 100644 --- a/builder/downloader.ml +++ b/builder/downloader.ml @@ -95,17 +95,17 @@ and download_to t ?(progress_bar = false) ~proxy uri filename = (* Get the status code first to ensure the file exists. *) let curl_h = - let curl_args = - common_args @ - (if verbose () then [] else quiet_args) @ [ - "output", Some "/dev/null"; (* Write output to /dev/null. *) - "head", None; (* Request only HEAD. *) - (* Write HTTP status code to stdout. *) -...

...to_local.ml | 14 ++++++------ v2v/vCenter.ml | 16 ++++++++------ 4 files changed, 104 insertions(+), 34 deletions(-) diff --git a/mllib/curl.ml b/mllib/curl.ml index f0af160..a684fdb 100644 --- a/mllib/curl.ml +++ b/mllib/curl.ml @@ -20,10 +20,19 @@ open Printf open Common_utils -type curl_args = (string * string option) list +let quote = Filename.quote -let run curl_args = - let config_file, chan = Filename.open_temp_file "v2vcurl" ".conf" in +type t = { + curl : string; + args : args; +} +and args = (string * string option) list + +let create ?(curl = "cur...

...py_to_local.ml | 11 ++++++----- v2v/vCenter.ml | 13 +++++++------ 4 files changed, 92 insertions(+), 32 deletions(-) diff --git a/mllib/curl.ml b/mllib/curl.ml index f0af160..d7983ec 100644 --- a/mllib/curl.ml +++ b/mllib/curl.ml @@ -20,10 +20,32 @@ open Printf open Common_utils -type curl_args = (string * string option) list +let quote = Filename.quote -let run curl_args = - let config_file, chan = Filename.open_temp_file "v2vcurl" ".conf" in +type t = { + curl : string; + args : args; +} +and args = (string * string option) list + +let safe_args = [ + "ma...

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.

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.

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.

...s. *) - let cmd = sprintf "%s%s%s -L --max-redirs 5 -g -o /dev/null -I -w '%%{http_code}' %s" - outenv - t.curl - (if verbose () then "" else " -s -S") - (quote uri) in - let lines = external_command cmd in + let curl_h = + let curl_args = + common_args @ + if verbose () then [] else quiet_args @ [ + "output", Some "/dev/null"; (* Write output to /dev/null. *) + "head", None; (* Request only HEAD. *) + (* Write HTTP status code to stdout. *) +...

v2 -> v3: - Renamed List.assoc_ -> List.assoc_lbl. - Rebased on top of current master branch. Rich.

...download_to t ?progress_bar ~proxy uri tmpfile; (tmpfile, true) @@ -107,7 +109,7 @@ and download_to t ?(progress_bar = false) ~proxy uri filename = "write-out", Some "%{http_code}" (* HTTP status code to stdout. *) ]; - Curl.create ~curl:t.curl !curl_args in + Curl.create ~curl:t.curl ~tmpdir:t.tmpdir !curl_args in let lines = Curl.run curl_h in if List.length lines < 1 then @@ -132,7 +134,7 @@ and download_to t ?(progress_bar = false) ~proxy uri filename = else append curl_args quiet_args ); - Curl.create...

...download_to t ?progress_bar ~proxy uri tmpfile; (tmpfile, true) @@ -107,7 +109,7 @@ and download_to t ?(progress_bar = false) ~proxy uri filename = "write-out", Some "%{http_code}" (* HTTP status code to stdout. *) ]; - Curl.create ~curl:t.curl !curl_args in + Curl.create ~curl:t.curl ~tmpdir:t.tmpdir !curl_args in let lines = Curl.run curl_h in if List.length lines < 1 then @@ -132,7 +134,7 @@ and download_to t ?(progress_bar = false) ~proxy uri filename = else append curl_args quiet_args ); - Curl.create...

Add a new optional parameter for the Curl ADT, so temporary files can be created in a specified directory (which is supposed to be temporary, and disposed only when the application quits). --- mllib/curl.ml | 10 ++++++---- mllib/curl.mli | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mllib/curl.ml b/mllib/curl.ml index 376406e..baa75ec 100644 --- a/mllib/curl.ml +++

In Std_utils we already extend Char and String. These commits take it a little further by extending List and adding a new Option submodule. All basically simple refactoring. Rich.

It turns out that RHEL 5 Xen conversions don't work if the source disk is located on a block device. See patch 1/4 for the gory details. This patch series proposes a new tool called virt-v2v-copy-to-local which essentially is a way to make new virt-v2v work like the old virt-v2v, ie. copy first, convert after. Of course this is very slow and would only be used as a last resort, but I

Add a new optional parameter for the Curl ADT, so temporary files can be created in a specified directory (which is supposed to be temporary, and disposed only when the application quits). --- mllib/curl.ml | 16 +++++++++++----- mllib/curl.mli | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mllib/curl.ml b/mllib/curl.ml index 376406e..7d07125 100644 --- a/mllib/curl.ml

This time including the first commit ...

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

Calculate dcPath correctly for vCenter conversions. Rich.