search for: vdsm_compat

...5 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-source" ], Getopt.Set print_source, s_"Print source and...

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.

...oot_choice : root_choice; > } > > +let ovf_flavours_str = String.concat "|" Create_ovf.ovf_flavours > + > let parse_cmdline () = > let compressed = ref false in > let debug_overlays = ref false in > @@ -83,7 +85,6 @@ let parse_cmdline () = > let set_vdsm_compat s = vdsm_compat := s in > > let vdsm_ovf_flavour = ref Create_ovf.RHVExportStorageDomain in > - let ovf_flavours_str = String.concat "|" Create_ovf.ovf_flavours in > let set_vdsm_ovf_flavour arg = > vdsm_ovf_flavour := Create_ovf.ovf_flavour_of_string arg in...

...l 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"vdsm-ovf-output" ], Getopt.String ("-", set_string_option_once "--vdsm-ovf-output&...

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

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

...ne.ml @@ -48,6 +48,8 @@ type cmdline = { root_choice : root_choice; } +let ovf_flavours_str = String.concat "|" Create_ovf.ovf_flavours + let parse_cmdline () = let compressed = ref false in let debug_overlays = ref false in @@ -83,7 +85,6 @@ let parse_cmdline () = let set_vdsm_compat s = vdsm_compat := s in let vdsm_ovf_flavour = ref Create_ovf.RHVExportStorageDomain in - let ovf_flavours_str = String.concat "|" Create_ovf.ovf_flavours in let set_vdsm_ovf_flavour arg = vdsm_ovf_flavour := Create_ovf.ovf_flavour_of_string arg in -- 2.13.2

...t = 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 arg in let set_string_option_once optname optref arg =...

...one 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 arg in > > let set_string_opt...

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

Proposed small change to the command line of virt-v2v when specifying that you want VDDK mode. Rich.

...vddk_libdir = !vddk_libdir; + vddk_nfchostport = !vddk_nfchostport; + vddk_port = !vddk_port; + vddk_snapshot = !vddk_snapshot; + vddk_thumbprint = !vddk_thumbprint; + vddk_transports = !vddk_transports; + vddk_vimapiver = !vddk_vimapiver } in let vdsm_compat = !vdsm_compat in let vdsm_image_uuids = List.rev !vdsm_image_uuids in let vdsm_vol_uuids = List.rev !vdsm_vol_uuids in @@ -357,6 +353,26 @@ read the man page virt-v2v(1). let password = read_first_line_from_file filename in Some password in + (* Input transport affects wheth...

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

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 first patch was previously posted here: https://www.redhat.com/archives/libguestfs/2017-December/msg00018.html That patch hasn't changed except that I made the ‘input_transport’ variable type-safe. The second patch adds a significant new mode for liberating data from VMware: the ability to copy VMs over SSH directly from ESXi hypervisors. Although this requires enabling SSH access (a