search for: parse_ovf_from_ova

Read the MAC address of the network interfaces from the <rasd:Address> tag of the OVF. This seems to be one of the possible ways used in OVFs. --- v2v/parse_ovf_from_ova.ml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/v2v/parse_ovf_from_ova.ml b/v2v/parse_ovf_from_ova.ml index fe8228dcc..4ee6bc901 100644 --- a/v2v/parse_ovf_from_ova.ml +++ b/v2v/parse_ovf_from_ova.ml @@ -232,8 +232,9 @@ let parse_ovf_from_ova ovf_filename = let vnet...

No need to read the whole OVF file in memory and parse that -- let libxml2 parse it directly. --- v2v/parse_ovf_from_ova.ml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/v2v/parse_ovf_from_ova.ml b/v2v/parse_ovf_from_ova.ml index 27761d23..5acf7070 100644 --- a/v2v/parse_ovf_from_ova.ml +++ b/v2v/parse_ovf_from_ova.ml @@ -36,8 +36,7 @@ type ovf_disk = { } let xpathctx_of_ovf ovf_filename =...

...iterally just an internal name for the network element, and is not significant in how the network is used. Also update documentation because you must use ‘--bridge’ when converting VMware guests to RHV. For a full explanation see: https://bugzilla.redhat.com/show_bug.cgi?id=1559027#c2 --- v2v/parse_ovf_from_ova.ml | 9 +++++---- v2v/virt-v2v.pod | 31 +++++++++++++------------------ 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/v2v/parse_ovf_from_ova.ml b/v2v/parse_ovf_from_ova.ml index d8de0cea1..82d7adf8c 100644 --- a/v2v/parse_ovf_from_ova.ml +++ b/v2v/parse_ovf_from_ova.ml...

...xctx "xpath_expr" 10 -> Option.default 10 (xpath_int xctx "xpath_expr") --- common/mltools/xpath_helpers.ml | 12 ------------ common/mltools/xpath_helpers.mli | 6 ------ v2v/copy_to_local.ml | 6 +++--- v2v/parse_libvirt_xml.ml | 9 ++++----- v2v/parse_ovf_from_ova.ml | 16 ++++++++-------- 5 files changed, 15 insertions(+), 34 deletions(-) diff --git a/common/mltools/xpath_helpers.ml b/common/mltools/xpath_helpers.ml index 05fad89a4..3afee8b21 100644 --- a/common/mltools/xpath_helpers.ml +++ b/common/mltools/xpath_helpers.ml @@ -40,15 +40,3 @@ let xp...

...irt_xml.ml | 36 ++++++++++++++++++++++++++++++++++ v2v/input_disk.ml | 5 +++++ v2v/input_ova.ml | 8 +++++++- v2v/output_qemu.ml | 24 +++++++++++++++++++++-- v2v/parse_libvirt_xml.ml | 11 +++++++++++ v2v/parse_ovf_from_ova.ml | 22 ++++++++++++++++++++- v2v/parse_ovf_from_ova.mli | 5 +++-- v2v/test-v2v-i-ova-formats.expected | 3 +++ v2v/test-v2v-i-ova-gz.expected | 3 +++ v2v/test-v2v-i-ova-subfolders.expected | 3 +++ v2v/test-v2v-i-ova-tar.expected | 3 +++ v2v/test...

...t;virtio" as the model for such interfaces. Start reading the model, if available, mapping only E1000 for now. There are also other models, e.g. PCNet32 or VmxNet3, but they are ignored for now: reading them as Source_other_nic would result in v2v rejecting OVAs previously converted. --- v2v/parse_ovf_from_ova.ml | 7 ++++++- v2v/test-v2v-i-ova-formats.expected | 2 +- v2v/test-v2v-i-ova-gz.expected | 2 +- v2v/test-v2v-i-ova-subfolders.expected | 2 +- v2v/test-v2v-i-ova-subfolders.expected2 | 2 +- v2v/test-v2v-i-ova-tar.expected | 2 +- v2v/test-v2v-i-ova-tar.expect...

