search for: virt_tools_data_dir

The tests that depend on rhsrvany.exe being available, actually don't need it to be the real one: all they want is the file being present. So, instead of skipping the tests if the real rhsrvany.exe is not found, store a fake one in the repository, and point $VIRT_TOOLS_DATA_DIR at its location. Signed-off-by: Roman Kagan <rkagan@virtuozzo.com> --- p2v/test-virt-p2v-pxe.sh | 10 +++------- p2v/test-virt-p2v.sh | 9 +++------ tests/fake-virt-tools/rhsrvany.exe | 1 + tests/regressions/rhbz1232192.sh | 7 ++----- v2v/test-v2v-cdro...

This series makes several enhancements to tests for v2v conversion of Windows guests. Specifically, it - adds a number of files which imitate the stuff that is supposed to be present on the host when the actual conversion is performed, but may not be there when the tests are run. This includes certain tools and virtio drivers - fixes the test for windows conversion to actually

...s/rhbz1232192.sh | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/p2v/test-virt-p2v.sh b/p2v/test-virt-p2v.sh index 8c3731c..540d2fd 100755 --- a/p2v/test-virt-p2v.sh +++ b/p2v/test-virt-p2v.sh @@ -44,11 +44,7 @@ if ! test -f $f2 || ! test -s $f2; then exit 77 fi -virt_tools_data_dir=${VIRT_TOOLS_DATA_DIR:-/usr/share/virt-tools} -if ! test -r $virt_tools_data_dir/rhsrvany.exe; then - echo "$0: test skipped because rhsrvany.exe is not installed" - exit 77 -fi +export VIRT_TOOLS_DATA_DIR="../v2v/fake-virt-tools" d=test-virt-p2v.d rm -rf $d diff --git...

There's a lot of common code in the tests, eg: if [ "$(guestfish get-backend)" = "uml" ]; then echo "$0: test skipped because UML backend does not support network" exit 77 fi These commits (work in progress) create a common set of test functions for skipping tests etc. Rich.

...;, the steps needed to get the > > @@ -239,12 +243,15 @@ let convert (g : G.guestfs) inspect source output rcaps = > > > > (* Install RHEV-APT only if appropriate for the output hypervisor. *) > > if output#install_rhev_apt then ( > > - let tool_path = virt_tools_data_dir () // "rhev-apt.exe" in > > - if Sys.file_exists tool_path then > > - configure_rhev_apt tool_path > > - else > > - warning (f_"%s is missing, but the output hypervisor is oVirt or RHV. Installing RHEV-APT in the guest would mean the g...

...* * This only does a "pre-conversion", the steps needed to get the @@ -239,12 +243,15 @@ let convert (g : G.guestfs) inspect source output rcaps = (* Install RHEV-APT only if appropriate for the output hypervisor. *) if output#install_rhev_apt then ( - let tool_path = virt_tools_data_dir () // "rhev-apt.exe" in - if Sys.file_exists tool_path then - configure_rhev_apt tool_path - else - warning (f_"%s is missing, but the output hypervisor is oVirt or RHV. Installing RHEV-APT in the guest would mean the guest is automatically updated with new d...

...3 insertions(+), 1 deletion(-) diff --git a/v2v/convert_windows.ml b/v2v/convert_windows.ml index 0cd818a..e966341 100644 --- a/v2v/convert_windows.ml +++ b/v2v/convert_windows.ml @@ -47,7 +47,9 @@ let convert ~verbose ~keep_serial_console (g : G.guestfs) inspect source = try Sys.getenv "VIRT_TOOLS_DATA_DIR" with Not_found -> Config.datadir // "virt-tools" in - let virtio_win_dir = "/usr/share/virtio-win" in + let virtio_win_dir = + try Sys.getenv "VIRTIO_WIN_DIR" + with Not_found -> Config.datadir // "virtio-win" in (* Check if RH...

...s installed to run the first boot scripts. It is required, and the setup of first boot scripts will fail if it is not present. -F<rhsrvany.exe> is copied from the location pointed to by the +F<rhsrvany.exe> or F<pvvxsvc.exe> is copied from the location pointed to by the C<VIRT_TOOLS_DATA_DIR> environment variable; if not set, a compiled-in default will be used (something like F</usr/share/virt-tools>). @@ -1820,6 +1821,12 @@ I<--firstboot> or I<--firstboot-command> options with Windows guests. See also: C<https://github.com/rwmjones/rhsrvany> +=item F...

...s installed to run the first boot scripts. It is required, and the setup of first boot scripts will fail if it is not present. -F<rhsrvany.exe> is copied from the location pointed to by the +F<rhsrvany.exe> or F<pvvxsvc.exe> is copied from the location pointed to by the C<VIRT_TOOLS_DATA_DIR> environment variable; if not set, a compiled-in default will be used (something like F</usr/share/virt-tools>). @@ -1820,6 +1821,12 @@ I<--firstboot> or I<--firstboot-command> options with Windows guests. See also: C<https://github.com/rwmjones/rhsrvany> +=item F...

The bug is: https://bugzilla.redhat.com/show_bug.cgi?id=1161019 This makes a few other minor refactorings to the code. Rich.

