search for: vddk_option

...] in + object - inherit input_libvirt password libvirt_uri guest + inherit input_libvirt password libvirt_uri guest as super + + method as_options = + let pt_options = + String.concat "" ( + List.map ( + fun (name, get_field) -> + match get_field vddk_options with + | None -> "" + | Some field -> sprintf " --vddk-%s %s" name field + ) passthrus + ) in + sprintf "%s --vddk %s%s" + super#as_options (* superclass prints "-i libvirt etc" *) + vddk_optio...

Proposed small change to the command line of virt-v2v when specifying that you want VDDK mode. Rich.

...t;unknown input transport ‘-it %s’") transport in let in_place = !in_place in let machine_readable = !machine_readable in let network_map = !network_map in @@ -303,28 +312,15 @@ read the man page virt-v2v(1). let qemu_boot = !qemu_boot in let root_choice = !root_choice in let vddk_options = - match !vddk with - | Some libdir -> - Some { vddk_libdir = libdir; - vddk_config = !vddk_config; - vddk_cookie = !vddk_cookie; - vddk_nfchostport = !vddk_nfchostport; - vddk_port = !vddk_port; - vddk_snapshot = !vddk_sna...

This patch isn't quite complete (see ‘assert false’). Currently we have a bunch of ad hoc options like --vddk* and --vdsm* (and proposed to add --rhv*) to handle extra parameters for input and output modes/transports. This complicates the command line parsing and also the clarity of the command line (becauseit's not very obvious which options apply to which side of the conversion).

