From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 18E919CC69 for ; Thu, 1 Jun 2023 15:54:15 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EE5761EE51 for ; Thu, 1 Jun 2023 15:53:44 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 1 Jun 2023 15:53:43 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 6DF9948265 for ; Thu, 1 Jun 2023 15:53:43 +0200 (CEST) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Thu, 1 Jun 2023 15:53:39 +0200 Message-Id: <20230601135342.2903359-5-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230601135342.2903359-1-a.lauterer@proxmox.com> References: <20230601135342.2903359-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.093 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v3 qemu-server 4/7] tests: add migration alias check X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jun 2023 13:54:15 -0000 Signed-off-by: Aaron Lauterer --- changes since v2: - changed mock storages and disk images, now there is 'alias-zfs' and 'alias-zfs-2' with the same disk image present to mimick an aliased storage config. test/run_qemu_migrate_tests.pl | 81 ++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 3 deletions(-) diff --git a/test/run_qemu_migrate_tests.pl b/test/run_qemu_migrate_tests.pl index 3d5eb8d..ace557f 100755 --- a/test/run_qemu_migrate_tests.pl +++ b/test/run_qemu_migrate_tests.pl @@ -63,6 +63,24 @@ my $storage_config = { sparse => 1, type => "zfspool", }, + "alias-zfs" => { + content => { + images => 1, + rootdir => 1, + }, + pool => "aliaspool", + sparse => 1, + type => "zfspool", + }, + "alias-zfs-2" => { + content => { + images => 1, + rootdir => 1, + }, + pool => "aliaspool", + sparse => 1, + type => "zfspool", + }, "rbd-store" => { monhost => "127.0.0.42,127.0.0.21,::1", fsid => 'fc4181a6-56eb-4f68-b452-8ba1f381ca2a', @@ -149,6 +167,24 @@ my $vm_configs = { 'sockets' => 1, 'vmgenid' => '2c00c030-0b5b-4988-a371-6ab259893f22', }, + 123 => { + 'bootdisk' => 'scsi0', + 'cores' => 1, + 'scsi0' => 'alias-zfs:vm-123-disk-0,size=4096M', + 'scsi1' => 'alias-zfs-2:vm-123-disk-0,size=4096M', + 'ide2' => 'none,media=cdrom', + 'memory' => 512, + 'name' => 'alias-test', + 'net0' => 'virtio=4A:A3:E4:4C:CF:F0,bridge=vmbr0,firewall=1', + 'numa' => 0, + 'ostype' => 'l26', + 'pending' => {}, + 'scsihw' => 'virtio-scsi-pci', + 'snapshots' => {}, + 'smbios1' => 'uuid=5ad71d4d-8f73-4377-853e-2d22c10c96a5', + 'sockets' => 1, + 'vmgenid' => '2c00c030-0b5b-4988-a371-6ab259893f22', + }, 149 => { 'agent' => '0', 'bootdisk' => 'scsi0', @@ -351,9 +387,9 @@ my $source_vdisks = { { 'ctime' => '1589277334', 'format' => 'raw', - 'size' => 108003328, - 'vmid' => '111', - 'volid' => 'local-zfs:vm-111-disk-0', + 'size' => 4294967296, + 'vmid' => '123', + 'volid' => 'local-zfs:vm-123-disk-0', }, { 'format' => 'raw', @@ -364,6 +400,24 @@ my $source_vdisks = { 'volid' => 'local-zfs:vm-4567-disk-0', }, ], + 'alias-zfs' => [ + { + 'ctime' => '1589277334', + 'format' => 'raw', + 'size' => 108003328, + 'vmid' => '111', + 'volid' => 'local-zfs:vm-111-disk-0', + }, + ], + 'alias-zfs-2' => [ + { + 'ctime' => '1589277334', + 'format' => 'raw', + 'size' => 108003328, + 'vmid' => '111', + 'volid' => 'local-zfs:vm-111-disk-0', + }, + ], 'rbd-store' => [ { 'ctime' => '1589277334', @@ -1592,6 +1646,27 @@ my $tests = [ }, }, }, + { + name => '123_alias_fail', + target => 'pve1', + vmid => 123, + vm_status => { + running => 0, + }, + opts => { + 'with-local-disks' => 1, + }, + expected_calls => {}, + expect_die => "detected not supported aliased volumes", + expected => { + source_volids => local_volids_for_vm(123), + target_volids => {}, + vm_config => $vm_configs->{123}, + vm_status => { + running => 0, + }, + }, + }, ]; my $single_test_name = shift; -- 2.30.2