...very hard to understand. Splitting the XML parsing into another module simplifies the flow considerably. This is just code refactoring and should not affect the semantics. --- v2v/Makefile.am | 2 + v2v/input_ova.ml | 323 +++++++++++---------------------------------- v2v/parse_ovf_from_ova.ml | 226 +++++++++++++++++++++++++++++++ v2v/parse_ovf_from_ova.mli | 36 +++++ 4 files changed, 343 insertions(+), 244 deletions(-) create mode 100644 v2v/parse_ovf_from_ova.ml create mode 100644 v2v/parse_ovf_from_ova.mli diff --git a/v2v/Makefile.am b/v2v/Makefile.am index a6a9899..f065654...

https://bugzilla.redhat.com/show_bug.cgi?id=1508874 Also avoids a warning. Rich.

...| 6 ++---- v2v/input_vmx.ml | 13 ++++++------- v2v/output_glance.ml | 27 +++++++++------------------ v2v/output_qemu.ml | 32 ++++++++++++-------------------- v2v/parse_libvirt_xml.ml | 11 ++++++++--- v2v/parse_ovf_from_ova.ml | 13 +++++++------ v2v/parse_ovf_from_ova.mli | 4 ++-- v2v/test-v2v-i-ova-formats.expected | 2 +- v2v/test-v2v-i-ova-gz.expected | 2 +- v2v/test-v2v-i-ova-subfolders.expected | 2 +- v2v/test-v2v-i-ova-subfolders.expected2 | 2 +- v2v/test-v2v-i-...

...) does parse them as Source_other_nic. Apart from rcaps_from_source which is only used by --in-place conversions the NIC model is basically ignored everywhere. So I think it would be safe to modify this patch to map them to Source_other_nic unless I've missed something else. Rich. > v2v/parse_ovf_from_ova.ml | 7 ++++++- > v2v/test-v2v-i-ova-formats.expected | 2 +- > v2v/test-v2v-i-ova-gz.expected | 2 +- > v2v/test-v2v-i-ova-subfolders.expected | 2 +- > v2v/test-v2v-i-ova-subfolders.expected2 | 2 +- > v2v/test-v2v-i-ova-tar.expected | 2 +- >...

A couple of patches cleaning up the -i ova code. These are both just refactoring (or should be at any rate). The second patch is best viewed with 'git show -w' to exclude whitespace changes. Rich.

This is tangentially related to: https://bugzilla.redhat.com/show_bug.cgi?id=1372668 The problem in that bug is that we didn't pass the source CPU model (Sandybridge in that case) through to the target RHV hypervisor. So when the Windows guest booted on the target it gives an error about CPU hardware being disconnected (although it otherwise boots and works fine). This patch series

v1 -> v2: - Support for passing topology through -o glance. - Support for passing topology through -o rhv. - Use bool for acpi/apic/pae struct fields in virt-p2v. - Write the xpath expression in error messages instead of file/line. - Fix more memory leaks in virt-p2v cpuid.c. - Passes make check & check-valgrind. There may be some other minor changes. I believe that everything

https://bugzilla.redhat.com/show_bug.cgi?id=1570407 This turned into quite an in-depth refactoring of how we handle OVAs. It also fixes a potential security issue. Rich.

In Std_utils we already extend Char and String. These commits take it a little further by extending List and adding a new Option submodule. All basically simple refactoring. Rich.

This time including the first commit ...

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

Deep in the discussion of this bug, unfortunately mostly in private comments: https://bugzilla.redhat.com/show_bug.cgi?id=1594515 we decided it'd be more flexible for RHV if we had a way to map individual NICs to target networks and bridges. This can be done by adding a new --mac option so you can specify the exact mapping you need: $ virt-v2v [...] \ --mac

v2 -> v3: - Renamed List.assoc_ -> List.assoc_lbl. - Rebased on top of current master branch. Rich.

v1 was here: https://www.redhat.com/archives/libguestfs/2017-September/msg00135.html This is a more complete evolution of the earlier patch. It replaces most important uses of Str with PCRE throughout the code. It also extends the bindings with some useful features like case-insensitive regexps. The main places I *didn't* touch are the generator (GObject uses Str extensively); and