search for: input_disk

In disk input mode, to determine the guest name strip the extension from the filename only if it's a very well extension for disk images. --- v2v/input_disk.ml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/v2v/input_disk.ml b/v2v/input_disk.ml index 17ad61d..939a16b 100644 --- a/v2v/input_disk.ml +++ b/v2v/input_disk.ml @@ -42,9 +42,13 @@ class input_disk input_format disk = object * the filename passed in. Users ca...

In disk input mode, to determine the guest name strip the extension from the filename only if it's a very well extension for disk images. --- v2v/input_disk.ml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/v2v/input_disk.ml b/v2v/input_disk.ml index 17ad61d..d56c476 100644 --- a/v2v/input_disk.ml +++ b/v2v/input_disk.ml @@ -42,9 +42,23 @@ class input_disk input_format disk = object * the filename passed i...

This makes them visible in the help text of -i and -o. --- v2v/input_disk.ml | 5 ++++- v2v/output_local.ml | 5 ++++- v2v/output_rhev.ml | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/v2v/input_disk.ml b/v2v/input_disk.ml index 17ad61d..508f16a 100644 --- a/v2v/input_disk.ml +++ b/v2v/input_disk.ml @@ -101,4 +101,7 @@ class input_disk inpu...

Use the common function for ensuring a path is absolute; it should not change the behaviour at all. --- sparsify/cmdline.ml | 6 +----- v2v/input_disk.ml | 4 +--- v2v/input_ova.ml | 4 +--- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/sparsify/cmdline.ml b/sparsify/cmdline.ml index 3eb0d5b..523d612 100644 --- a/sparsify/cmdline.ml +++ b/sparsify/cmdline.ml @@ -142,11 +142,7 @@ read the man page virt-sparsify(1). (*...

Use the common open_guestfs to open Guestfs handles, so we get debugging, tracing, and other common options set. --- v2v/convert_windows.ml | 4 +--- v2v/input_disk.ml | 2 +- v2v/input_libvirt_other.ml | 2 +- v2v/input_ova.ml | 2 +- v2v/output_glance.ml | 2 +- v2v/output_null.ml | 2 +- v2v/output_rhev.ml | 2 +- v2v/output_vdsm.ml | 2 +- v2v/types.ml | 2 +- v2v/v2v.ml | 4 ++-...

Simple code motion. --- v2v/Makefile.am | 2 ++ v2v/input_disk.ml | 21 ++------------------- v2v/name_from_disk.ml | 41 +++++++++++++++++++++++++++++++++++++++++ v2v/name_from_disk.mli | 24 ++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 19 deletions(-) create mode 100644 v2v/name_from_disk.ml create mode 100644 v2v/name_from_disk.mli d...

Extend Modules_list to handle also aliases for input and output modules, and use this to register the existing aliases. --- v2v/input_disk.ml | 2 +- v2v/modules_list.ml | 25 +++++++++++++++++++++---- v2v/modules_list.mli | 8 ++++---- v2v/output_local.ml | 2 +- v2v/output_rhev.ml | 2 +- 5 files changed, 28 insertions(+), 11 deletions(-) diff --git a/v2v/input_disk.ml b/v2v/input_disk.ml index 17ad61d..d21815d 100644 --...

Don't use "default", choose a better default name if <Name> is not present in the OVF. Rich.

...libvirt. Since we previously used 'LNone' to mean "no parseable <listen/> element" I also had to change previous uses of 'LNone' to 'LNoListen', so we can use 'LNone' to mean "<listen type='none'>". Thanks: Ming Xie. --- v2v/input_disk.ml | 2 +- v2v/input_libvirtxml.ml | 17 ++++++++++++----- v2v/output_libvirt.ml | 9 ++++++++- v2v/types.ml | 8 ++++++-- v2v/types.mli | 4 +++- 5 files changed, 30 insertions(+), 10 deletions(-) diff --git a/v2v/input_disk.ml b/v2v/input_disk.ml index e07222f..2...

On Wed, Oct 21, 2015 at 03:53:33PM +0200, Pino Toscano wrote: > Use the common open_guestfs to open Guestfs handles, so we get > debugging, tracing, and other common options set. > --- > v2v/convert_windows.ml | 4 +--- > v2v/input_disk.ml | 2 +- > v2v/input_libvirt_other.ml | 2 +- > v2v/input_ova.ml | 2 +- > v2v/output_glance.ml | 2 +- > v2v/output_null.ml | 2 +- > v2v/output_rhev.ml | 2 +- > v2v/output_vdsm.ml | 2 +- > v2v/types.ml | 2 +-...

Those will be useful when making decisions about what configuration to set on output. The data is also included in --print-source so the tests are adjusted accordingly. Signed-off-by: Roman Kagan <rkagan@virtuozzo.com> --- test-data/phony-guests/guests.xml.in | 8 ++++++++ v2v/input_disk.ml | 2 ++ v2v/input_libvirtxml.ml | 32 ++++++++++++++++++++++++++++++++ v2v/input_ova.ml | 2 ++ v2v/test-v2v-i-ova-formats.expected | 1 + v2v/test-v2v-i-ova-gz.expected | 1 + v2v/test-v2v-i-ova-two-disks.expected | 1 + v2v/t...

Those will be useful when making decisions about what configuration to set on output. The data is also included in --print-source so the tests are adjusted accordingly. Signed-off-by: Roman Kagan <rkagan@virtuozzo.com> --- test-data/phony-guests/guests.xml.in | 8 ++++++++ v2v/input_disk.ml | 2 ++ v2v/input_libvirtxml.ml | 27 +++++++++++++++++++++++++++ v2v/input_ova.ml | 2 ++ v2v/test-v2v-i-ova-formats.expected | 1 + v2v/test-v2v-i-ova-gz.expected | 1 + v2v/test-v2v-i-ova-two-disks.expected | 1 + v2v/test-v...

...so included in --print-source so the tests are adjusted accordingly. Signed-off-by: Roman Kagan <rkagan@virtuozzo.com> --- Notes: v2: - add catch-all string-valued variants for source network and video adapter models test-data/phony-guests/guests.xml.in | 8 ++++++++ v2v/input_disk.ml | 2 ++ v2v/input_libvirtxml.ml | 27 +++++++++++++++++++++++++++ v2v/input_ova.ml | 2 ++ v2v/test-v2v-i-ova-formats.expected | 1 + v2v/test-v2v-i-ova-gz.expected | 1 + v2v/test-v2v-i-ova-two-disks.expected | 1 + v2v/test-v...

...one; + boot_plan = Boot_to_idle; + boot_wait_to_write = 120; + boot_max_time = 600; + boot_idle_time = 60; + boot_known_good_screenshots = []; + boot_graceful_shutdown = 60; + post_boot_test = None; +} + +let failwithf fs = ksprintf failwith fs + +let quote = Filename.quote + +let run ~test ?input_disk ?input_xml ?(test_plan = default_plan) () = + let input_disk = + match input_disk with + | None -> test ^ ".img.xz" + | Some input_disk -> input_disk in + let input_xml = + match input_xml with + | None -> test ^ ".xml" + | Some input_xml -> input...