...s fine, but let's split it into a separate patch. > + let services = ["rhsrvany.exe"; "pvvxsvc.exe"] in > + let srvany = ( > + try > + List.find ( > + fun service -> ( > + try > + let chan = open_in (virt_tools_data_dir // service) in > + close_in chan; > + true > + with _ -> > + false > + ) > + ) services > + with Not_found -> > + error (f_"One of rhsrvany.exe or pvvxsvc.exe is missing in %s. One of th...

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.

...s installed to run the first boot scripts. It is required, and the setup of first boot scripts will fail if it is not present. -F<rhsrvany.exe> is copied from the location pointed to by the +F<rhsrvany.exe> or F<pvvxsvc.exe> is copied from the location pointed to by the C<VIRT_TOOLS_DATA_DIR> environment variable; if not set, a compiled-in default will be used (something like F</usr/share/virt-tools>). The output of the first boot scripts is available in the guest as -F<C:\Program Files\Red Hat\Firstboot\log.txt>. +F<C:\Program Files\Guestfs\Firstboot\log.txt>....

Hi there! I know it's been a while since I posted my first version of some patches. But here I have rebased them on top of Roman's work and added a few other ones. Cédric Bosdonnat (11): v2v: also search for windows virtio drivers in symlinks Update packagelist for SLES customize: fix windows firstboot script customize: change windows firstboot path customize: add support for

...insertions(+), 3 deletions(-) diff --git a/v2v/convert_windows.ml b/v2v/convert_windows.ml index 0cd818a..e966341 100644 --- a/v2v/convert_windows.ml +++ b/v2v/convert_windows.ml @@ -47,7 +47,9 @@ let convert ~verbose ~keep_serial_console (g : G.guestfs) inspect source = try Sys.getenv "VIRT_TOOLS_DATA_DIR" with Not_found -> Config.datadir // "virt-tools" in - let virtio_win_dir = "/usr/share/virtio-win" in + let virtio_win_dir = + try Sys.getenv "VIRTIO_WIN_DIR" + with Not_found -> Config.datadir // "virtio-win" in (* Check if RH...

Hi all, v2 includes all comments from Pino and Richard. I also removed the mkdir /run/lvm in the init since it only failed in one case and couldn't reproduce it anymore. Cédric Bosdonnat (11): v2v: also search for windows virtio drivers in symlinks Update packagelist for SLES and openSUSE customize: fix windows firstboot script customize: change windows firstboot path customize:

..."pre-conversion", the steps needed to get the > @@ -239,12 +243,15 @@ let convert (g : G.guestfs) inspect source output rcaps = > > (* Install RHEV-APT only if appropriate for the output hypervisor. *) > if output#install_rhev_apt then ( > - let tool_path = virt_tools_data_dir () // "rhev-apt.exe" in > - if Sys.file_exists tool_path then > - configure_rhev_apt tool_path > - else > - warning (f_"%s is missing, but the output hypervisor is oVirt or RHV. Installing RHEV-APT in the guest would mean the guest is automaticall...

...insertions(+), 20 deletions(-) diff --git a/v2v/convert_windows.ml b/v2v/convert_windows.ml index 5daae6c..ab28636 100644 --- a/v2v/convert_windows.ml +++ b/v2v/convert_windows.ml @@ -43,18 +43,25 @@ let convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = try Sys.getenv "VIRT_TOOLS_DATA_DIR" with Not_found -> Guestfs_config.datadir // "virt-tools" in - (* Check if RHEV-APT exists. This is optional. *) - let rhev_apt_exe = virt_tools_data_dir // "rhev-apt.exe" in - let rhev_apt_exe = + (* Check if either RHEV-APT or VMDP exists. This is optional...

...insertions(+), 31 deletions(-) diff --git a/v2v/convert_windows.ml b/v2v/convert_windows.ml index 5daae6c..f88d163 100644 --- a/v2v/convert_windows.ml +++ b/v2v/convert_windows.ml @@ -43,18 +43,25 @@ let convert ~keep_serial_console (g : G.guestfs) inspect source rcaps = try Sys.getenv "VIRT_TOOLS_DATA_DIR" with Not_found -> Guestfs_config.datadir // "virt-tools" in - (* Check if RHEV-APT exists. This is optional. *) - let rhev_apt_exe = virt_tools_data_dir // "rhev-apt.exe" in - let rhev_apt_exe = + (* Check if either RHEV-APT or VMDP exists. This is optional...

...test-v2v-windows-conversion.sh \ - rhbz1232192.sh \ - rhbz1232192.xml + rhbz1232192.sh diff --git a/tests/rhbz1232192.sh b/tests/rhbz1232192.sh index 80f86003..2d4b342b 100755 --- a/tests/rhbz1232192.sh +++ b/tests/rhbz1232192.sh @@ -30,4 +30,4 @@ skip_unless_phony_guest blank-disk.img export VIRT_TOOLS_DATA_DIR="$top_srcdir/test-data/fake-virt-tools" -virt-v2v -i libvirtxml "$srcdir/rhbz1232192.xml" -o null --no-copy +virt-v2v -i libvirtxml rhbz1232192.xml -o null --no-copy diff --git a/tests/rhbz1232192.xml b/tests/rhbz1232192.xml.in similarity index 75% rename from tests/rhbz123219...