search for: get_ostyp

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

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

...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,203 @@ and get_ostype = function > > > typ distro major minor arch product; > > > "Unassigned" > > > > > > +(* Determine the ovirt:id attribute from libguestfs inspection. > > > + * See ovirt-engine sources, file: > > > + * packaging/conf/o...

...+++++++++++++++++++++++++++++++++++++++++++++++++++++- > 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,203 @@ and get_ostype = function > typ distro major minor arch product; > "Unassigned" > > +(* Determine the ovirt:id attribute from libguestfs inspection. > + * See ovirt-engine sources, file: > + * packaging/conf/osinfo-defaults.properties > + * and also: > + * http...

...++++++++++++++++++- > > 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,203 @@ and get_ostype = function > > typ distro major minor arch product; > > "Unassigned" > > > > +(* Determine the ovirt:id attribute from libguestfs inspection. > > + * See ovirt-engine sources, file: > > + * packaging/conf/osinfo-defaults.properties >...

Hi, v3 of these patches: https://www.redhat.com/archives/libguestfs/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

See proposed change to oVirt: https://gerrit.ovirt.org/#/c/59147/ and RHBZ#1342398. Thanks: Shahar Havivi --- v2v/OVF.ml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/v2v/OVF.ml b/v2v/OVF.ml index 6d24d97..95e4e9f 100644 --- a/v2v/OVF.ml +++ b/v2v/OVF.ml @@ -186,11 +186,15 @@ and get_ostype = function (* Set the <Origin/> element based on the source hypervisor. * https://bugzilla.redhat.com/show_bug.cgi?id=1342398#c6 + * https://gerrit.ovirt.org/#/c/59147/ + * ovirt-engine.git: backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Origi...

This patch series adds stable bus and slot numbers for removable drives (CDs and floppies) when the guest is converted using virt-v2v or virt-p2v. Previously we were a bit random about this. After this patch series, the bus and slot numbers and preserved if at all possible. BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1238053 Rich.

...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; "Unassigned" +(* Set the Origin field based 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 +...

...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 typ distro major minor arch product; "Unassigned" +(* Determine the ovirt:id attribute from libguestfs inspection. + * See ovirt-engine sources, file: + * packaging/conf/osinfo-defaults.properties + * and also: + * https://bugzilla.redhat.com/show_bug.cgi?id=...

...when the version is enough, and use the higher version available also for any following version. --- v2v/OVF.ml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/v2v/OVF.ml b/v2v/OVF.ml index 0e09d29..1f838f5 100644 --- a/v2v/OVF.ml +++ b/v2v/OVF.ml @@ -105,6 +105,26 @@ and get_ostype = function i_arch = "ppc64" | "ppc64le" } -> "sles_11_ppc64" + (* Only Debian 7 is available, so use it for any 7+ version. *) + | { i_type = "linux"; i_distro = "debian"; i_major_version = v } + when v >= 7 -> + &...

...;linux"; i_distro = ("rhel"|"centos"); i_major_version = (3|4) } -> `Desktop (* For Windows (and maybe Linux in future, but it is not set now), @@ -89,19 +89,19 @@ let get_vmtype = function * https://bugzilla.redhat.com/show_bug.cgi?id=1219857#c9 *) and get_ostype = function - | { i_type = "linux"; i_distro = "rhel"; i_major_version = v; + | { i_type = "linux"; i_distro = ("rhel"|"centos"); i_major_version = v; i_arch = "i386" } when v <= 6 -> sprintf "RHEL%d" v - |...

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

...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,203 @@ and get_ostype = function typ distro major minor arch product; "Unassigned" +(* Determine the ovirt:id attribute from libguestfs inspection. + * See ovirt-engine sources, file: + * packaging/conf/osinfo-defaults.properties + * and also: + * https://bugzilla.redhat.com/show_bug.cgi?id=...

...ode. --- v2v/create_ovf.ml | 203 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 201 insertions(+), 2 deletions(-) diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml index 78f6b31a3..ce06ce613 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -242,6 +242,203 @@ and get_ostype = function typ distro major minor arch product; "Unassigned" +(* Determine the ovirt:id attribute from libguestfs inspection. + * See ovirt-engine sources, file: + * packaging/conf/osinfo-defaults.properties + * and also: + * https://bugzilla.redhat.com/show_bug.cgi?id=...

...+++++++++++++++++++++++++++++++++++++++++++++++++++++- > 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 > typ distro major minor arch product; > "Unassigned" > > +(* Determine the ovirt:id attribute from libguestfs inspection. > + * See ovirt-engine sources, file: > + * packaging/conf/osinfo-defaults.properties > + * and also: > + * http...

...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 @@ let rec create_ovf source targets guestcaps inspect e "VmType" [] [PCData vmtype]; (* See https://bugzilla.redhat.co...

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

...sert_equal ~printer expected sections + +(* Test the code which matches [*.inf] files to Windows guests. *) let test_virtio_iso_path_matches_guest_os ctx = (* Windows OSes fake inspection data. *) let make_win name major minor variant arch = { @@ -772,6 +871,7 @@ let suite = "OVF.get_ostype" >:: test_get_ostype; "Utils.drive_name" >:: test_drive_name; "Utils.drive_index" >:: test_drive_index; + "Windows_inf.of_string" >:: test_windows_inf_of_string; "Windows.virtio_iso_path_matches_guest_os" >::...

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