search for: create_meta_files

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

I was trying to find some documentation for this field and the best I could find is: https://github.com/oVirt/vdsm/blob/master/lib/vdsm/storage/constants.py What do the numbers mean? The comments in the file indicate that strings are valid too (eg. DISKTYPE=OVFS). Also this patch as written will affect -o vdsm mode too (another deprecated-ish mode where we write directly to the Storage

...lse in + match target_firmware, secure_boot_required with + | TargetUEFI, true -> 3 (* q35 + UEFI + secure boot *) + | TargetUEFI, _ -> 2 (* q35 + UEFI *) + (* 1 is q35 + SeaBIOS *) + | _, _ -> 0 (* i440fx + SeaBIOS *) + (* 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. *) @@ -506,7 +522,7 @@ let create_meta_files output_alloc sd_uuid image_uuids targets = ) (List.combine targets image_uuids) (* Create the OVF file. *) -let rec create_ovf source targets gue...

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

From: Nir Soffer <nirsof@gmail.com> --- v2v/create_ovf.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml index 91ff5198d..9aad5dd15 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -501,7 +501,7 @@ let create_meta_files output_alloc sd_uuid image_uuids overlays = bpf "CTIME=%.0f\n" time; bpf "MTIME=%.0f\n" time; bpf "IMAGE=%s\n" image_uuid; - bpf "DISKTYPE=1\n"; + bpf "DISKTYPE=2\n"; bpf "PUUID=00000000-0000-0000-0000-0000...

...* no architecture differentiation of XP on RHV *) | { i_type = "windows"; i_major_version = 5; i_minor_version = 2; i_arch = "i386" } -> @@ -206,7 +206,7 @@ let origin_of_source_hypervisor = function (* 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. *) - let output_alloc_for_rhev = + let output_alloc_for_rhv = match output_alloc with | Sparse -> "SPARSE" | Preallocated -> "PREALLOCATED" in @@ -220,12...

...* no architecture differentiation of XP on RHV *) | { i_type = "windows"; i_major_version = 5; i_minor_version = 2; i_arch = "i386" } -> @@ -206,7 +206,7 @@ let origin_of_source_hypervisor = function (* 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. *) - let output_alloc_for_rhev = + let output_alloc_for_rhv = match output_alloc with | Sparse -> "SPARSE" | Preallocated -> "PREALLOCATED" in @@ -220,12...

v2: - Fix virt-p2v messages too. Rich.

...ased on the source hypervisor. + * https://bugzilla.redhat.com/show_bug.cgi?id=1342398#c6 + *) +let origin_of_source_hypervisor = function + | VMware -> Some 1 + | Xen -> Some 2 + | QEmu | KVM -> 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_ost...

...#rm "/var/lib/yum/uuid" with G.Error _ -> () diff --git a/v2v/OVF.ml b/v2v/OVF.ml index 7129cff..b342ccb 100644 --- a/v2v/OVF.ml +++ b/v2v/OVF.ml @@ -187,7 +187,7 @@ and get_ostype = function "Unassigned" (* Generate the .meta file associated with each volume. *) -let create_meta_files verbose output_alloc sd_uuid image_uuids targets = +let create_meta_files output_alloc sd_uuid image_uuids targets = (* Note: Upper case in the .meta, mixed case in the OVF. *) let output_alloc_for_rhev = match output_alloc with @@ -230,7 +230,7 @@ let create_meta_files verbose output_al...

...-- v2v/create_ovf.mli | 2 +- v2v/output_rhv.ml | 2 +- v2v/output_vdsm.ml | 3 +- 4 files changed, 82 insertions(+), 33 deletions(-) diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml index f60ca9ed3..8d16cf175 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -269,7 +269,7 @@ let create_meta_files output_alloc sd_uuid image_uuids targets = (* Create the OVF file. *) let rec create_ovf source targets guestcaps inspect - output_alloc sd_uuid image_uuids vol_uuids vm_uuid = + output_alloc sd_uuid image_uuids vol_uuids vm_uuid rhv_export_flavor = assert (List.length targets = List.l...

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

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

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

OUnit2 has an OUnit (v1) compatibility module. Unfortunately it is rather gravely broken: https://forge.ocamlcore.org/tracker/?func=detail&aid=1392&group_id=162&atid=730 Since there is no new release fixing this, it's easier to switch to using OUnit2 for unit tests. --- .gitignore | 2 +- README | 2 +- mllib/JSON_tests.ml | 56

...CK is not set). Please read \"INPUT FROM RHEL 5 XEN\" in the virt-v2v(1) man page") class input_libvirt verbose libvirt_uri guest = object diff --git a/v2v/lib_ovf.ml b/v2v/lib_ovf.ml index fcba087..dec2ef8 100644 --- a/v2v/lib_ovf.ml +++ b/v2v/lib_ovf.ml @@ -161,7 +161,7 @@ let create_meta_files verbose output_alloc sd_uuid image_uuid targets = fun ({ target_overlay = ov } as t) -> let size_in_sectors = if ov.ov_virtual_size &^ 511L <> 0L then - error (f_"the virtual size of the input disk %s is not an exact multiple of 512 bytes. The virtua...

...t;-global" ["driver=cfi.pflash01"; "property=secure"; "value=on"]; diff --git a/v2v/output_rhv.ml b/v2v/output_rhv.ml index c3b2294de..ce2d75c1d 100644 --- a/v2v/output_rhv.ml +++ b/v2v/output_rhv.ml @@ -240,7 +240,7 @@ object Create_ovf.create_meta_files output_alloc esd_uuid image_uuids targets in List.iter ( - fun ({ target_file = target_file }, meta) -> + fun ({ target_file }, meta) -> let meta_filename = target_file ^ ".meta" in Changeuid.make_file changeuid_t meta_filename meta ) (...

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

Per my previous email: https://www.redhat.com/archives/libguestfs/2017-September/msg00203.html I'd like to talk about requiring a more modern version of the OCaml compiler. These commits show some of the code changes which would be possible with OCaml >= 3.12 [which it turns out we already require by accident] and also with OCaml >= 4.02. The latter is my favoured option. Rich.