...ss.ml index ae0033dde..79e97a4b2 100644 --- a/v2v/test-harness/v2v_test_harness.ml +++ b/v2v/test-harness/v2v_test_harness.ml @@ -25,6 +25,7 @@ open Printf open Std_utils open Tools_utils +open Xpath_helpers type test_plan = { guest_clock : float option; @@ -90,29 +91,18 @@ let run ~test ?input_disk ?input_xml ?(test_plan = default_plan) () = g, root in - let nodes_of_xpathobj doc xpathobj = - let nodes = ref [] in - for i = 0 to Xml.xpathobj_nr_nodes xpathobj - 1 do - push_front (Xml.xpathobj_node xpathobj i) nodes - done; - List.rev !nodes - in - let test_boot...

As I'm now working through the enormous virt-v2v/virt-p2v bug list, we need a high quality set of tests to ensure that we don't accidentally regress some old OS/hypervisor combination while making changes. The test cases are going to be huge, so we cannot possibly distribute them in libguestfs. Furthermore many of them have licensing problems which means we cannot redistribute them at

...nid to libvirt (‘-o libvirt’, ‘-o local’) and QEMU (‘-o qemu’). We are missing support currently for all OVF-based formats (hence ‘-i ova’, and all oVirt/RHV output modes). It's unclear where we would store the genid in this format. --- v2v/create_libvirt_xml.ml | 5 +++++ v2v/input_disk.ml | 1 + v2v/input_ova.ml | 1 + v2v/input_vmx.ml | 22 ++++++++++++++++++++++ v2v/output_qemu.ml | 7 +++++++ v2v/parse_libvirt_xml.ml | 5 +++++ v2v/test-v2v-i-ova-formats.expected |...

...local’) and QEMU (‘-o qemu’). > > We are missing support currently for all OVF-based formats (hence > ‘-i ova’, and all oVirt/RHV output modes). It's unclear where we > would store the genid in this format. > --- > v2v/create_libvirt_xml.ml | 5 +++++ > v2v/input_disk.ml | 1 + > v2v/input_ova.ml | 1 + > v2v/input_vmx.ml | 22 ++++++++++++++++++++++ > v2v/output_qemu.ml | 7 +++++++ > v2v/parse_libvirt_xml.ml | 5 +++++ > v2v/test-v2v-i-ova...

...rom the code like this could be supported, but I could not work out how to enable it in the OVF. For -o qemu, we preserve the topology only because versions of qemu vary widely in their support for CPU models. --- v2v/create_libvirt_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_fr...

On Friday, 9 September 2016 15:09:56 CEST Richard W.M. Jones wrote: > Simple code motion. > --- > v2v/Makefile.am | 2 ++ > v2v/input_disk.ml | 21 ++------------------- > v2v/name_from_disk.ml | 41 +++++++++++++++++++++++++++++++++++++++++ > v2v/name_from_disk.mli | 24 ++++++++++++++++++++++++ > 4 files changed, 69 insertions(+), 19 deletions(-) > create mode 100644 v2v/name_from_disk.ml > create mode 100644...