similar to: [PATCH 1/2] Revert "v2v: oVirt changed the ResourceType for QXL video devices (RHBZ#1598715)."

Due to a conflict with the IDs of the OVF standard, and the existing implementation in ovirt-engine, the ID of QXL devices changed to a different value. As a consequence, change the ResourceType of QXL devices, but only in OVirt flavour to avoid breaking vdsm mode. See: https://bugzilla.redhat.com/show_bug.cgi?id=1598715#c5 --- v2v/create_ovf.ml | 6 +++++-

See: https://bugzilla.redhat.com/show_bug.cgi?id=1598715#c5 --- v2v/create_ovf.ml | 2 +- v2v/test-v2v-o-rhv.ovf.expected | 2 +- v2v/test-v2v-o-vdsm-options.ovf.expected | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml index b2a240907..f5f29cdc4 100644 --- a/v2v/create_ovf.ml +++ b/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. 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

This affects -o rhv and -o vdsm. Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/create_ovf.ml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml index cfca63452..03df7f934 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -390,6 +390,29 @@ let rec create_ovf source targets guestcaps inspect ]

This affects -o rhv and -o vdsm. Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/create_ovf.ml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml index cfca63452..f5dc64753 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -390,6 +390,29 @@ let rec create_ovf source targets guestcaps inspect ]

On Thursday, 1 March 2018 17:24:17 CET Richard W.M. Jones wrote: > Without this extra element, oVirt will crash with a Java > NullPointerException (see https://bugzilla.redhat.com/1550123). > > Fixes commit dac5fc53acdd1e51be2957c67e1e063e2132e680. > --- > v2v/create_ovf.ml | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/v2v/create_ovf.ml

Check the generated OVF for -o rhv and -o vdsm outputs. Variable UUIDs and date/times are filtered out. Make sure the the important UUIDs (disk, volume, VM) are where we think they should be. Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/test-v2v-o-rhv.ovf.expected | 92 ++++++++++++++++++++++++++++++++ v2v/test-v2v-o-rhv.sh | 20 +++++++

https://bugzilla.redhat.com/show_bug.cgi?id=1342398#c6 --- v2v/OVF.ml | 138 ++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 76 insertions(+), 62 deletions(-) diff --git a/v2v/OVF.ml b/v2v/OVF.ml index 8a6f13e..0599306 100644 --- a/v2v/OVF.ml +++ b/v2v/OVF.ml @@ -184,6 +184,15 @@ and get_ostype = function typ distro major minor arch product;

v1 -> v2: - Support for passing topology through -o glance. - Support for passing topology through -o rhv. - Use bool for acpi/apic/pae struct fields in virt-p2v. - Write the xpath expression in error messages instead of file/line. - Fix more memory leaks in virt-p2v cpuid.c. - Passes make check & check-valgrind. There may be some other minor changes. I believe that everything

1. AWS the name tag is not mandatory - using default as a name 2. AWD doesn't prefix 'ovf:' as prefix to disk path There is an open bug for oVirt: https://bugzilla.redhat.com/show_bug.cgi?id=1371843 Signed-off-by: Shahar Havivi <shaharh@redhat.com> --- v2v/input_ova.ml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/v2v/input_ova.ml

v2 -> v3: - Changes to the Curl API suggested by Pino.

v1 -> v2: - Fixed the bug with precedence of if / @. - Add some imperative list operators inspired by Perl, and use those for constructing the Curl arguments, and more. Rich.

Hi, I need to parse xml (vmware ovf) which have a namespace. Attached the ovf file. Thanks, Shahar.

OVA not a real standard. Colour me surprised ...

The virt-v2v behaviour for OVA input now depends on QEMU version available. The tests affected by this now have two *.expect files and the expected result now also depends on the QEMU used. Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- test-data/utils.sh | 21 +++++ v2v/Makefile.am | 1 + v2v/test-v2v-i-ova-formats.sh

Instead of using ‘xpath_(string|int|int64)_default’ we can write the equivalent code using ‘Option.default’. This is not quite so concise, but may be easier to understand. eg: xpath_int_default xctx "xpath_expr" 10 -> Option.default 10 (xpath_int xctx "xpath_expr") --- common/mltools/xpath_helpers.ml | 12 ------------ common/mltools/xpath_helpers.mli | 6 ------

Mixing the XML parsing with the other functions of this module made it very hard to understand. Splitting the XML parsing into another module simplifies the flow considerably. This is just code refactoring and should not affect the semantics. --- v2v/Makefile.am | 2 + v2v/input_ova.ml | 323 +++++++++++---------------------------------- v2v/parse_ovf_from_ova.ml | 226

We don't have to always extract all files from the OVA archive. The OVA, as defined in the standard, is plain tar. We can work directly over the tar archive if we use correct 'offset' and 'size' options when defining the backing file for QEMU. This puts much lower requirement on available disk space. Since the virt-v2v behaviour for OVA input now depends on QEMU version

Hi there, Here is v3 of the remaining patches. Diff to v2: * Removed the patch related to QXL * Fixed the firstboot script with Roman's comments * Fixed ova with subfolders test * Handle MF-relative path in ova files * Fixed now unneeded match case as per Richard's comment Cédric Bosdonnat (3): customize: fix windows firstboot script v2v: add support for SUSE VMDP drivers v2v: