similar to: [PATCH] v2v: -o openstack: Don't echo full commands (RHBZ#1664310).

Improves the error message when openstack is not installed: $ virt-v2v -i disk fedora-28.img -o openstack virt-v2v: error: no binary called ‘openstack’ was found on the $PATH. We use this program to communicate with OpenStack so it must be installed to use this output mode. --- v2v/output_openstack.ml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git

On Monday, 19 November 2018 20:09:34 CET Richard W.M. Jones wrote: > Previously: > > $ virt-v2v -v -x -i disk fedora-28.img -o openstack -oo server-id=foo > virt-v2v: libguestfs 1.39.11fedora=29,release=1.fc29,libvirt (x86_64) > libvirt version: 4.5.0 > virt-v2v: error: openstack: precheck failed, there may be a problem with > authentication, see earlier error

Previously: $ virt-v2v -v -x -i disk fedora-28.img -o openstack -oo server-id=foo virt-v2v: libguestfs 1.39.11fedora=29,release=1.fc29,libvirt (x86_64) libvirt version: 4.5.0 virt-v2v: error: openstack: precheck failed, there may be a problem with authentication, see earlier error messages rm -rf '/var/tmp/null.dTxRFN' Notice there is no "earlier error message".

Create two temporary directories for all the files created during the virt-v2v run: 1) tmpdir, created as $TMPDIR/virt-v2v.XXXXXX, for all the small files 2) cachedir, created as $LIBGUESTFS_CACHEDIR/virt-v2v.XXXXXX, for the big files (e.g. disks) This way there is no need to manually schedule all the temporary files and directories for removal when the application quits. --- v2v/input_ova.ml

Since Std_utils.which can handle relative/absolute paths, remove the manual checks, and use Std_utils.which directly. --- common/mltools/tools_utils.ml | 4 +--- dib/cmdline.ml | 12 +----------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/common/mltools/tools_utils.ml b/common/mltools/tools_utils.ml index 3c7e1b846..24641369e 100644 ---

If ‘virt-v2v -oo insecure’ is used then ‘openstack --insecure’ flag is added whenever we invoke the openstack command. This turns of SSL certificate validation. --- v2v/output_openstack.ml | 14 +++++++++++++- v2v/virt-v2v-output-openstack.pod | 1 + v2v/virt-v2v.pod | 7 +++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/v2v/output_openstack.ml

It will be used later in more parts of Tools_utils. Simple refactoring with no behaviour changes. --- common/mltools/tools_utils.ml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/mltools/tools_utils.ml b/common/mltools/tools_utils.ml index 24641369e..3b1554c5a 100644 --- a/common/mltools/tools_utils.ml +++ b/common/mltools/tools_utils.ml @@ -427,7 +427,9 @@ and

If ‘virt-v2v -oo verify-server-certificate=false’ is used then ‘openstack --insecure’ flag is added whenever we invoke the openstack command. This turns off SSL certificate validation. The default is to verify the server certificate (which is the default of the openstack command). --- v2v/output_openstack.ml | 16 +++++++++++++++- v2v/test-v2v-o-openstack.sh | 2 ++

Split most of the code from external_command to a new external_command_code, so it is possible to get the exit code of the process without considering it fatal. --- common/mltools/tools_utils.ml | 22 ++++++++++------------ common/mltools/tools_utils.mli | 8 ++++++++ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/common/mltools/tools_utils.ml b/common/mltools/tools_utils.ml

On Wed, Jan 16, 2019 at 03:17:32PM +0100, Pino Toscano wrote: > Split most of the code from external_command to a new > external_command_code, so it is possible to get the exit code of the > process without considering it fatal. > --- > common/mltools/tools_utils.ml | 22 ++++++++++------------ > common/mltools/tools_utils.mli | 8 ++++++++ > 2 files changed, 18

This option prints the estimated size of the data that will be copied from the source disk. Currently this overestimates by the size of the qcow2 header, but for real disk images that doesn't matter much. For example: $ virt-builder fedora-27 $ virt-v2v -i disk fedora-27.img -o null --print-estimate [...] virt-v2v: This guest has virtio drivers installed. [ 44.0] Mapping filesystem data to

Easy way to parse JSON from a file, without reading it all to string first. --- common/mltools/JSON_parser-c.c | 25 +++++++++++++++++++++++++ common/mltools/JSON_parser.ml | 1 + common/mltools/JSON_parser.mli | 3 +++ common/mltools/JSON_parser_tests.ml | 23 +++++++++++++++++++++++ 4 files changed, 52 insertions(+) diff --git a/common/mltools/JSON_parser-c.c

Instead of returning directly a Getopt.t handle, now Tools_utils.create_standard_options returns a struct, which at the moment contains only the Getopt.t handle. This way, it will be easy to add more data needed for handling standard command line options. This is mostly refactoring, with no functional changes. --- builder/cmdline.ml | 2 +- builder/repository_main.ml

In some cases we have observed the time taken for a Cinder volume to attach to the conversion appliance can be longer than the current 60 seconds. Increase the timeout to 5 minutes. Thanks: Ming Xie. --- v2v/output_openstack.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2v/output_openstack.ml b/v2v/output_openstack.ml index caaedf452..e395ccb37 100644 ---

This patch implements output to OpenStack Cinder volumes using OpenStack APIs. It has only been lightly tested, but appears to work. There are some important things to understand about how this works: (1) You must run virt-v2v in a conversion appliance running on top of OpenStack. And you must supply the name or UUID of this appliance to virt-v2v using the ‘-oo server-id=NAME|UUID’ parameter.

Since this output method was written the code has always been capable of adding the hw_firmware_type = uefi image property, and this property has been supported since at least OpenStack 12 which is years old. Interestingly now all of the output modes support both BIOS and UEFI. --- v2v/output_openstack.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2v/output_openstack.ml

Previously we allowed arbitrary flags to be passed through to the underlying openstack CLI command, provided they have the format ‘--key=value’. We want to pass the ‘--insecure’ flag through, but that doesn't have the key=value form. However a small modification to the matching rules would allow this. The effect of this change is that you can now use ‘virt-v2v -oo insecure’ to turn off SSL

v1 was here: https://www.redhat.com/archives/libguestfs/2018-August/thread.html#00287 v2: - The -oa option now gives an error; apparently Cinder cannot generally control sparse/preallocated behaviour, although certain Cinder backends can. - The -os option maps to Cinder volume type; suggested by Matt Booth. - Add a simple test.

In case a repository of virt-builder references files (e.g. the index) that cannot be downloaded (network issues, 404, etc) then virt-builder errors out on this situation. This is not a nice situation, from an user POV. This series does some refactoring to allow to better handle downloading failures, and handle the failures gracefully in virt-builder. RFC because I'm not yet too convinced

No functional change, but it does allow downstream distributions to adjust the Python interpreter and nbdkit Python plugin used by virt-v2v -o rhv-upload mode: ./configure --with-virt-v2v-python-interpreter=... ./configure --with-virt-v2v-nbdkit-python-plugin=... If you don't set the configure parameters then this change makes no difference. --- .gitignore | 1 + configure.ac