...ut_libvirt_vcenter_https - libvirt_conn input_password parsed_uri server guest + libvirt_conn orig_uri input_password parsed_uri server guest (* vCenter or ESXi using nbdkit vddk plugin *) | Some server, Some ("esx"|"gsx"|"vpx"), Some (`VDDK vddk_options) -> Input_libvirt_vddk.input_libvirt_vddk - libvirt_conn input_conn input_password vddk_options parsed_uri guest + libvirt_conn orig_uri input_password vddk_options parsed_uri guest (* Xen over SSH *) | Some server, Some "xen+ssh", _ -> In...

...ys in let do_copy = !do_copy in let input_conn = !input_conn in @@ -368,7 +364,7 @@ read the man page virt-v2v(1). | [guest] -> guest | _ -> error (f_"expecting a libvirt guest name on the command line") in - Input_libvirt.input_libvirt dcpath vddk_options password input_conn guest + Input_libvirt.input_libvirt vddk_options password input_conn guest | `LibvirtXML -> (* -i libvirtxml: Expecting a filename (XML file). *) diff --git a/v2v/copy_to_local.ml b/v2v/copy_to_local.ml index 8a64f3a58..63e1ea310 100644 --- a/v2v/copy_to_l...

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.

...in let output_password = !output_password in let output_storage = !output_storage in let password_file = !password_file in @@ -329,22 +329,6 @@ read the man page virt-v2v(1). let print_target = !print_target in let qemu_boot = !qemu_boot in let root_choice = !root_choice in - let vddk_options = - { Input_libvirt_vddk.vddk_config = !vddk_config; - vddk_cookie = !vddk_cookie; - vddk_libdir = !vddk_libdir; - vddk_nfchostport = !vddk_nfchostport; - vddk_port = !vddk_port; - vddk_snapshot = !vddk_snapshot; - vddk_thumbprint = !vddk_thumbprint;...

..._password in > let output_storage = !output_storage in > let password_file = !password_file in > @@ -329,22 +329,6 @@ read the man page virt-v2v(1). > let print_target = !print_target in > let qemu_boot = !qemu_boot in > let root_choice = !root_choice in > - let vddk_options = > - { Input_libvirt_vddk.vddk_config = !vddk_config; > - vddk_cookie = !vddk_cookie; > - vddk_libdir = !vddk_libdir; > - vddk_nfchostport = !vddk_nfchostport; > - vddk_port = !vddk_port; > - vddk_snapshot = !vddk_snapshot; > - v...

The first patch was previously posted here: https://www.redhat.com/archives/libguestfs/2017-December/msg00018.html That patch hasn't changed except that I made the ‘input_transport’ variable type-safe. The second patch adds a significant new mode for liberating data from VMware: the ability to copy VMs over SSH directly from ESXi hypervisors. Although this requires enabling SSH access (a

v6 was here: https://www.redhat.com/archives/libguestfs/2018-March/msg00126.html This makes a number of significant changes: - Input and output options now use a uniform set of -io and -oo parameters. - For -o rhv-upload, we use ‘-oo rhv-cafile=/tmp/ca.pem’ etc. The ‘--rhv*’ options have been dropped. - Rearranges the documentation. - As before includes (untested) support for zero,

...are via nbdkit vddk plugin *) -open Unix - open Common_gettext.Gettext open Tools_utils open Std_utils @@ -95,115 +93,16 @@ let parse_input_options options = (* Subclass specialized for handling VMware via nbdkit vddk plugin. *) class input_libvirt_vddk libvirt_conn input_conn input_password vddk_options parsed_uri guest = - (* The VDDK path. *) - let libdir = - try Some (List.assoc "libdir" vddk_options) - with Not_found -> None in - - (* VDDK libraries are located under lib32/ or lib64/ relative to the - * libdir. Note this is unrelated to Linux...

...one > + | Some "vddk" -> Some `VDDK > + | Some transport -> > + error (f_"unknown input transport ‘-it %s’") transport in Another option could be to switch from a polymorphic variant to a simple type, e.g.: type input_transport = | None | VDDK of vddk_options | SSH So it will remove the extra vddk_options parameters in most functions where input_transport is passed, and easily support more options for future transports. The rest of the changes seem fine. -- Pino Toscano

...virt XML from remote server:\n%s" xml; diff --git a/v2v/input_libvirt.ml b/v2v/input_libvirt.ml index e8143b6ad..6baac7d5f 100644 --- a/v2v/input_libvirt.ml +++ b/v2v/input_libvirt.ml @@ -28,9 +28,10 @@ open Utils (* Choose the right subclass based on the URI. *) let input_libvirt dcpath vddk_options password libvirt_uri guest = + let conn = lazy (Libvirt_utils.connect_rw ?password ?conn:libvirt_uri ()) in match libvirt_uri with | None -> - Input_libvirt_other.input_libvirt_other password libvirt_uri guest + Input_libvirt_other.input_libvirt_other conn guest | Some orig_ur...

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.

...nter_https.input_libvirt_vcenter_https - input_conn input_password parsed_uri server guest + lazy_conn input_password parsed_uri server guest (* vCenter or ESXi using nbdkit vddk plugin *) | Some server, Some ("esx"|"gsx"|"vpx"), Some (`VDDK vddk_options) -> - Input_libvirt_vddk.input_libvirt_vddk input_conn input_password + Input_libvirt_vddk.input_libvirt_vddk lazy_conn input_conn input_password vddk_options parsed_uri guest (* Xen over SSH *) | Some server, Some "xen+...

...ith > + | None -> no_options (); None > + | Some `SSH -> no_options (); Some `SSH > + | Some `VDDK -> > + if is_query then ( > + Input_libvirt_vddk.print_vddk_input_options (); > + exit 0 > + ) > + else ( > + let vddk_options = > + Input_libvirt_vddk.parse_vddk_input_options input_options in > + Some (`VDDK vddk_options) > + ) in > + > + (* Output mode affects whether some output options should or > + * should not be used. > + *) > + let output_mode = > + let...

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

v2 was posted here: https://www.redhat.com/archives/libguestfs/2019-July/msg00115.html This also has links to earlier versions. v3: - The 01/11 patch in v2 included a bunch of unnecessary plus one necessary change to how input_password is passed around. I moved the necessary change into the final patch (implementing SSH password authentication) and dropped the rest. - The 01/11

Originally posted here: https://www.redhat.com/archives/libguestfs/2019-April/thread.html#00054 https://www.redhat.com/archives/libguestfs/2019-April/msg00076.html https://www.redhat.com/archives/libguestfs/2019-April/msg00126.html This is a rebase on top of current master branch with no other changes. The first patch in the old series was pushed a while back, and the last "TEMPORARY"