search for: ovf_output

...deletions(-) diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index adea40c..489b4e8 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -45,6 +45,7 @@ let parse_cmdline () = let quiet = ref false in let vdsm_image_uuid = ref "" in let vdsm_vm_uuid = ref "" in + let vdsm_ovf_output = ref "." in let verbose = ref false in let trace = ref false in let vmtype = ref "" in @@ -144,6 +145,8 @@ let parse_cmdline () = Arg.String add_vdsm_vol_uuid, "uuid " ^ s_"Output vol UUID(s)"; "--vdsm-vm-uuid",...

...rtions(+), 14 deletions(-) diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index 420f897..cd00636 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -47,6 +47,7 @@ let parse_cmdline () = let qemu_boot = ref false in let quiet = ref false in let vdsm_vm_uuid = ref "" in + let vdsm_ovf_output = ref "." in let verbose = ref false in let trace = ref false in let vmtype = ref "" in @@ -179,6 +180,8 @@ let parse_cmdline () = Arg.String add_vdsm_vol_uuid, "uuid " ^ s_"Output vol UUID(s)"; "--vdsm-vm-uuid", Arg.Set_stri...

...deletions(-) diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index adea40c..489b4e8 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -45,6 +45,7 @@ let parse_cmdline () = let quiet = ref false in let vdsm_image_uuid = ref "" in let vdsm_vm_uuid = ref "" in + let vdsm_ovf_output = ref "." in let verbose = ref false in let trace = ref false in let vmtype = ref "" in @@ -144,6 +145,8 @@ let parse_cmdline () = Arg.String add_vdsm_vol_uuid, "uuid " ^ s_"Output vol UUID(s)"; "--vdsm-vm-uuid",...

...rtions(+), 11 deletions(-) diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index 420f897..cd00636 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -47,6 +47,7 @@ let parse_cmdline () = let qemu_boot = ref false in let quiet = ref false in let vdsm_vm_uuid = ref "" in + let vdsm_ovf_output = ref "." in let verbose = ref false in let trace = ref false in let vmtype = ref "" in @@ -179,6 +180,8 @@ let parse_cmdline () = Arg.String add_vdsm_vol_uuid, "uuid " ^ s_"Output vol UUID(s)"; "--vdsm-vm-uuid", Arg.Set_stri...

...deletions(-) diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index adea40c..489b4e8 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -45,6 +45,7 @@ let parse_cmdline () = let quiet = ref false in let vdsm_image_uuid = ref "" in let vdsm_vm_uuid = ref "" in + let vdsm_ovf_output = ref "." in let verbose = ref false in let trace = ref false in let vmtype = ref "" in @@ -144,6 +145,8 @@ let parse_cmdline () = Arg.String add_vdsm_vol_uuid, "uuid " ^ s_"Output vol UUID(s)"; "--vdsm-vm-uuid",...

...++ 6 files changed, 34 insertions(+), 16 deletions(-) diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index efad080cc..409d5dfab 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -75,6 +75,7 @@ let parse_cmdline () = let vddk_vimapiver = ref None in let vdsm_vm_uuid = ref None in let vdsm_ovf_output = ref None in (* default "." *) + let vdsm_fixed_ovf = ref false in let vdsm_compat = ref "0.10" in let set_vdsm_compat s = vdsm_compat := s in @@ -251,6 +252,8 @@ let parse_cmdline () = s_"Output VM UUID"; [ L"vd...

...+++++++- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index 2d0a10a..9a56d60 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -65,6 +65,7 @@ let parse_cmdline () = let password_file = ref None in let vdsm_vm_uuid = ref None in let vdsm_ovf_output = ref None in (* default "." *) + let vdsm_compat_11 = ref false in let set_string_option_once optname optref arg = match !optref with @@ -198,6 +199,7 @@ let parse_cmdline () = [ L"print-source" ], Getopt.Set print_source, s_"Print source and stop";...

...d | 21 ++++++++++++++++++++- 6 files changed, 45 insertions(+), 10 deletions(-) diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml index 2d0a10a..1d325af 100644 --- a/v2v/cmdline.ml +++ b/v2v/cmdline.ml @@ -66,6 +66,9 @@ let parse_cmdline () = let vdsm_vm_uuid = ref None in let vdsm_ovf_output = ref None in (* default "." *) + let vdsm_compat = ref "0.10" in + let set_vdsm_compat s = vdsm_compat := s in + let set_string_option_once optname optref arg = match !optref with | Some _ -> @@ -198,6 +201,7 @@ let parse_cmdline () = [ L"print-sou...

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.

...ot;vdsm-vm-uuid", v -> if !vm_uuid <> None then - error (f_"-o vdsm: -oo vdsm-vm-uuid set twice"); + error (f_"-o vdsm: -oo vdsm-vm-uuid set more than once"); vm_uuid := Some v; | "vdsm-ovf-output", v -> if !ovf_output <> None then - error (f_"-o vdsm: -oo vdsm-ovf-output set twice"); + error (f_"-o vdsm: -oo vdsm-ovf-output set more than once"); ovf_output := Some v; | "vdsm-ovf-flavour", v -> ovf_flavour := Create_ovf.ovf_flavour_of_str...

...one in - let vddk_libdir = ref None in - let vddk_nfchostport = ref None in - let vddk_port = ref None in - let vddk_snapshot = ref None in - let vddk_thumbprint = ref None in - let vddk_transports = ref None in - let vddk_vimapiver = ref None in - let vdsm_vm_uuid = ref None in - let vdsm_ovf_output = ref None in (* default "." *) - - let vdsm_compat = ref "0.10" in - let set_vdsm_compat s = vdsm_compat := s in - - let vdsm_ovf_flavour = ref Create_ovf.RHVExportStorageDomain in - let set_vdsm_ovf_flavour arg = - vdsm_ovf_flavour := Create_ovf.ovf_flavour_of_string ar...

...> - let vddk_nfchostport = ref None in > - let vddk_port = ref None in > - let vddk_snapshot = ref None in > - let vddk_thumbprint = ref None in > - let vddk_transports = ref None in > - let vddk_vimapiver = ref None in > - let vdsm_vm_uuid = ref None in > - let vdsm_ovf_output = ref None in (* default "." *) > - > - let vdsm_compat = ref "0.10" in > - let set_vdsm_compat s = vdsm_compat := s in > - > - let vdsm_ovf_flavour = ref Create_ovf.RHVExportStorageDomain in > - let set_vdsm_ovf_flavour arg = > - vdsm_ovf_flavour :=...

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,

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

..._"-o rhv: --qemu-boot option cannot be used in this output mode"); - Output_rhv.output_rhv os 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...

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

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

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