search for: vdsm_option

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

...-> no_options (); `Local + | `Null -> no_options (); `Null + | `RHV -> no_options (); `RHV + | `QEmu -> no_options (); `QEmu + | `VDSM -> + if is_query then ( + Output_vdsm.print_vdsm_output_options (); + exit 0 + ) + else ( + let vdsm_options = + Output_vdsm.parse_vdsm_output_options output_options in + `VDSM vdsm_options + ) in + (* Some options cannot be used with --in-place. *) if in_place then ( if print_target then @@ -379,27 +423,6 @@ read the man page virt-v2v(1). let password = read_fir...

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,

...; no_options (); `Null > + | `RHV -> no_options (); `RHV > + | `QEmu -> no_options (); `QEmu > + | `VDSM -> > + if is_query then ( > + Output_vdsm.print_vdsm_output_options (); > + exit 0 > + ) > + else ( > + let vdsm_options = > + Output_vdsm.parse_vdsm_output_options output_options in > + `VDSM vdsm_options > + ) in > + > (* Some options cannot be used with --in-place. *) > if in_place then ( > if print_target then > @@ -379,27 +423,6 @@ read the man page vir...

...; no_options (); `Null > + | `RHV -> no_options (); `RHV > + | `QEmu -> no_options (); `QEmu > + | `VDSM -> > + if is_query then ( > + Output_vdsm.print_vdsm_output_options (); > + exit 0 > + ) > + else ( > + let vdsm_options = > + Output_vdsm.parse_vdsm_output_options output_options in > + `VDSM vdsm_options > + ) in Here I'd do the check of the options (both input and output) by prefixes, i.e. things like: List.iter ( fun key -> if not (String.is_prefix key "...

...ource targets _ guestcaps inspect target_firmware = - (* See #supported_firmware above. *) - assert (target_firmware = TargetBIOS); - (* Create the metadata. *) let ovf = Create_ovf.create_ovf source targets guestcaps inspect + target_firmware output_alloc dd_uuid vdsm_options.image_uuids vdsm_options.vol_uuids diff --git a/v2v/test-v2v-o-rhv.ovf.expected b/v2v/test-v2v-o-rhv.ovf.expected index 7bcc456c5..c6bd05c56 100644 --- a/v2v/test-v2v-o-rhv.ovf.expected +++ b/v2v/test-v2v-o-rhv.ovf.expected @@ -25,6 +25,7 @@ <IsStateless>False</IsStateless>...

changes in v2: - split patch in two - changed as per suggestions Tomáš Golembiovský (2): v2v: ovf: add firmware and machine type element v2v: enable UEFI for oVirt/RHV outputs v2v/create_ovf.ml | 12 +++++++++++- v2v/create_ovf.mli | 2 +- v2v/output_rhv.ml | 6 ++---- v2v/output_rhv_upload.ml | 4 ++--

...+++ b/v2v/output_vdsm.ml @@ -144,7 +144,7 @@ object * 'os' is the output storage domain (-os /rhv/data/<data center>/<data domain>) * this is already mounted path. *) - method prepare_targets _ overlays = + method prepare_targets _ overlays _ = if List.length vdsm_options.image_uuids <> List.length overlays || List.length vdsm_options.vol_uuids <> List.length overlays then error (f_"the number of ‘-oo vdsm-image-uuid’ and ‘-oo vdsm-vol-uuid’ parameters passed on the command line has to match the number of guest disk images (for this g...

..._in_output_mode "rhv-upload" "--qemu-boot"; + Output_rhv_upload.output_rhv_upload output_alloc output_conn + output_password os + rhv_options, + output_format, output_alloc + | `VDSM vdsm_options -> if output_password <> None then error_option_cannot_be_used_in_output_mode "vdsm" "-op"; diff --git a/v2v/embed.sh b/v2v/embed.sh new file mode 100755 index 000000000..0a65cd428 --- /dev/null +++ b/v2v/embed.sh @@ -0,0 +1,45 @@ +#!/bin/bash - +# Embe...

v7 was here: https://www.redhat.com/archives/libguestfs/2018-March/msg00143.html Since then: - Earlier patches are now upstream. - The to-do list is moved from the commit message to the TODO file. - This version forces -of raw + -oa sparse and gives an error in any other mode. We intend to lift these restrictions later. - Tested against latest imageio which supports longer timeouts,

..._in_output_mode "rhv-upload" "--qemu-boot"; + Output_rhv_upload.output_rhv_upload output_alloc output_conn + output_password os + rhv_options, + output_format, output_alloc + | `VDSM vdsm_options -> if output_password <> None then error_option_cannot_be_used_in_output_mode "vdsm" "-op"; diff --git a/v2v/embed.sh b/v2v/embed.sh new file mode 100755 index 000000000..0a65cd428 --- /dev/null +++ b/v2v/embed.sh @@ -0,0 +1,45 @@ +#!/bin/bash - +# Embe...

..._in_output_mode "rhv-upload" "--qemu-boot"; + Output_rhv_upload.output_rhv_upload output_alloc output_conn + output_password os + rhv_options, + output_format, output_alloc + | `VDSM vdsm_options -> if output_password <> None then error_option_cannot_be_used_in_output_mode "vdsm" "-op"; diff --git a/v2v/embed.sh b/v2v/embed.sh new file mode 100755 index 000000000..363d7e2b0 --- /dev/null +++ b/v2v/embed.sh @@ -0,0 +1,48 @@ +#!/bin/bash - +# Embe...

v8 was here: https://www.redhat.com/archives/libguestfs/2018-April/msg00022.html v8 -> v9: - Addresses the only feedback from Tomáš. Rich.