search for: i_product_nam

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

...inor) + + | { i_type = "linux"; i_distro = "centos"; i_major_version = major } -> + Some (sprintf "http://centos.org/centos/%d.0" major) + + | { i_type = "linux"; i_distro = "sles"; + i_major_version = major; i_minor_version = 0; + i_product_name = product } when String.find product "Desktop" >= 0 -> + Some (sprintf "http://suse.com/sled/%d" major) + + | { i_type = "linux"; i_distro = "sles"; + i_major_version = major; i_minor_version = minor; + i_product_name = product } when Str...

...eletions(-) diff --git a/v2v/v2v.ml b/v2v/v2v.ml index a2b6f52..633c29f 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -84,35 +84,8 @@ let rec main () = check_free_space mpstats; check_target_free_space mpstats source targets output; - (* Conversion. *) - let guestcaps = - (match inspect.i_product_name with - | "unknown" -> - message (f_"Converting the guest to run on KVM") - | prod -> - message (f_"Converting %s to run on KVM") prod - ); - - (* RHEV doesn't support serial console so remove any on conversion. *) - let keep_serial_c...

...1 @@ let get_osinfo_id = function | { i_type = "windows"; i_major_version = 6; i_minor_version = 3 } -> Some "http://microsoft.com/win/8.1" + | { i_type = "windows"; i_major_version = 10; i_minor_version = 0; + i_product_variant = "Server"; i_product_name = product } + when String.find product "2019" >= 0 -> + Some "http://microsoft.com/win/2k19" + | { i_type = "windows"; i_major_version = 10; i_minor_version = 0; i_product_variant = "Server" } -> Some "http://microsoft.co...

...Some (sprintf "http://microsoft.com/win/%d.%d" major minor) + + | { i_type = "windows"; i_major_version = 5; i_minor_version = 1 } -> + Some "http://microsoft.com/win/xp" + + | { i_type = "windows"; i_major_version = 5; i_minor_version = 2; + i_product_name = product } when String.find product "XP" >= 0 -> + Some "http://microsoft.com/win/xp" + + | { i_type = "windows"; i_major_version = 5; i_minor_version = 2; + i_product_name = product } when String.find product "R2" >= 0 -> + Some &qu...

...> + 2002 + + | { i_type = "linux" } -> + 5 + + | { i_type = "windows"; i_major_version = 5; i_minor_version = 1 } -> + 1 (* no architecture differentiation of XP on RHV *) + + | { i_type = "windows"; i_major_version = 5; i_minor_version = 2; + i_product_name = product } when String.find product "XP" >= 0 -> + 1 (* no architecture differentiation of XP on RHV *) + + | { i_type = "windows"; i_major_version = 5; i_minor_version = 2; + i_arch = "i386" } -> + 3 + + | { i_type = "windows"; i_majo...

...uot;linux" } -> > + 5 > + > + | { i_type = "windows"; i_major_version = 5; i_minor_version = 1 } -> > + 1 (* no architecture differentiation of XP on RHV *) > + > + | { i_type = "windows"; i_major_version = 5; i_minor_version = 2; > + i_product_name = product } when String.find product "XP" >= 0 -> > + 1 (* no architecture differentiation of XP on RHV *) > + > + | { i_type = "windows"; i_major_version = 5; i_minor_version = 2; > + i_arch = "i386" } -> > + 3 > + > + | { i...

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

...nspection data. *) let get_vmtype = function (* Special cases for RHEL 3 & RHEL 4. *) - | { i_type = "linux"; i_distro = "rhel"; i_major_version = (3|4); + | { i_type = "linux"; i_distro = ("rhel"|"centos"); i_major_version = (3|4); i_product_name = product } when String.find product "ES" >= 0 -> `Server - | { i_type = "linux"; i_distro = "rhel"; i_major_version = (3|4); + | { i_type = "linux"; i_distro = ("rhel"|"centos"); i_major_version = (3|4); i_...

...= "linux"; i_distro = "centos"; i_major_version = major } + when major >= 8 -> + Some (sprintf "http://centos.org/centos/%d" major) + | { i_type = "linux"; i_distro = "sles"; i_major_version = major; i_minor_version = 0; i_product_name = product } when String.find product "Desktop" >= 0 -> -- 2.23.0

.../v2v.ml index 53456ea..c6a567a 100644 --- a/v2v/v2v.ml +++ b/v2v/v2v.ml @@ -371,6 +371,34 @@ let check_target_free_space mpstats source targets output = output#check_target_free_space source targets +let do_convert g inspect source keep_serial_console = + (* Conversion. *) + (match inspect.i_product_name with + | "unknown" -> + message (f_"Converting the guest to run on KVM") + | prod -> + message (f_"Converting %s to run on KVM") prod + ); + + let conversion_name, convert = + try Modules_list.find_convert_module inspect + with Not_found -> +...

.../microsoft.com/win/%d.%d" major minor) > + > + | { i_type = "windows"; i_major_version = 5; i_minor_version = 1 } -> > + Some "http://microsoft.com/win/xp" > + > + | { i_type = "windows"; i_major_version = 5; i_minor_version = 2; > + i_product_name = product } when String.find product "XP" >= 0 -> > + Some "http://microsoft.com/win/xp" > + > + | { i_type = "windows"; i_major_version = 5; i_minor_version = 2; > + i_product_name = product } when String.find product "R2" >= 0...

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

...( function | "" -> diff --git a/v2v/OVF.ml b/v2v/OVF.ml index 56f529a..17008ee 100644 --- a/v2v/OVF.ml +++ b/v2v/OVF.ml @@ -50,7 +50,7 @@ let iso_time = let get_vmtype = function | { i_type = "linux"; i_distro = "rhel"; i_major_version = major; i_product_name = product } - when major >= 5 && string_find product "Server" >= 0 -> + when major >= 5 && String.find product "Server" >= 0 -> Server | { i_type = "linux"; i_distro = "rhel"; i_major_version = major } @@...

...ersion, >> it's just SLES 10, SLES 10.1 (for SP1), 10.2 (for SP2) and so on. > >Oh I see now, it's not duplicated because of the check for >i_minor_version = 0. > >> But I just noticed I forgot to differentiate SLED from SLES. It >> should be possible based on i_product_name. I think it would make >> sense for libosinfo and it doesn't look like they are separate in >> libguestfs (on purpose). Would it also make sense to separate them >> here? Is it even possible? I'm not sure what the compatibility >> promises are. > >No idea....

...t; > + | { i_type = "windows"; i_major_version = 5; i_minor_version = 1 } -> > > > + 1 (* no architecture differentiation of XP on RHV *) > > > + > > > + | { i_type = "windows"; i_major_version = 5; i_minor_version = 2; > > > + i_product_name = product } when String.find product "XP" >= 0 -> > > > + 1 (* no architecture differentiation of XP on RHV *) > > > + > > > + | { i_type = "windows"; i_major_version = 5; i_minor_version = 2; > > > + i_arch = "i386"...

...> + 2002 + + | { i_type = "linux" } -> + 5 + + | { i_type = "windows"; i_major_version = 5; i_minor_version = 1 } -> + 1 (* no architecture differentiation of XP on RHV *) + + | { i_type = "windows"; i_major_version = 5; i_minor_version = 2; + i_product_name = product } when String.find product "XP" >= 0 -> + 1 (* no architecture differentiation of XP on RHV *) + + | { i_type = "windows"; i_major_version = 5; i_minor_version = 2; + i_arch = "i386" } -> + 3 + + | { i_type = "windows"; i_majo...

...> + 2002 + + | { i_type = "linux" } -> + 5 + + | { i_type = "windows"; i_major_version = 5; i_minor_version = 1 } -> + 1 (* no architecture differentiation of XP on RHV *) + + | { i_type = "windows"; i_major_version = 5; i_minor_version = 2; + i_product_name = product } when String.find product "XP" >= 0 -> + 1 (* no architecture differentiation of XP on RHV *) + + | { i_type = "windows"; i_major_version = 5; i_minor_version = 2; + i_arch = "i386" } -> + 3 + + | { i_type = "windows"; i_majo...

...DefaultDisplayType" [] [PCData "1"]; - - e "Section" ["ovf:id", vm_uuid; "ovf:required", "false"; - "xsi:type", "ovf:OperatingSystemSection_Type"] [ - e "Info" [] [PCData inspect.i_product_name]; - e "Description" [] [PCData ostype]; - ]; - - e "Section" ["xsi:type", "ovf:VirtualHardwareSection_Type"] [ - e "Info" [] [PCData (sprintf "%d CPU, %Ld Memory" source.s_vcpu memsize_mb)]; - e &q...

...uot;linux" } -> > + 5 > + > + | { i_type = "windows"; i_major_version = 5; i_minor_version = 1 } -> > + 1 (* no architecture differentiation of XP on RHV *) > + > + | { i_type = "windows"; i_major_version = 5; i_minor_version = 2; > + i_product_name = product } when String.find product "XP" >= 0 -> > + 1 (* no architecture differentiation of XP on RHV *) > + > + | { i_type = "windows"; i_major_version = 5; i_minor_version = 2; > + i_arch = "i386" } -> > + 3 > + > + | { i...