search for: vmcheck

Split the VM existance check out of the precheck script to a new vmcheck script, and invoke that in #prepare_targets. Invoke the precheck script in #precheck, as now it can be run with only values of command line options. This does not change which checks are performed; however, an invalid cluster name will make virt-v2v fail way earlier (even before connecting to the...

...-git a/v2v/output_rhv_upload.ml b/v2v/output_rhv_upload.ml > index eec9c5c79..78e9145c6 100644 > --- a/v2v/output_rhv_upload.ml > +++ b/v2v/output_rhv_upload.ml > @@ -106,19 +106,19 @@ class output_rhv_upload output_alloc output_conn > > (* Create Python scripts for precheck, vmcheck, plugin and create VM. *) > let precheck_script = > - Python_script.create ~name:"rhv-upload-precheck.py" > + Python_script.create ~name:"rhv-upload-precheck.py" ~tmpdir > Output_rhv_upload_precheck_source.code in > let vmchec...

...by the [Lintian] [spelling-error-in-binary] rule. [Lintian]: https://github.com/Debian/lintian [spelling-error-in-binary]: https://lintian.debian.org/tags/spelling-error-in-binary.html Signed-off-by: Kevin Locke <kevin@kevinlocke.name> --- v2v/rhv-upload-plugin.py | 4 ++-- v2v/rhv-upload-vmcheck.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2v/rhv-upload-plugin.py b/v2v/rhv-upload-plugin.py index d3e6260e..8c11012b 100644 --- a/v2v/rhv-upload-plugin.py +++ b/v2v/rhv-upload-plugin.py @@ -83,7 +83,7 @@ def parse_username(): def failing(func): ""...

Add an optional parameter for Python_script.create, to specific the temporary directory to use instead of creating a new one. --- v2v/python_script.ml | 13 ++++++++----- v2v/python_script.mli | 5 ++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/v2v/python_script.ml b/v2v/python_script.ml index 3159373a1..6bb14ec1f 100644 --- a/v2v/python_script.ml +++

...lure In reality, the first 4 patches deal with resources, and the other 4 with cleanups. The latter block can be theoretically sent alone -- I just happened to start working on it as part of my "let's fix rhv-upload oddities" initiative. Pino Toscano (8): v2v: -o rhv-upload: split vmcheck out of precheck v2v: -o rhv-upload: change precheck script to return a JSON v2v: -o rhv-upload: improve lookup of specified resources (RHBZ#1612653) v2v: -o rhv-upload: tell whether a SD actually exists v2v: add output#disk_copied hook v2v: -o rhv-upload: collect disks UUIDs right aft...

...ons(+), 5 deletions(-) diff --git a/v2v/output_rhv_upload.ml b/v2v/output_rhv_upload.ml index eec9c5c79..78e9145c6 100644 --- a/v2v/output_rhv_upload.ml +++ b/v2v/output_rhv_upload.ml @@ -106,19 +106,19 @@ class output_rhv_upload output_alloc output_conn (* Create Python scripts for precheck, vmcheck, plugin and create VM. *) let precheck_script = - Python_script.create ~name:"rhv-upload-precheck.py" + Python_script.create ~name:"rhv-upload-precheck.py" ~tmpdir Output_rhv_upload_precheck_source.code in let vmcheck_script = - Python_sc...

...py | 40 ++++--- v2v/rhv-upload-createvm.py | 20 ++-- v2v/rhv-upload-deletedisks.py | 14 +-- v2v/rhv-upload-plugin.py | 105 ++++++++++++------ v2v/rhv-upload-precheck.py | 18 ++- v2v/rhv-upload-vmcheck.py | 16 ++- v2v/test-v2v-python-syntax.sh | 17 ++- 10 files changed, 165 insertions(+), 108 deletions(-) -- 2.24.1

...- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -25,6 +25,7 @@ BUILT_SOURCES = \ $(generator_built) \ config.ml \ output_rhv_upload_createvm_source.ml \ + output_rhv_upload_deletedisks_source.ml \ output_rhv_upload_plugin_source.ml \ output_rhv_upload_precheck_source.ml \ output_rhv_upload_vmcheck_source.ml @@ -35,6 +36,7 @@ EXTRA_DIST = \ copy_to_local.mli \ embed.sh \ rhv-upload-createvm.py \ + rhv-upload-deletedisks.py \ rhv-upload-plugin.py \ rhv-upload-precheck.py \ rhv-upload-vmcheck.py \ @@ -88,6 +90,7 @@ SOURCES_MLI = \ output_rhv.mli \ output_rhv_upload.mli \ outpu...

...())#get_cachedir () in - let t = Mkdtemp.temp_dir ~base_dir "rhvupload." in + let t = Mkdtemp.temp_dir "rhvupload." in rmdir_on_exit t; t in let diskid_file_of_id id = tmpdir // sprintf "diskid.%d" id in (* Create Python scripts for precheck, vmcheck, plugin and create VM. *) - let py_create = Python_script.create ~tmpdir in - let precheck_script = py_create ~name:"rhv-upload-precheck.py" - Output_rhv_upload_precheck_source.code in - let vmcheck_script = py_create ~name:"rhv-upload-vmcheck.py" -...

