search for: ovf_flavour

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

...> 1 file changed, 2 insertions(+), 1 deletion(-) > > 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_ov...

This patch isn't quite complete (see ‘assert false’). Currently we have a bunch of ad hoc options like --vddk* and --vdsm* (and proposed to add --rhv*) to handle extra parameters for input and output modes/transports. This complicates the command line parsing and also the clarity of the command line (becauseit's not very obvious which options apply to which side of the conversion).

...ta_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 rec create_ovf source targets guestcaps inspect target_firmware output_alloc sd_uuid image_uuids vol_uuids vm_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 inspe...

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/cmdline.ml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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.RHVExportStor...

On Thu, 5 Apr 2018 14:53:51 +0200 Pino Toscano <ptoscano@redhat.com> wrote: > @@ -383,8 +581,9 @@ let rec create_ovf source targets guestcaps inspect > ] in > (match ovf_flavour with > | OVirt -> > - e "OperatingSystemSection" ["ovf:id", vm_uuid; > - "ovf:required", "false"] > + let ovirt_osid = get_ovirt_osid inspect in > + e "OperatingSy...

...print = ref None in - let vddk_transports = ref None in - let vddk_vimapiver = ref None in - let vdsm_vm_uuid = ref None in - let vdsm_ovf_output = ref None in (* default "." *) - - let vdsm_compat = ref "0.10" in - let set_vdsm_compat s = vdsm_compat := s in - - let vdsm_ovf_flavour = ref Create_ovf.RHVExportStorageDomain in - let set_vdsm_ovf_flavour arg = - vdsm_ovf_flavour := Create_ovf.ovf_flavour_of_string arg in let set_string_option_once optname optref arg = match !optref with @@ -110,6 +92,15 @@ let parse_cmdline () = error (f_"unknown -i opti...

...ts = ref None in > - let vddk_vimapiver = ref None in > - let vdsm_vm_uuid = ref None in > - let vdsm_ovf_output = ref None in (* default "." *) > - > - let vdsm_compat = ref "0.10" in > - let set_vdsm_compat s = vdsm_compat := s in > - > - let vdsm_ovf_flavour = ref Create_ovf.RHVExportStorageDomain in > - let set_vdsm_ovf_flavour arg = > - vdsm_ovf_flavour := Create_ovf.ovf_flavour_of_string arg in > > let set_string_option_once optname optref arg = > match !optref with > @@ -110,6 +92,15 @@ let parse_cmdline () = >...

v6 was here: https://www.redhat.com/archives/libguestfs/2018-March/msg00126.html This makes a number of significant changes: - Input and output options now use a uniform set of -io and -oo parameters. - For -o rhv-upload, we use ‘-oo rhv-cafile=/tmp/ca.pem’ etc. The ‘--rhv*’ options have been dropped. - Rearranges the documentation. - As before includes (untested) support for zero,

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

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(-)

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

...List.iter (printf "input:%s\n") (Modules_list.input_modules ()); - List.iter (printf "output:%s\n") (Modules_list.output_modules ()); - List.iter (printf "convert:%s\n") (Modules_list.convert_modules ()); - List.iter (printf "ovf:%s\n") Create_ovf.ovf_flavours; + machine_readable_printf "virt-v2v\n"; + machine_readable_printf "libguestfs-rewrite\n"; + machine_readable_printf "vcenter-https\n"; + machine_readable_printf "xen-ssh\n"; + machine_readable_printf "vddk\n"; + machine_readable_...

...emas.dmtf.org/ovf/envelope/1/"; + "xmlns:ovirt", "http://ovirt.org/vm/tune/1.0"; "ovf:version", "0.9" ] [ Comment generated_by; @@ -357,8 +555,10 @@ let rec create_ovf source targets guestcaps inspect ] in (match ovf_flavour with | OVirt -> + let ovirt_osid = get_ovirt_osid inspect in e "OperatingSystemSection" ["ovf:id", vm_uuid; - "ovf:required", "false"] + "ovf:requir...

...uot;; > + "xmlns:ovirt", "http://www.ovirt.org/ovf"; > "ovf:version", "0.9" > ] [ > Comment generated_by; > @@ -357,8 +555,10 @@ let rec create_ovf source targets guestcaps inspect > ] in > (match ovf_flavour with > | OVirt -> > + let ovirt_osid = get_ovirt_osid inspect in > e "OperatingSystemSection" ["ovf:id", vm_uuid; Having UUID here does not make sense. We can use 0 which is "Unknown" or 1 wich is "Other". Tomas...

...output", v -> if !ovf_output <> None then - error (f_"-o vdsm: -oo vdsm-ovf-output set twice"); + error (f_"-o vdsm: -oo vdsm-ovf-output set more than once"); ovf_output := Some v; | "vdsm-ovf-flavour", v -> ovf_flavour := Create_ovf.ovf_flavour_of_string v -- 2.17.1

...--- 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 f56c4cb64..554374f45 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -674,7 +674,7 @@ let rec create_ovf source targets guestcaps inspect (match ovf_flavour with | OVirt -> - e "VirtualSystem" ["ovf:id", "out"] !content_subnodes + e "VirtualSystem" ["ovf:id", vm_uuid] !content_subnodes | RHVExportStorageDomain -> e "Content" ["ovf:id", &quot...

...--- 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 ce06ce613..2fc041168 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -699,7 +699,7 @@ let rec create_ovf source targets guestcaps inspect (match ovf_flavour with | OVirt -> - e "VirtualSystem" ["ovf:id", "out"] !content_subnodes + e "VirtualSystem" ["ovf:id", vm_uuid] !content_subnodes | RHVExportStorageDomain -> e "Content" ["ovf:id", &quot...

...01d47528..2cf610333 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -643,10 +643,14 @@ let rec create_ovf source targets guestcaps inspect * See RHBZ#1213701 and RHBZ#1211231 for the reasoning * behind that. *) + let qxl_resourcetype = + match ovf_flavour with + | OVirt -> 32768 (* RHBZ#1598715 *) + | RHVExportStorageDomain -> 20 in e "Item" [] [ e "rasd:Caption" [] [PCData "Graphical Controller"]; e "rasd:InstanceId" [] [PCData (uuidgen ())]; - e...