search for: error_unless_ovirtsdk4_module_avail

.../v2v/output_rhv_upload.ml index 0152b8d5a..63fa2411a 100644 --- a/v2v/output_rhv_upload.ml +++ b/v2v/output_rhv_upload.ml @@ -126,6 +126,13 @@ class output_rhv_upload output_alloc output_conn python3 in + (* Check that the 'ovirtsdk4' Python module is available. *) + let error_unless_ovirtsdk4_module_available () = + let res = run_command [ python3; "-c"; "import ovirtsdk4" ] in + if res <> 0 then + error (f_"the Python module ‘ovirtsdk4’ could not be loaded, is it installed? See previous messages for problems.") + in + (* Check that nbdkit is avail...

...Output_rhv_upload_createvm_source.code in - (* Is SELinux enabled and enforcing on the host? *) - let have_selinux = - 0 = Sys.command "getenforce 2>/dev/null | grep -isq Enforcing" in - (* Check that the 'ovirtsdk4' Python module is available. *) let error_unless_ovirtsdk4_module_available () = let res = run_command [ Python_script.python; "-c"; "import ovirtsdk4" ] in diff --git a/v2v/utils.ml b/v2v/utils.ml index 74b501f81..9be4d2dc4 100644 --- a/v2v/utils.ml +++ b/v2v/utils.ml @@ -24,6 +24,10 @@ open Std_utils open Tools_utils open Common_gettext.Get...

...reter_found () = + try ignore (which python_intepreter) + with Executable_not_found _ -> + error (f_"no python binary called ‘%s’ can be found on the $PATH") + python_intepreter + in + (* Check that the 'ovirtsdk4' Python module is available. *) let error_unless_ovirtsdk4_module_available () = - let res = run_command [ Python_script.python; "-c"; "import ovirtsdk4" ] in + let res = run_command [ python_intepreter; "-c"; "import ovirtsdk4" ] in if res <> 0 then error (f_"the Python module ‘ovirtsdk4’ could not b...

...t-v2v-output-rhv(1) manual.") object inherit output + (* The storage domain UUID. *) + val mutable rhv_storagedomain_uuid = None + (* The cluster UUID. *) + val mutable rhv_cluster_uuid = None + method precheck () = Python_script.error_unless_python_interpreter_found (); error_unless_ovirtsdk4_module_available (); @@ -237,6 +242,10 @@ object let json = JSON_parser.json_parser_tree_parse_file precheck_fn in debug "precheck output parsed as: %s" (JSON.string_of_doc ~fmt:JSON.Indented ["", json]); + rhv_storagedomain_uuid <- + Some (JSON_parser.object...

...Output_rhv_upload_createvm_source.code in + let deletedisks_script = + Python_script.create ~name:"rhv-upload-deletedisks.py" + Output_rhv_upload_deletedisks_source.code in (* Check that the 'ovirtsdk4' Python module is available. *) let error_unless_ovirtsdk4_module_available () = @@ -220,6 +223,18 @@ See also the virt-v2v-output-rhv(1) manual.") else args in args in + (* Delete disks. + * + * This ignores errors since the only time we are doing this is on + * the failure path. + *) + let delete_disks uuids = + let ids = List.map (fun...

This patch series fixes various issues in the rhv-upload output mode: - properly find and use RHV resources - cleanup orphan disks, and possibly the current disk transfer on failure 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

This series (except the last one) changes virt-v2v to use nbdkit for several input modes: -i vmx -it vddk: No change in functionality, as this already uses nbdkit-vddk-plugin, but the code is refactored for the other modes to use. -i libvirtxml: Use nbdkit-curl-plugin instead of qemu curl. vCenter: Use nbdkit-curl-plugin instead of qemu curl. xen: Use nbdkit-ssh-plugin instead of qemu