search for: vmtype

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 trimming doesn't regress, fixing https://bugzilla.redhat.com/show_bug.cgi?id=1264332 Ric...

.../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", Arg.Set_string vdsm_vm_uuid, "uuid " ^ s_"Output VM UUID"; +...

...gets guestcaps inspect +let rec create_ovf source targets guestcaps inspect target_firmware output_alloc sd_uuid image_uuids vol_uuids vm_uuid ovf_flavour = assert (List.length targets = List.length vol_uuids); @@ -515,6 +531,7 @@ let rec create_ovf source targets guestcaps inspect let vmtype = get_vmtype inspect in let vmtype = match vmtype with `Desktop -> "0" | `Server -> "1" in let ostype = get_ostype inspect in + let biostype = get_ovirt_biostype guestcaps target_firmware in let ovf : doc = doc "ovf:Envelope" [ @@ -562,6 +579,7 @...

...644 --- 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_string vdsm_vm_uuid, "uuid " ^ s_"Output VM UUID"; + "--vdsm-ovf-output...

.../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", Arg.Set_string vdsm_vm_uuid, "uuid " ^ s_"Output VM UUID"; +...

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 ++--

...644 --- 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_string vdsm_vm_uuid, "uuid " ^ s_"Output VM UUID"; + "--vdsm-ovf-output...

.../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", Arg.Set_string vdsm_vm_uuid, "uuid " ^ s_"Output VM UUID"; +...

...t; Some 7 + | _ -> None + (* Generate the .meta file associated with each volume. *) let create_meta_files output_alloc sd_uuid image_uuids targets = (* Note: Upper case in the .meta, mixed case in the OVF. *) @@ -238,11 +247,29 @@ let rec create_ovf source targets guestcaps inspect let vmtype = match vmtype with `Desktop -> "0" | `Server -> "1" in let ostype = get_ostype inspect in - let origin = - match source.s_hypervisor with - | VMware -> 1 - | Xen -> 2 - | _ -> 0 in + let content_fields = [ + e "Name" [] [PCData sou...

...class virtual input = object method virtual as_options : string method virtual source : unit -> source diff --git a/v2v/types.mli b/v2v/types.mli index 55fb09a..9e8932e 100644 --- a/v2v/types.mli +++ b/v2v/types.mli @@ -253,3 +253,8 @@ type output_allocation = Sparse | Preallocated type vmtype = Desktop | Server (** Type of [--vmtype] option. *) + +val open_guestfs : unit -> Guestfs.guestfs +(* Create a new Guestfs handle, with common options (e.g. debug, tracing) + * already set. + *) diff --git a/v2v/v2v.ml b/v2v/v2v.ml index 333ece0..88ae409 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.m...

...----------------------------------------------------------------------------- *-v and -x options are not working in my case.* *[root@kvm16 ~]#* virt-v2v -v -ic esx://10.16.32.13/?no_verify=1 yardqakvm -o rhev -os 10.16.32.16:/vm-images/export_domain --network rhevm Option v is ambiguous (version, vmtype) Usage: virt-v2v -i libvirtxml -os imported --network default guest-domain.xml virt-v2v -ic esx://esx.server/ -os imported --network default esx_guest virt-v2v -ic esx://esx.server/ \ -o rhev -os rhev.nfs.storage:/export_domain --network rhevm \ esx_gues...

...with @@ -230,7 +230,7 @@ let create_meta_files verbose output_alloc sd_uuid image_uuids targets = ) (List.combine targets image_uuids) (* Create the OVF file. *) -let rec create_ovf verbose source targets guestcaps inspect +let rec create_ovf source targets guestcaps inspect output_alloc vmtype sd_uuid image_uuids vol_uuids vm_uuid = assert (List.length targets = List.length vol_uuids); @@ -332,7 +332,7 @@ let rec create_ovf verbose source targets guestcaps inspect warning (f_"This guest required a password for connection to its display, but this is not supported by RHEV....

...by virt-v2v 1.38.0</Description> + <Domain/> + <CreationDate>#DATE#</CreationDate> + <IsInitilized>True</IsInitilized> + <IsAutoSuspend>False</IsAutoSuspend> + <TimeZone/> + <IsStateless>False</IsStateless> + <VmType>0</VmType> + <DefaultDisplayType>1</DefaultDisplayType> + <Section ovf:id='#VM_ID#' ovf:required='false' xsi:type='ovf:OperatingSystemSection_Type'> + <Info>Microsoft Windows 7 Phony Edition</Info> + <Description>W...

...n = _format_time(gmtime()); - my $osuuid = Sys::VirtV2V::Target::RHEV::UUIDHelper::get_uuid(); + my $vmuuid = Sys::VirtV2V::Target::RHEV::UUIDHelper::get_uuid(); my $ovf = new XML::DOM::Parser->parse(<<EOF); <ovf:Envelope @@ -597,7 +597,7 @@ sub create_guest <VmType>1</VmType> <DefaultDisplayType>0</DefaultDisplayType> - <Section ovf:id="$osuuid" ovf:required="false" xsi:type="ovf:OperatingSystemSection_Type"> + <Section ovf:id="$vmuuid" ovf:required="false&quot...

..."--vdsm-ovf-output" vdsm_ovf_output), s_"Output OVF file"; + [ L"vdsm-fixed-ovf" ], Getopt.Set vdsm_fixed_ovf, + s_"Produce OVF that is more conforming to the standard"; [ L"vmtype" ], Getopt.String ("-", vmtype_warning), s_"Ignored for backwards compatibility"; ] in @@ -327,6 +330,7 @@ read the man page virt-v2v(1). let vdsm_vol_uuids = List.rev !vdsm_vol_uuids in let vdsm_vm_uuid = !vdsm_vm_uuid in...

.. and a lot of refactoring. https://bugzilla.redhat.com/show_bug.cgi?id=1167623 Rich.

...ith the popularity and widespread use of virt-sparsify, I think that fear was unjustified. Supporting the --no-trim option is also a pain, and it's difficult even for users to understand what it does, so I propose we remove it. Note this means that all guests would be fstrimmed. Option: --vmtype desktop --vmtype server Description in manual: For the -o rhev or -o vdsm targets only, specify the type of guest. You can set this to "desktop" or "server". If the option is not given, then a suitable default is chosen based on the detected gue...

https://bugzilla.redhat.com/show_bug.cgi?id=1167623

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