search for: vdsm_params

...ace in let vmtype = @@ -320,6 +324,7 @@ read the man page virt-v2v(1). Output_vdsm.image_uuid = vdsm_image_uuid; vol_uuids = vdsm_vol_uuids; vm_uuid = vdsm_vm_uuid; + ovf_output = vdsm_ovf_output; } in Output_vdsm.output_vdsm verbose output_storage vdsm_params vmtype output_alloc in diff --git a/v2v/output_vdsm.ml b/v2v/output_vdsm.ml index 08d3f09..997466b 100644 --- a/v2v/output_vdsm.ml +++ b/v2v/output_vdsm.ml @@ -30,6 +30,7 @@ type vdsm_params = { image_uuid : string; vol_uuids : string list; vm_uuid : string; + ovf_output : string...

...e in let vmtype = @@ -385,6 +389,7 @@ read the man page virt-v2v(1). Output_vdsm.image_uuids = vdsm_image_uuids; vol_uuids = vdsm_vol_uuids; vm_uuid = vdsm_vm_uuid; + ovf_output = vdsm_ovf_output; } in Output_vdsm.output_vdsm verbose output_storage vdsm_params vmtype output_alloc in diff --git a/v2v/output_vdsm.ml b/v2v/output_vdsm.ml index 293f57f..492f586 100644 --- a/v2v/output_vdsm.ml +++ b/v2v/output_vdsm.ml @@ -30,6 +30,7 @@ type vdsm_params = { image_uuids : string list; vol_uuids : string list; vm_uuid : string; + ovf_output :...

...ace in let vmtype = @@ -320,6 +324,7 @@ read the man page virt-v2v(1). Output_vdsm.image_uuid = vdsm_image_uuid; vol_uuids = vdsm_vol_uuids; vm_uuid = vdsm_vm_uuid; + ovf_output = vdsm_ovf_output; } in Output_vdsm.output_vdsm verbose output_storage vdsm_params vmtype output_alloc in diff --git a/v2v/output_vdsm.ml b/v2v/output_vdsm.ml index 08d3f09..997466b 100644 --- a/v2v/output_vdsm.ml +++ b/v2v/output_vdsm.ml @@ -30,6 +30,7 @@ type vdsm_params = { image_uuid : string; vol_uuids : string list; vm_uuid : string; + ovf_output : string...

...e in let vmtype = @@ -385,6 +389,7 @@ read the man page virt-v2v(1). Output_vdsm.image_uuids = vdsm_image_uuids; vol_uuids = vdsm_vol_uuids; vm_uuid = vdsm_vm_uuid; + ovf_output = vdsm_ovf_output; } in Output_vdsm.output_vdsm verbose output_storage vdsm_params vmtype output_alloc in diff --git a/v2v/output_vdsm.ml b/v2v/output_vdsm.ml index 293f57f..492f586 100644 --- a/v2v/output_vdsm.ml +++ b/v2v/output_vdsm.ml @@ -30,6 +30,7 @@ type vdsm_params = { image_uuids : string list; vol_uuids : string list; vm_uuid : string; + ovf_output :...

...ace in let vmtype = @@ -320,6 +324,7 @@ read the man page virt-v2v(1). Output_vdsm.image_uuid = vdsm_image_uuid; vol_uuids = vdsm_vol_uuids; vm_uuid = vdsm_vm_uuid; + ovf_output = vdsm_ovf_output; } in Output_vdsm.output_vdsm verbose output_storage vdsm_params vmtype output_alloc in diff --git a/v2v/output_vdsm.ml b/v2v/output_vdsm.ml index 08d3f09..997466b 100644 --- a/v2v/output_vdsm.ml +++ b/v2v/output_vdsm.ml @@ -30,6 +30,7 @@ type vdsm_params = { image_uuid : string; vol_uuids : string list; vm_uuid : string; + ovf_output : string...

...int out some facts * about what this binary supports. @@ -542,6 +546,7 @@ read the man page virt-v2v(1). vm_uuid = vdsm_vm_uuid; ovf_output = vdsm_ovf_output; compat = vdsm_compat; + legacy_ovf = not vdsm_fixed_ovf; } in Output_vdsm.output_vdsm os vdsm_params output_alloc, output_format, output_alloc in diff --git a/v2v/output_vdsm.ml b/v2v/output_vdsm.ml index b2188dd8b..9d0568f3e 100644 --- a/v2v/output_vdsm.ml +++ b/v2v/output_vdsm.ml @@ -32,6 +32,7 @@ type vdsm_params = { vm_uuid : string; ovf_output : string; compat : string; + leg...

...t;convert:%s\n") (Modules_list.convert_modules ()); @@ -415,6 +419,7 @@ read the man page virt-v2v(1). vol_uuids = vdsm_vol_uuids; vm_uuid = vdsm_vm_uuid; ovf_output = vdsm_ovf_output; + compat_11 = vdsm_compat_11; } in Output_vdsm.output_vdsm os vdsm_params output_alloc in diff --git a/v2v/output_rhev.ml b/v2v/output_rhev.ml index e45043b..3280150 100644 --- a/v2v/output_rhev.ml +++ b/v2v/output_rhev.ml @@ -248,10 +248,6 @@ object Changeuid.func changeuid_t ( fun () -> let g = open_guestfs ~identifier:"rhev_disk_create&q...

...f "convert:%s\n") (Modules_list.convert_modules ()); @@ -415,6 +421,7 @@ read the man page virt-v2v(1). vol_uuids = vdsm_vol_uuids; vm_uuid = vdsm_vm_uuid; ovf_output = vdsm_ovf_output; + compat = vdsm_compat; } in Output_vdsm.output_vdsm os vdsm_params output_alloc in diff --git a/v2v/output_rhev.ml b/v2v/output_rhev.ml index e45043b..3280150 100644 --- a/v2v/output_rhev.ml +++ b/v2v/output_rhev.ml @@ -248,10 +248,6 @@ object Changeuid.func changeuid_t ( fun () -> let g = open_guestfs ~identifier:"rhev_disk_create&q...

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

v3: Change the flag from --vdsm-compat-11 to --vdsm-compat=1.1 Also the --machine-readable output has changed. I have also added a test. Rich.

The main reason for creating different OVF is that it can be used to create VM by oVirt REST API. The RHV export domain flavor cannot be used that way. Tomáš Golembiovský (3): v2v: tests: check generated OVF v2v: ovf: Create OVF more aligned with the standard v2v: vdsm: add --vdsm-fixed-ovf option v2v/cmdline.ml | 5 ++ v2v/create_ovf.ml

The main reason for creating different OVF is that it can be used to create VM by oVirt REST API. The RHV export domain flavor cannot be used that way. v1 -> v2: - introduced flavour types instead of booleans - instead of referring to the new flavour as "standard OVF" or "fixed OVF" I refer to it as oVirt flavour. While it is more conforming than the one used in export

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

...ta file. *) let dir = esd_mp // esd_uuid // "master" // "vms" // vm_uuid in diff --git a/v2v/output_vdsm.ml b/v2v/output_vdsm.ml index 828ad7bda..b2188dd8b 100644 --- a/v2v/output_vdsm.ml +++ b/v2v/output_vdsm.ml @@ -175,7 +175,8 @@ object output_alloc dd_uuid vdsm_params.image_uuids vdsm_params.vol_uuids - vdsm_params.vm_uuid in + vdsm_params.vm_uuid + true in (* Write it to the metadata file. *) let file = vdsm_params.ovf_output // vdsm_params.vm_uuid ^ ".ovf" in -- 2.16.1

