search for: 39511022e

...ollowup of commit f190e08d85556dac293ef15bfeee38e54471570f. --- v2v/Makefile.am | 2 ++ v2v/test-v2v-o-json.sh | 58 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100755 v2v/test-v2v-o-json.sh diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 39511022e..1c37d20b4 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -468,6 +468,7 @@ TESTS += \ test-v2v-networks-and-bridges.sh \ test-v2v-no-copy.sh \ test-v2v-o-glance.sh \ + test-v2v-o-json.sh \ test-v2v-o-libvirt.sh \ test-v2v-o-null.sh \ test-v2v-o-openstack.sh \ @@ -628,6 +629,7 @@...

...5bfeee38e54471570f. > --- > v2v/Makefile.am | 2 ++ > v2v/test-v2v-o-json.sh | 58 ++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 60 insertions(+) > create mode 100755 v2v/test-v2v-o-json.sh > > diff --git a/v2v/Makefile.am b/v2v/Makefile.am > index 39511022e..1c37d20b4 100644 > --- a/v2v/Makefile.am > +++ b/v2v/Makefile.am > @@ -468,6 +468,7 @@ TESTS += \ > test-v2v-networks-and-bridges.sh \ > test-v2v-no-copy.sh \ > test-v2v-o-glance.sh \ > + test-v2v-o-json.sh \ > test-v2v-o-libvirt.sh \ > test-v2v-o-null.sh \ &gt...

Test the newer versions of these distros. --- v2v/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 53c137fc6..39511022e 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -530,8 +530,10 @@ real_guests_scripts = \ test-v2v-conversion-of-debian-6.sh \ test-v2v-conversion-of-debian-7.sh \ test-v2v-conversion-of-debian-8.sh \ + test-v2v-conversion-of-debian-9.sh \ test-v2v-conversion-of-fedora-20.sh \ test-...

...am @@ -169,10 +169,12 @@ SUBDIRS += get-kernel SUBDIRS += resize SUBDIRS += sparsify SUBDIRS += sysprep +if HAVE_LIBVIRT SUBDIRS += v2v if HAVE_OCAML_PKG_LIBVIRT SUBDIRS += v2v/test-harness endif +endif if HAVE_FUSE SUBDIRS += dib endif diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 39511022e..5999a6b50 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -423,6 +423,7 @@ stamp-virt-v2v-support.pod: virt-v2v-support.pod TESTS_ENVIRONMENT = $(top_builddir)/run --test TESTS = \ + test-v2v-copy-to-local.sh \ test-v2v-docs.sh \ test-v2v-python-syntax.sh \ test-v2v-i-ova-bad-sha1....

...od | 15 +- 8 files changed, 625 insertions(+), 2 deletions(-) create mode 100644 v2v/create_json.ml create mode 100644 v2v/create_json.mli create mode 100644 v2v/output_json.ml create mode 100644 v2v/output_json.mli diff --git a/v2v/Makefile.am b/v2v/Makefile.am index d0ab51f35..39511022e 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -52,6 +52,7 @@ SOURCES_MLI = \ config.mli \ convert_linux.mli \ convert_windows.mli \ + create_json.mli \ create_libvirt_xml.mli \ create_ovf.mli \ DOM.mli \ @@ -75,6 +76,7 @@ SOURCES_MLI = \ networks.mli \ openstack_image_proper...

This series adds a new output mode for virt-v2v, called -o json. It produces local files, just like -o local, although the metadata produced is a JSON file with data that v2v collected in the conversion process. This can be useful for converting to unsupported destinations, still based on QEMU/KVM. In addition to a simple different metadata, it offers a way to relocate the disks, with

This series (except the last one) changes virt-v2v to use nbdkit for several input modes: -i vmx -it vddk: No change in functionality, as this already uses nbdkit-vddk-plugin, but the code is refactored for the other modes to use. -i libvirtxml: Use nbdkit-curl-plugin instead of qemu curl. vCenter: Use nbdkit-curl-plugin instead of qemu curl. xen: Use nbdkit-ssh-plugin instead of qemu

Hi, this series switches virt-2v to ocaml-libvirt, embedding the latest version of it from git. This way, it is possible to improve the way v2v connects to libvirt for both input, and output modules, and interacts with libvirt (e.g. no more virsh calls needed in virt-v2v). As side effect, virt-v2v now requires libvirt, as keeping it optional would create too much burden. I could not test all