Just like the similar series that already went in for libguestfs [1], do similar fixes also for virt-v2v, with additional fixes for the builddir!=srcdir case. This will also need the fix to subdir-rules.mk. [1] https://www.redhat.com/archives/libguestfs/2019-December/msg00062.html Pino Toscano (7): Update common to latest build: stop shipping files generated by configure build: use the

...e here for example: https://github.com/libguestfs/libguestfs/blob/dea9636c596acd030c9955057863cf080bdd89fb/v2v/output_openstack.ml#L395-L398 (1) Declare a val mutable in the object: val mutable delete_disks_on_exit = true > @@ -275,6 +290,13 @@ object > if Python_script.run_command vmcheck_script json_params [] <> 0 then > error (f_"failed vmchecks, see earlier errors"); > > + (* Set up an at-exit handler so we delete the orphan disks on failure. *) > + at_exit ( > + fun () -> > + if disks_uuids <> [] then (2) Cha...

v1 was here: https://www.redhat.com/archives/libguestfs/2020-April/msg00007.html There's a BZ for this now which I forgot to add to the commit message: https://bugzilla.redhat.com/show_bug.cgi?id=1814611 For v2: - Fix incorrect reference to $TMPDIR in existing manual. - Separate handling for small temporary files and large temporary files. Small temporary files go into $TMPDIR

...it. *) - let tmpdir = - let base_dir = (open_guestfs ())#get_cachedir () in - let t = Mkdtemp.temp_dir ~base_dir "rhvupload." in - rmdir_on_exit t; - t in - let diskid_file_of_id id = tmpdir // sprintf "diskid.%d" id in (* Create Python scripts for precheck, vmcheck, plugin and create VM. *) diff --git a/v2v/parse_ova.ml b/v2v/parse_ova.ml index 0b939ac4..5c8d349f 100644 --- a/v2v/parse_ova.ml +++ b/v2v/parse_ova.ml @@ -70,11 +70,10 @@ let rec parse_ova ova = let top_dir, ova_type = if is_directory ova then ova, Directory else ( - let tmpdir...

Since this new temporary directory will contain UNIX sockets for communicating with nbdkit, then its path must not be too long. Use the existing directory that libguestfs exposes for this, i.e. sockdir. --- v2v/nbdkit.ml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/v2v/nbdkit.ml b/v2v/nbdkit.ml index 65317f9b..46b20c9d 100644 --- a/v2v/nbdkit.ml +++ b/v2v/nbdkit.ml

I got a little way into this. The two attached patches are preliminary work. My proposed split is: libguestfs.git common -> git submodule libguestfs-common.git generator/ lib/ all language bindings C based tools (eg. virt-df, virt-edit, guestfish) guestfs-tools.git common -> git submodule libguestfs-common.git