This is just a bit of preparatory refactoring ... Rich.

...s output_alloc + Output_rhv.output_rhv os output_alloc, + output_format, output_alloc | `VDSM -> let os = @@ -423,7 +434,8 @@ read the man page virt-v2v(1). ovf_output = vdsm_ovf_output; compat = vdsm_compat; } in - Output_vdsm.output_vdsm os vdsm_params output_alloc in + Output_vdsm.output_vdsm os vdsm_params output_alloc, + output_format, output_alloc in { compressed = compressed; debug_overlays = debug_overlays; -- 2.9.3

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,

This changes the infrastructure to allow the target_file to be a QEMU URI. Rich.

...ut_rhev output_storage vmtype output_alloc | `VDSM -> if output_storage = "" then @@ -387,10 +383,10 @@ read the man page virt-v2v(1). vm_uuid = vdsm_vm_uuid; ovf_output = vdsm_ovf_output; } in - Output_vdsm.output_vdsm verbose output_storage vdsm_params + Output_vdsm.output_vdsm output_storage vdsm_params vmtype output_alloc in input, output, debug_gc, debug_overlays, do_copy, network_map, no_trim, output_alloc, output_format, output_name, - print_source, quiet, root_choice, trace, verbose + print_source, quiet, root_cho...

Add an optional parameter to disable this behaviour, so the Curl module in v2v won't print user-sensible data (like passwords). --- builder/checksums.ml | 1 - builder/downloader.ml | 1 - builder/sigchecker.ml | 1 - mllib/common_utils.ml | 4 +++- mllib/common_utils.mli | 7 +++++-- v2v/curl.ml | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git