search for: set_input_option_compat

...flavour arg = - vdsm_ovf_flavour := Create_ovf.ovf_flavour_of_string arg in let set_string_option_once optname optref arg = match !optref with @@ -110,6 +92,15 @@ let parse_cmdline () = error (f_"unknown -i option: %s") s in + let input_options = ref [] in + let set_input_option_compat k v = + input_options := (k, v) :: !input_options + in + let set_input_option option = + let k, v = String.split "=" option in + set_input_option_compat k v + in + let network_map = ref NetworkMap.empty in let add_network, add_bridge = let add flag name t str = @@ -...

..._ovf.ovf_flavour_of_string arg in > > let set_string_option_once optname optref arg = > match !optref with > @@ -110,6 +92,15 @@ let parse_cmdline () = > error (f_"unknown -i option: %s") s > in > > + let input_options = ref [] in > + let set_input_option_compat k v = > + input_options := (k, v) :: !input_options > + in > + let set_input_option option = > + let k, v = String.split "=" option in > + set_input_option_compat k v > + in > + > let network_map = ref NetworkMap.empty in > let add_network, add...

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).

...mdline.ml index cd2d279e9..6ec076151 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -259,8 +259,6 @@ let parse_cmdline () = s_"Same as ‘-io vddk-thumbprint=thumbprint’"; [ L"vddk-transports" ], Getopt.String ("transports", set_input_option_compat "vddk-transports"), s_"Same as ‘-io vddk-transports=transports’"; - [ L"vddk-vimapiver" ], Getopt.String ("apiver", set_input_option_compat "vddk-vimapiver"), - s_"Same...

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,

...++ b/v2v/cmdline.ml @@ -33,6 +33,7 @@ type cmdline = { compressed : bool; debug_overlays : bool; do_copy : bool; + force_interfaces : force_interface list; in_place : bool; network_map : Networks.t; output_alloc : output_allocation; @@ -99,6 +100,26 @@ let parse_cmdline () = set_input_option_compat k v in + let force_interfaces = ref [] in + let add_force_interface str = + let add if_mac_addr if_ip_address if_default_gateway if_prefix_length + if_nameservers = + List.push_back force_interfaces + { if_mac_addr; if_ip_address; if_default_gateway; +...

--- v2v/windows.ml | 24 ++++++++++++++++++++++++ v2v/windows.mli | 6 ++++++ 2 files changed, 30 insertions(+) diff --git a/v2v/windows.ml b/v2v/windows.ml index 23d589b00..dde64e677 100644 --- a/v2v/windows.ml +++ b/v2v/windows.ml @@ -19,6 +19,7 @@ open Printf open Common_gettext.Gettext +open Std_utils open Tools_utils open Utils @@ -45,3 +46,26 @@ and check_app { Guestfs.app2_name

Deep in the discussion of this bug, unfortunately mostly in private comments: https://bugzilla.redhat.com/show_bug.cgi?id=1594515 we decided it'd be more flexible for RHV if we had a way to map individual NICs to target networks and bridges. This can be done by adding a new --mac option so you can specify the exact mapping you need: $ virt-v2v [...] \ --mac