[pve-devel] [PATCH qemu-server 3/3] added test-cases for new machine-syntax & viommu

[Dominik Csapak]

On 9/21/22 11:07, Markus Frank wrote:
> added a few test-cases to test the new machine parameter with viommu
> 
> Signed-off-by: Markus Frank <m.frank at proxmox.com>
> ---
>   test/restore-config-expected/401.conf         | 14 +++++
>   test/restore-config-expected/402.conf         | 14 +++++
>   test/restore-config-input/401.conf            | 14 +++++
>   test/restore-config-input/402.conf            | 14 +++++
>   test/run_qemu_restore_config_tests.pl         |  2 +-
>   .../create/qemu-server/401.conf               | 32 +++++++++++
>   .../create/qemu-server/402.conf               | 53 +++++++++++++++++++
>   .../create/qemu-server/401.conf               | 14 +++++
>   .../create/qemu-server/402.conf               | 33 ++++++++++++
>   test/snapshot-test.pm                         |  8 ++-
>   10 files changed, 196 insertions(+), 2 deletions(-)
>   create mode 100644 test/restore-config-expected/401.conf
>   create mode 100644 test/restore-config-expected/402.conf
>   create mode 100644 test/restore-config-input/401.conf
>   create mode 100644 test/restore-config-input/402.conf
>   create mode 100644 test/snapshot-expected/create/qemu-server/401.conf
>   create mode 100644 test/snapshot-expected/create/qemu-server/402.conf
>   create mode 100644 test/snapshot-input/create/qemu-server/401.conf
>   create mode 100644 test/snapshot-input/create/qemu-server/402.conf
> 
> diff --git a/test/restore-config-expected/401.conf b/test/restore-config-expected/401.conf
> new file mode 100644
> index 0000000..9400351
> --- /dev/null
> +++ b/test/restore-config-expected/401.conf
> @@ -0,0 +1,14 @@
> +bootdisk: scsi0
> +cores: 1
> +ide2: none,media=cdrom
> +memory: 512
> +machine: q35,viommu=1
> +name: apache
> +net0: virtio=92:38:11:FD:ED:87,bridge=vmbr0,firewall=1
> +numa: 0
> +ostype: l26
> +scsi0: target:401/vm-401-disk-0.qcow2,size=4G
> +scsihw: virtio-scsi-pci
> +smbios1: uuid=ddf91b3f-a597-42be-9a7e-fb6421dcd5cd
> +sockets: 1
> +vmgenid: 0
> diff --git a/test/restore-config-expected/402.conf b/test/restore-config-expected/402.conf
> new file mode 100644
> index 0000000..73f69cb
> --- /dev/null
> +++ b/test/restore-config-expected/402.conf
> @@ -0,0 +1,14 @@
> +bootdisk: scsi0
> +cores: 1
> +ide2: none,media=cdrom
> +memory: 512
> +machine: type=q35,viommu=1
> +name: apache
> +net0: virtio=92:38:11:FD:ED:87,bridge=vmbr0,firewall=1
> +numa: 0
> +ostype: l26
> +scsi0: target:401/vm-402-disk-0.qcow2,size=4G
> +scsihw: virtio-scsi-pci
> +smbios1: uuid=ddf91b3f-a597-42be-9a7e-fb6421dcd5cd
> +sockets: 1
> +vmgenid: 0
> diff --git a/test/restore-config-input/401.conf b/test/restore-config-input/401.conf
> new file mode 100644
> index 0000000..9400351
> --- /dev/null
> +++ b/test/restore-config-input/401.conf
> @@ -0,0 +1,14 @@
> +bootdisk: scsi0
> +cores: 1
> +ide2: none,media=cdrom
> +memory: 512
> +machine: q35,viommu=1
> +name: apache
> +net0: virtio=92:38:11:FD:ED:87,bridge=vmbr0,firewall=1
> +numa: 0
> +ostype: l26
> +scsi0: target:401/vm-401-disk-0.qcow2,size=4G
> +scsihw: virtio-scsi-pci
> +smbios1: uuid=ddf91b3f-a597-42be-9a7e-fb6421dcd5cd
> +sockets: 1
> +vmgenid: 0
> diff --git a/test/restore-config-input/402.conf b/test/restore-config-input/402.conf
> new file mode 100644
> index 0000000..73f69cb
> --- /dev/null
> +++ b/test/restore-config-input/402.conf
> @@ -0,0 +1,14 @@
> +bootdisk: scsi0
> +cores: 1
> +ide2: none,media=cdrom
> +memory: 512
> +machine: type=q35,viommu=1
> +name: apache
> +net0: virtio=92:38:11:FD:ED:87,bridge=vmbr0,firewall=1
> +numa: 0
> +ostype: l26
> +scsi0: target:401/vm-402-disk-0.qcow2,size=4G
> +scsihw: virtio-scsi-pci
> +smbios1: uuid=ddf91b3f-a597-42be-9a7e-fb6421dcd5cd
> +sockets: 1
> +vmgenid: 0
> diff --git a/test/run_qemu_restore_config_tests.pl b/test/run_qemu_restore_config_tests.pl
> index 1e1e807..2221abe 100755
> --- a/test/run_qemu_restore_config_tests.pl
> +++ b/test/run_qemu_restore_config_tests.pl
> @@ -25,7 +25,7 @@ $pve_cluster_module->mock(
>   );
>   
>   # NOTE update when you add/remove tests
> -plan tests => 4;
> +plan tests => 6;
>   
>   my $cfs_mock = Test::MockModule->new("PVE::Cluster");
>   $cfs_mock->mock(
> diff --git a/test/snapshot-expected/create/qemu-server/401.conf b/test/snapshot-expected/create/qemu-server/401.conf
> new file mode 100644
> index 0000000..56cb71c
> --- /dev/null
> +++ b/test/snapshot-expected/create/qemu-server/401.conf
> @@ -0,0 +1,32 @@
> +bootdisk: ide0
> +cores: 4
> +ide0: local:snapshotable-disk-1,discard=on,size=32G
> +ide2: none,media=cdrom
> +machine: q35,viommu=1
> +memory: 8192
> +name: win
> +net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
> +numa: 0
> +ostype: win7
> +parent: test
> +smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
> +sockets: 1
> +vga: qxl
> +
> +[test]
> +#test comment
> +bootdisk: ide0
> +cores: 4
> +ide0: local:snapshotable-disk-1,discard=on,size=32G
> +ide2: none,media=cdrom
> +machine: q35,viommu=1
> +memory: 8192
> +name: win
> +net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
> +numa: 0
> +ostype: win7
> +parent: test
> +smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
> +snaptime: 1234567890
> +sockets: 1
> +vga: qxl
> diff --git a/test/snapshot-expected/create/qemu-server/402.conf b/test/snapshot-expected/create/qemu-server/402.conf
> new file mode 100644
> index 0000000..ac485ce
> --- /dev/null
> +++ b/test/snapshot-expected/create/qemu-server/402.conf
> @@ -0,0 +1,53 @@
> +agent: 1
> +bootdisk: ide0
> +cores: 4
> +ide0: local:snapshotable-disk-1,discard=on,size=32G
> +ide2: none,media=cdrom
> +memory: 8192
> +name: win
> +net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
> +numa: 0
> +ostype: win7
> +parent: test2
> +smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
> +sockets: 1
> +vga: qxl
> +
> +[test]
> +#test comment
> +agent: 1
> +bootdisk: ide0
> +cores: 4
> +ide0: local:snapshotable-disk-1,discard=on,size=32G
> +ide2: none,media=cdrom
> +machine: q35,viommu=1
> +memory: 8192
> +name: win
> +net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
> +numa: 0
> +ostype: win7
> +smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
> +snaptime: 1234567890
> +sockets: 1
> +vga: qxl
> +vmstate: somestorage:state-volume
> +
> +[test2]
> +#test comment
> +agent: 1
> +bootdisk: ide0
> +cores: 4
> +ide0: local:snapshotable-disk-1,discard=on,size=32G
> +ide2: none,media=cdrom
> +memory: 8192
> +name: win
> +net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
> +numa: 0
> +ostype: win7
> +parent: test
> +runningmachine: q35
> +smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
> +snaptime: 1234567890
> +sockets: 1
> +vga: qxl
> +vmstate: somestorage:state-volume
> diff --git a/test/snapshot-input/create/qemu-server/401.conf b/test/snapshot-input/create/qemu-server/401.conf
> new file mode 100644
> index 0000000..8feec27
> --- /dev/null
> +++ b/test/snapshot-input/create/qemu-server/401.conf
> @@ -0,0 +1,14 @@
> +bootdisk: ide0
> +cores: 4
> +ide0: local:snapshotable-disk-1,discard=on,size=32G
> +ide2: none,media=cdrom
> +machine: q35,viommu=1
> +memory: 8192
> +name: win
> +net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
> +numa: 0
> +ostype: win7
> +parent: test
> +smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
> +sockets: 1
> +vga: qxl
> diff --git a/test/snapshot-input/create/qemu-server/402.conf b/test/snapshot-input/create/qemu-server/402.conf
> new file mode 100644
> index 0000000..72f89ce
> --- /dev/null
> +++ b/test/snapshot-input/create/qemu-server/402.conf
> @@ -0,0 +1,33 @@
> +agent: 1
> +bootdisk: ide0
> +cores: 4
> +ide0: local:snapshotable-disk-1,discard=on,size=32G
> +ide2: none,media=cdrom
> +memory: 8192
> +name: win
> +net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
> +numa: 0
> +ostype: win7
> +parent: test
> +smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
> +sockets: 1
> +vga: qxl
> +
> +[test]
> +#test comment
> +agent: 1
> +bootdisk: ide0
> +cores: 4
> +ide0: local:snapshotable-disk-1,discard=on,size=32G
> +ide2: none,media=cdrom
> +machine: q35,viommu=1
> +memory: 8192
> +name: win
> +net0: e1000=12:34:56:78:90:12,bridge=somebr0,firewall=1
> +numa: 0
> +ostype: win7
> +smbios1: uuid=01234567-890a-bcde-f012-34567890abcd
> +snaptime: 1234567890
> +sockets: 1
> +vga: qxl
> +vmstate: somestorage:state-volume
> diff --git a/test/snapshot-test.pm b/test/snapshot-test.pm
> index 3f1ac7c..3fcb0eb 100644
> --- a/test/snapshot-test.pm
> +++ b/test/snapshot-test.pm
> @@ -305,7 +305,7 @@ sub __snapshot_save_vmstate {
>   
>       my $snap = $conf->{snapshots}->{$snapname};
>       $snap->{vmstate} = "somestorage:state-volume";
> -    $snap->{runningmachine} = "somemachine"
> +    $snap->{runningmachine} = "q35"
>   }

i guess this change belongs to the first patch ? (since those tests
fail without this)

>   
>   sub assert_config_exists_on_node {
> @@ -566,6 +566,12 @@ $vm_mon->{savevm_start} = 1;
>   printf("Successful snapshot_create with no existing snapshots but set machine type\n");
>   testcase_create("301", "test", 1, "test comment", "", { "local:snapshotable-disk-1" => "test" });
>   
> +printf("Successful snapshot_create with viommu enabled\n");
> +testcase_create("401", "test", 0, "test comment", "", { "local:snapshotable-disk-1" => "test" });
> +
> +printf("Successful snapshot_create with viommu enabled and with one existing snapshots including vmstate\n");
> +testcase_create("402", "test2", 1, "test comment", "", { "local:snapshotable-disk-1" => "test2" });
> +
>   $activate_storage_possible = 0;
>   
>   printf("Expected error for snapshot_create when storage activation is not possible\n");