search for: create_ovf

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

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 ++-- v2v/output_vdsm.ml | 6 ++---- v2v/test-v2v-o-rhv.ovf.expected |...

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 b/v2v/create_ovf.ml > index f5e34d79f..87245fdc8 100644 > --- a/v2v/create_ovf.ml > +++ b/v2v/create_ovf.ml > @@ -444,6 +444,9 @@ let rec create_ovf source targets guestcaps inspect >...

Add oVirt specific elemnt to OVF. It represents the combination of machine type (i440fx/q35) and firmware (BIOS/UEFI). Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/create_ovf.ml | 20 +++++++++++++++++++- v2v/create_ovf.mli | 2 +- v2v/output_rhv.ml | 6 ++---- v2v/output_rhv_upload.ml | 4 ++-- v2v/output_vdsm.ml | 6 ++---- v2v/test-v2v-o-rhv.ovf.expected...

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 ] ]; +...

The change is not correct in case the OVF is used in -o vdsm mode, for example. Let's revert it, and then implement it properly. This reverts commit 296b2f66c71df0bf5ee2ee605fe4b92672796ab3. --- 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 1cba165a4..901d47528 100644 --- a/v2v/create_ovf.ml +++ b/v2...

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 ] ]; +...

If CPU model is available store it in OVF for oVirt. This affects -o rhev and -o vdsm. Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/create_ovf.ml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml index f5dc64753..9d7341696 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -306,6 +306,12 @@ let rec create_ovf source targets guestcaps inspect e "DefaultDisplayType" []...

...ng 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. For now the virt-v2v behavior is unchanged. The modified output will be enabled in some later patch. Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/create_ovf.ml | 108 ++++++++++++++++++++++++++++++++++++++--------------- 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/...

...ibguestfs/2018-April/msg00002.html https://www.redhat.com/archives/libguestfs/2018-April/msg00006.html Thanks, Pino Toscano (3): v2v: OVF: improve get_ostype mappings v2v: OVF: write ovirt:id attribute for the OS in OVirt flavour v2v: OVF: fix ovf:id for VirtualSystem in OVirt flavour v2v/create_ovf.ml | 253 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 239 insertions(+), 14 deletions(-) -- 2.14.3

I also checked the other ovirt IDs and they all seem to be correct, although this mapping to internal oVirt database IDs is by its nature very fragile and will require constant maintenance. Rich.

Hi, v2 of this patch: https://www.redhat.com/archives/libguestfs/2018-April/msg00003.html that includes an additional fix. Thanks, Pino Toscano (2): v2v: OVF: write ovirt:id attribute for the OS in OVirt flavour v2v: OVF: fix ovf:id for VirtualSystem in OVirt flavour v2v/create_ovf.ml | 204 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 202 insertions(+), 2 deletions(-) -- 2.14.3

...ll contain some oVirt specific pieces. 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/Makefile.am | 2 + v2v/cmdline.ml | 10 ++ v2v/create_ovf.ml | 159 ++++++++++++++++++++++--------- v2v/create_ovf.mli | 21 +++- v2v/output_rhv.ml | 3 +- v2v/output_vdsm.ml | 10 +- v2v/output_vdsm.mli | 1 + v2v/test-v2v-o-rhv.ovf.expect...

...michal [1] https://bugzilla.redhat.com/show_bug.cgi?id=1573462 > > "Non Linux Operating systems must have the Single PCI option > disabled" > > Thanks to Michal Skrivanek for diagnosis. > > Fixes commit 593a19cc86cfa8f24c66518c8ba21222550b066a. > --- > 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 c29b8421c..190cf8bed 100644 > --- a/v2v/create_ovf.ml > +++ b/v2v/create_ovf.ml > @@ -418,7 +418,7 @@ and get_ovirt_osid = function > > | { i_type...

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

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 b/v2v/create_ovf.ml index f5e34d79f..87245fdc8 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -444,6 +444,9 @@ let rec create_ovf source targets guestcaps inspect e "rasd:ResourceType" [...

...on(-) > > diff --git a/v2v/cmdline.ml b/v2v/cmdline.ml > index 70e9a3c3b..6aecd2aee 100644 > --- a/v2v/cmdline.ml > +++ b/v2v/cmdline.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.RHVExportStorageDom...

When writing the OVF in OVirt flavour, add a ovirt:id attribute to the OperatingSystemSection tag: this attribute represents the numeric value of the ostype ID, which is ignored by oVirt when parsing OVFs in API mode. --- v2v/create_ovf.ml | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 201 insertions(+), 1 deletion(-) diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml index 64edd2b86..34cd925e7 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -216,6 +216,203 @@ and get_ostype = function...

...oscano <ptoscano@redhat.com> wrote: > When writing the OVF in OVirt flavour, add a ovirt:id attribute to the > OperatingSystemSection tag: this attribute represents the numeric value > of the ostype ID, which is ignored by oVirt when parsing OVFs in API > mode. > --- > v2v/create_ovf.ml | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 201 insertions(+), 1 deletion(-) > > diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml > index 64edd2b86..f56c4cb64 100644 > --- a/v2v/create_ovf.ml > +++ b/v2v/create_ovf.ml > @@ -216,6 +216,2...

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 b/v2v/create_ovf.ml index f5e34d79f..87245fdc8 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -444,6 +444,9 @@ let rec create_ovf source targets guestcaps inspect e "rasd:ResourceType" [...