[pve-devel] applied: [PATCH qemu-server 01/14] tests: add cfg2cmd for disk passthrough, rbd, krbd && zfs-over-scsi.

[Fiona Ebner]

Am 22.04.25 um 13:51 schrieb Alexandre Derumier via pve-devel:
> Signed-off-by: Alexandre Derumier <alexandre.derumier at groupe-cyllene.com>
> ---
>  test/cfg2cmd/simple-disk-passthrough.conf     | 15 ++++++++
>  test/cfg2cmd/simple-disk-passthrough.conf.cmd | 37 +++++++++++++++++++
>  test/cfg2cmd/simple-rbd.conf                  | 15 ++++++++
>  test/cfg2cmd/simple-rbd.conf.cmd              | 37 +++++++++++++++++++
>  test/cfg2cmd/simple-zfs-over-iscsi.conf       | 14 +++++++
>  test/cfg2cmd/simple-zfs-over-iscsi.conf.cmd   | 35 ++++++++++++++++++
>  test/run_config2command_tests.pl              | 34 +++++++++++++++++
>  7 files changed, 187 insertions(+)
>  create mode 100644 test/cfg2cmd/simple-disk-passthrough.conf
>  create mode 100644 test/cfg2cmd/simple-disk-passthrough.conf.cmd
>  create mode 100644 test/cfg2cmd/simple-rbd.conf
>  create mode 100644 test/cfg2cmd/simple-rbd.conf.cmd
>  create mode 100644 test/cfg2cmd/simple-zfs-over-iscsi.conf
>  create mode 100644 test/cfg2cmd/simple-zfs-over-iscsi.conf.cmd

applied, with the following diff on top, thanks!

> diff --git a/test/run_config2command_tests.pl b/test/run_config2command_tests.pl
> index 90bdaa12..f94d9c02 100755
> --- a/test/run_config2command_tests.pl
> +++ b/test/run_config2command_tests.pl
> @@ -16,6 +16,7 @@ use PVE::SysFSTools;
>  
>  use PVE::QemuConfig;
>  use PVE::QemuServer;
> +use PVE::QemuServer::Drive;
>  use PVE::QemuServer::Helpers;
>  use PVE::QemuServer::Monitor;
>  use PVE::QemuServer::QMPHelpers;
> @@ -73,13 +74,13 @@ my $base_env = {
>                 monhost => '127.0.0.42,127.0.0.21,::1',
>                 fsid => 'fc4181a6-56eb-4f68-b452-8ba1f381ca2a',
>                 content => {
> -                   images => 1
> +                   images => 1,
>                 },
>                 type => 'rbd',
>                 pool => 'cpool',
>                 username => 'admin',
>                 shared => 1,
> -               krbd => 1
> +               krbd => 1,
>             },
>             'zfs-over-iscsi-store' => {
>                 type => 'zfs',
> @@ -89,7 +90,7 @@ my $base_env = {
>                 target => "iqn.2019-10.org.test:foobar",
>                 pool => "tank",
>                 content => {
> -                   images => 1
> +                   images => 1,
>                 },
>             },
>             'local-lvm' => {
> @@ -253,8 +254,7 @@ $zfsplugin_module->mock(
>      },
>      zfs_get_lun_number => sub {
>         return "0";
> -    }
> -
> +    },
>  );
>  
>  my $qemu_server_config;
> @@ -401,6 +401,14 @@ $pve_common_sysfstools->mock(
>      },
>  );
>  
> +my $qemu_drive_module;
> +$qemu_drive_module = Test::MockModule->new('PVE::QemuServer::Drive');
> +$qemu_drive_module->mock(
> +    get_cdrom_path => sub {
> +       return "/dev/cdrom";
> +    },
> +);
> +
>  my $qemu_monitor_module;
>  $qemu_monitor_module = Test::MockModule->new('PVE::QemuServer::Monitor');
>  $qemu_monitor_module->mock(