search for: sd_uuid

The @SD_UUID@ pattern was not being replaced correctly. Thanks: Daniel Erez. --- v2v/rhv-upload-createvm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v2v/rhv-upload-createvm.py b/v2v/rhv-upload-createvm.py index a34627ec8..1d0e8c95d 100644 --- a/v2v/rhv-upload-createvm.py +++ b/v2v/r...

...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.length vol_uuids);...

...If the messages above are not sufficient to diagnose the problem then add the diskid ) targets in - (* We don't have the storage domain UUID, but instead we write - * in a magic value which the Python code (which can get it) - * will substitute. - *) - let sd_uuid = "@SD_UUID@" in + (* The storage domain UUID. *) + let sd_uuid = + match rhv_storagedomain_uuid with + | None -> assert false + | Some uuid -> uuid in (* The volume and VM UUIDs are made up. *) let vol_uuids = List.map (fun _ -> uuidgen ()) targe...

...i+1) nr_disks; + let diskid = read_whole_file diskid_file in + disks_uuids <- disks_uuids @ [diskid]; + + method create_metadata source targets _ guestcaps inspect target_firmware = + assert (List.length disks_uuids = List.length targets); (* The storage domain UUID. *) let sd_uuid = @@ -406,7 +406,7 @@ If the messages above are not sufficient to diagnose the problem then add the let ovf = Create_ovf.create_ovf source targets guestcaps inspect target_firmware output_alloc - sd_uuid image_uuids vol_uuids vm_u...

This patch series fixes various issues in the rhv-upload output mode: - properly find and use RHV resources - cleanup orphan disks, and possibly the current disk transfer on failure In reality, the first 4 patches deal with resources, and the other 4 with cleanups. The latter block can be theoretically sent alone -- I just happened to start working on it as part of my "let's fix

..., 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 guestcaps inspect +let r...

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

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

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

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

...he command line to specify the UUIDs of guest disk images (for this guest: %d)") + (List.length targets) + | Some uuids, _ -> uuids + | None, uuids -> uuids in + assert (List.length image_uuids = List.length targets); (* The storage domain UUID. *) let sd_uuid = @@ -433,7 +466,7 @@ If the messages above are not sufficient to diagnose the problem then add the let ovf = Create_ovf.create_ovf source targets guestcaps inspect target_firmware output_alloc - sd_uuid disks_uuids vol_uuids vm_u...

...on 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 +220,12 @@ let creat...

...on 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 +220,12 @@ let creat...

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

Mainly minor fixes and code cleanups over the v4 patch. There are still several problems with this patch, but it is in a reviewable state, especially the Python code. Rich.

...(id+1) nr_disks; + let diskid = read_whole_file diskid_file in + diskid + ) targets in + + (* We don't have the storage domain UUID, but instead we write + * in a magic value which the Python code (which can get it) + * will substitute. + *) + let sd_uuid = "@SD_UUID@" in + + (* The volume and VM UUIDs are made up. *) + let vol_uuids = List.map (fun _ -> uuidgen ()) targets + and vm_uuid = uuidgen () in + + (* Create the metadata. *) + let ovf = + Create_ovf.create_ovf source targets guestcaps inspect +...

...iskid = read_whole_file diskid_file in > + diskid > + ) targets in > + > + (* We don't have the storage domain UUID, but instead we write > + * in a magic value which the Python code (which can get it) > + * will substitute. > + *) > + let sd_uuid = "@SD_UUID@" in > + > + (* The volume and VM UUIDs are made up. *) > + let vol_uuids = List.map (fun _ -> uuidgen ()) targets > + and vm_uuid = uuidgen () in > + > + (* Create the metadata. *) > + let ovf = > + Create_ovf.create_ovf source t...

...iskid = read_whole_file diskid_file in > + diskid > + ) targets in > + > + (* We don't have the storage domain UUID, but instead we write > + * in a magic value which the Python code (which can get it) > + * will substitute. > + *) > + let sd_uuid = "@SD_UUID@" in > + > + (* The volume and VM UUIDs are made up. *) > + let vol_uuids = List.map (fun _ -> uuidgen ()) targets > + and vm_uuid = uuidgen () in > + > + (* Create the metadata. *) > + let ovf = > + Create_ovf.create_ovf source t...

...ile in > +          diskid > +      ) targets in > + > +    (* We don't have the storage domain UUID, but instead we write > +     * in a magic value which the Python code (which can get it) > +     * will substitute. > +     *) > +    let sd_uuid = "@SD_UUID@" in > + > +    (* The volume and VM UUIDs are made up. *) > +    let vol_uuids = List.map (fun _ -> uuidgen ()) targets > +    and vm_uuid = uuidgen () in > + > +    (* Create the metadata. *) > +    let ovf = > +   ...

...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-000000000000\n";...