similar to: [PATCH] tests: rhv-upload: Require nbdkit python plugin

Add the configure result in config.sh, so it can be used as variable. --- config.sh.in | 2 ++ tests/test-v2v-o-rhv-upload.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config.sh.in b/config.sh.in index 061871a3..f3245379 100644 --- a/config.sh.in +++ b/config.sh.in @@ -18,3 +18,5 @@ # This shell script contains the results of some configure checks,

-o rhv-upload requires python3, and nbdkit with the python3 plugin, so skip this test if they are not installed. --- v1 is: https://www.redhat.com/archives/libguestfs/2018-October/msg00008.html v2v/test-v2v-o-rhv-upload.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/v2v/test-v2v-o-rhv-upload.sh b/v2v/test-v2v-o-rhv-upload.sh index 8bda7cc0b..23d2ad7a0 100755 ---

On Mon, Oct 01, 2018 at 04:40:19PM +0200, Pino Toscano wrote: > -o rhv-upload requires python3, and nbdkit with the python3 plugin, so > skip this test if they are not installed. > --- > > v1 is: > https://www.redhat.com/archives/libguestfs/2018-October/msg00008.html > > v2v/test-v2v-o-rhv-upload.sh | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git

-o rhv-upload requires nbdkit, so skip this test if it is not installed. --- v2v/test-v2v-o-rhv-upload.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/v2v/test-v2v-o-rhv-upload.sh b/v2v/test-v2v-o-rhv-upload.sh index 8bda7cc0b..29214a9db 100755 --- a/v2v/test-v2v-o-rhv-upload.sh +++ b/v2v/test-v2v-o-rhv-upload.sh @@ -28,6 +28,7 @@ set -x $TEST_FUNCTIONS skip_if_skipped skip_if_backend

Add a single shell script to hold results of configure. Pino Toscano (3): build: add an empty config.sh Revert "tests: rhv-upload: Fix skip test of nbdkit python plugin." tests: use the right nbdkit python3 plugin .gitignore | 2 +- config.sh.in | 22 +++++++++++++++++++ configure.ac

On Mon, Oct 01, 2018 at 01:47:06PM +0200, Pino Toscano wrote: > -o rhv-upload requires nbdkit, so skip this test if it is not installed. > --- > v2v/test-v2v-o-rhv-upload.sh | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/v2v/test-v2v-o-rhv-upload.sh b/v2v/test-v2v-o-rhv-upload.sh > index 8bda7cc0b..29214a9db 100755 > --- a/v2v/test-v2v-o-rhv-upload.sh > +++

Instead of using the "global" blank-part test image, use a local version of it created with guestfish. --- p2v/.gitignore | 1 + p2v/Makefile.am | 7 ++++++- p2v/test-virt-p2v-nbdkit.sh | 4 ++-- p2v/test-virt-p2v.sh | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/p2v/.gitignore b/p2v/.gitignore index 673e8ad83..8495f6c2f 100644

Previously this output method was almost completely untested. This commit adds a fake ovirtsdk4 module so we can test the -o rhv-upload method fairly completely without needing an actual oVirt instance around. --- v2v/Makefile.am | 4 + .../ovirtsdk4/__init__.py | 146 ++++++++++++++++++ .../ovirtsdk4/types.py | 125

Followup 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

On Thursday, May 16, 2019 11:08:23 AM CEST Pino Toscano wrote: > Followup 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

On Thu, Sep 20, 2018 at 11:51 AM Richard W.M. Jones <rjones@redhat.com> wrote: > Previously this output method was almost completely untested. > > This commit adds a fake ovirtsdk4 module so we can test the > -o rhv-upload method fairly completely without needing an actual > oVirt instance around. > --- > v2v/Makefile.am | 4 + >

It makes little sense to require the oVirt certificate, especially when the verification of the connection (-oo rhv-verifypeer) is disabled by default. The only work done with the certificate in that case is checking that it is a valid certificate file. Hence, make -oo rhv-cafile optional, requiring it only when -oo rhv-verifypeer is enabled. --- v2v/output_rhv_upload.ml | 16

Test: - Bad SHA1 sum - Bad SHA256 sum - Invalid lines in manifest (x2) - Good checksum and manifest These tests were originally written by Tomáš Golembiovský. All I have done is to integrate them into the virt-v2v test suite. --- .gitignore | 1 + v2v/Makefile.am | 22 +++++++- v2v/test-v2v-i-ova-bad-sha1.sh | 66

No functional change, but it does allow downstream distributions to adjust the Python interpreter and nbdkit Python plugin used by virt-v2v -o rhv-upload mode: ./configure --with-virt-v2v-python-interpreter=... ./configure --with-virt-v2v-nbdkit-python-plugin=... If you don't set the configure parameters then this change makes no difference. --- .gitignore | 1 + configure.ac

Some of the libvirt XMLs for tests refer to a generated phony disk image, and so far the relative path used worked almost by chance. (For each disk, the path to it was ../test-data/etc, and since the overlay pointing to it is stored directly in $LIBGUESTFS_CACHEDIR, which is $buildir/tmp, then the relative path was resolved.) Instead, have configure place the right top-level directory in those

No functional change, but it does allow downstream distributions to adjust the nbdkit Python plugin used by virt-v2v -o rhv-upload mode: ./configure --with-virt-v2v-nbdkit-python-plugin=... --- .gitignore | 1 + configure.ac | 5 +++++ m4/guestfs-v2v.m4 | 28 ++++++++++++++++++++++++++++ v2v/Makefile.am | 4 ++++ v2v/config.ml.in | 20

On Thursday, 19 September 2019 08:23:46 CEST Pino Toscano wrote: > Add the missing objects, methods, variables, and relations among the > various objects. > > Followup/fixes commit c49aa4fe01aac82d4776dd2a3524ce16e6deed06, and > commit 8118f28b6ff93c11f92fd65873285c2eba10ea0a. > --- Consider the following change squashed to this commit: diff --git

Previously I posted a work-in-progress preview of this patch series: https://www.redhat.com/archives/libguestfs/2017-February/msg00224.html This is the finished version that updates all of the shell-script based tests. It passes 'make check', 'make check-direct' and 'make check-slow'. Rich.

This adds a test of -o rhv-upload. Obviously for an upstream test we cannot require a working oVirt server. This test works by faking the ovirtsdk4 Python module, setting PYTHONPATH so that the fake module is picked up instead of the real module (if installed). However it's more complex than that because the nbdkit plugin also expects to talk to a working imageio HTTPS server. Therefore

This way it is possible to override the UUIDs of the uploaded disks, instead of letting RHV generate them. This can be useful to force certain UUIDs, and to specify the disks in --no-copy mode (which now can be used). --- v2v/output_rhv_upload.ml | 43 ++++++++++++++++++++++++++++++++----- v2v/rhv-upload-plugin.py | 2 ++ v2v/virt-v2v-output-rhv.pod | 23 ++++++++++++++++++++ 3 files