search for: networkmap

...-git a/v2v/cmdline.ml b/v2v/cmdline.ml index 35d18b6..befd8a0 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -26,12 +26,18 @@ open Common_utils open Types open Utils +module NetTypeAndName = struct + type t = Types.vnet_type * string option + let compare = Pervasives.compare +end +module NetworkMap = Map.Make (NetTypeAndName) + type cmdline = { compressed : bool; debug_overlays : bool; do_copy : bool; in_place : bool; - network_map : ((vnet_type * string) * string) list; + network_map : string NetworkMap.t; no_trim : string list; output_alloc : output_allocation; outpu...

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

...put_mode := `Libvirt | "libvirtxml" -> input_mode := `LibvirtXML | "ova" -> input_mode := `OVA - | s -> - error (f_"unknown -i option: %s") s + | _ -> assert false (* Already checked by Getopt.Symbol. *) in let network_map = ref NetworkMap.empty in @@ -125,8 +124,7 @@ let parse_cmdline () = | "ovirt" | "rhev" -> output_mode := `RHEV | "qemu" -> output_mode := `QEmu | "vdsm" -> output_mode := `VDSM - | s -> - error (f_"unknown -o option: %s") s + |...

This adds --print-target. In addition, v2 provides a machine-readable version (in JSON format). All of the record -> JSON boilerplate in this patch could be eliminated if we moved the baseline to OCaml 4.02. Rich.

Extend Modules_list to handle also aliases for input and output modules, and use this to register the existing aliases. --- v2v/input_disk.ml | 2 +- v2v/modules_list.ml | 25 +++++++++++++++++++++---- v2v/modules_list.mli | 8 ++++---- v2v/output_local.ml | 2 +- v2v/output_rhev.ml | 2 +- 5 files changed, 28 insertions(+), 11 deletions(-) diff --git a/v2v/input_disk.ml

The first two patches implement the change discussed here: https://www.redhat.com/archives/libguestfs/2016-April/msg00178.html The third patch fixes the mapping of inspection data to OVF VmType which was inherited directly from old virt-v2v and had never been changed. It had a number of problems. The fourth patch is only slightly related to the others. It adds an extra slow test to ensure that

...ion: %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 = @@ -163,6 +154,15 @@ let parse_cmdline () = error (f_"unknown -oa option: %s") s in + let output_options = ref [] in + let set_output_option_compat k v = + output_options := (k, v) :: !output_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 = > @@ -163,6 +154,15 @@ let parse_cmdline () = > error (f_"unknown -oa option: %s") s > in > > + let output_options = ref [] in > + let set_output_option_compat k v = > +...

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

...(string_of_source_sound_model model); None in diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index c580d8a6e..1de550100 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -104,7 +104,7 @@ let parse_cmdline () = | in_, out -> let key = t, Some in_ in if NetworkMap.mem key !network_map then - error (f_"duplicate %s parameter. Duplicate mappings specified for %s '%s'.") flag name in_; + error (f_"duplicate %s parameter. Duplicate mappings specified for %s ‘%s’.") flag name in_; network_map := NetworkM...

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,