search for: rhvexportstoragedomain

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

...;|" 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.RHVExportStorageDomain in > - let ovf_flavours_str = String.concat "|" Create_ovf.ovf_flavours in > let set_vdsm_ovf_flavour arg = > vdsm_ovf_flavour := Create_ovf.ovf_flavour_of_string arg in Is it really used as global variable? -- Pino Toscano

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

...uid; - "ovf:required", "false"] + "ovf:required", "false"; + "ovirt:id", string_of_int ovirt_osid] osinfo_subnodes | RHVExportStorageDomain -> e "Section" ["ovf:id", vm_uuid; "ovf:required", "false"; -- 2.14.3

...t 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.RHVExportStorageDomain in - let ovf_flavours_str = String.concat "|" Create_ovf.ovf_flavours in let set_vdsm_ovf_flavour arg = vdsm_ovf_flavour := Create_ovf.ovf_flavour_of_string arg in -- 2.13.2

...4,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", "out"; "xsi:type", "ovf:VirtualSystem_Type"] !content_subnodes -- 2.14.3

...9,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", "out"; "xsi:type", "ovf:VirtualSystem_Type"] !content_subnodes -- 2.14.3

...t;; > + "ovirt:id", string_of_int ovirt_osid] Sadly, OVF schema says ovf:id is reqiured. But since the generated OVF is not used by anything besides oVirt I think we can live without it. Tomas > osinfo_subnodes > | RHVExportStorageDomain -> > e "Section" ["ovf:id", vm_uuid; "ovf:required", "false"; > -- > 2.14.3 > -- Tomáš Golembiovský <tgolembi@redhat.com>

...43,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 "rasd:ResourceType" [] [PCData "20"]; + e "rasd:Resource...

...ns(+), 2 deletions(-) diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml index ac3c61b13..e0f81e0a2 100644 --- a/v2v/create_ovf.ml +++ b/v2v/create_ovf.ml @@ -835,6 +835,7 @@ and add_disks targets guestcaps output_alloc sd_uuid image_uuids vol_uuids | OVirt -> image_uuid | RHVExportStorageDomain -> vol_uuid); "ovf:size", Int64.to_string size_gb; + "ovf:capacity", Int64.to_string ov.ov_virtual_size; "ovf:fileRef", fileref; "ovf:parentRef", ""; "ovf:vm_snapshot_id", uuidgen ();...

...uid; - "ovf:required", "false"] + "ovf:required", "false"; + "ovirt:id", string_of_int ovirt_osid] osinfo_subnodes | RHVExportStorageDomain -> e "Section" ["ovf:id", vm_uuid; "ovf:required", "false"; -- 2.14.3

...uot;, "false"] + let ovirt_osid = get_ovirt_osid inspect in + e "OperatingSystemSection" ["ovf:required", "false"; + "ovirt:id", string_of_int ovirt_osid] osinfo_subnodes | RHVExportStorageDomain -> e "Section" ["ovf:id", vm_uuid; "ovf:required", "false"; -- 2.14.3

..."ovf:required", "false"] > + "ovf:required", "false"; > + "ovirt:id", string_of_int ovirt_osid] > osinfo_subnodes > | RHVExportStorageDomain -> > e "Section" ["ovf:id", vm_uuid; "ovf:required", "false"; Yes looks OK, ACK. Also Michal gave his ACK on IRC. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualizati...

...- assert (target_firmware = TargetBIOS); (* Create the metadata. *) let ovf = Create_ovf.create_ovf source targets guestcaps inspect - output_alloc esd_uuid image_uuids vol_uuids vm_uuid + target_firmware output_alloc esd_uuid image_uuids vol_uuids vm_uuid Create_ovf.RHVExportStorageDomain in (* Write it to the metadata file. *) diff --git a/v2v/output_rhv_upload.ml b/v2v/output_rhv_upload.ml index 63fa2411a..3dcd6d952 100644 --- a/v2v/output_rhv_upload.ml +++ b/v2v/output_rhv_upload.ml @@ -253,7 +253,7 @@ object sprintf " -oc %s -op %s -os %s" outp...

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

...dk_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 option: %s") s in + let input_opt...

...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 option: %...

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