yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: path_to_volume_id returned wrong content

Browse Source 
type for backup files. Patch includes changes of the test as well.

Signed-off-by: Alwin Antreich <a.antreich@proxmox.com>
This commit is contained in:
Alwin Antreich
2020-04-28 15:58:20 +02:00
committed by Fabian Grünbichler
parent e4dbfde31f
commit 892dc99249
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/Storage.pm
View File

@ -536,7 +536,7 @@ sub path_to_volume_id {
return ('rootdir', "$sid:rootdir/$vmid"); return ('rootdir', "$sid:rootdir/$vmid");
} elsif ($path =~ m!^$backupdir/([^/]+\.(tar|tar\.gz|tar\.lzo|tgz|vma|vma\.gz|vma\.lzo))$!) { } elsif ($path =~ m!^$backupdir/([^/]+\.(tar|tar\.gz|tar\.lzo|tgz|vma|vma\.gz|vma\.lzo))$!) {
my $name = $1; my $name = $1;
return ('iso', "$sid:backup/$name"); return ('backup', "$sid:backup/$name");
} }
} }

8
test/path_to_volume_id_test.pm
View File

@ -72,7 +72,7 @@ my @tests = (
description => 'Backup, vma.gz', description => 'Backup, vma.gz',
volname => "$storage_dir/dump/vzdump-qemu-16110-2020_03_30-21_11_40.vma.gz", volname => "$storage_dir/dump/vzdump-qemu-16110-2020_03_30-21_11_40.vma.gz",
expected => [ expected => [
'iso', 'backup',
'local:backup/vzdump-qemu-16110-2020_03_30-21_11_40.vma.gz', 'local:backup/vzdump-qemu-16110-2020_03_30-21_11_40.vma.gz',
], ],
}, },
@ -80,7 +80,7 @@ my @tests = (
description => 'Backup, vma.lzo', description => 'Backup, vma.lzo',
volname => "$storage_dir/dump/vzdump-qemu-16110-2020_03_30-21_12_45.vma.lzo", volname => "$storage_dir/dump/vzdump-qemu-16110-2020_03_30-21_12_45.vma.lzo",
expected => [ expected => [
'iso', 'backup',
'local:backup/vzdump-qemu-16110-2020_03_30-21_12_45.vma.lzo', 'local:backup/vzdump-qemu-16110-2020_03_30-21_12_45.vma.lzo',
], ],
}, },
@ -88,7 +88,7 @@ my @tests = (
description => 'Backup, vma', description => 'Backup, vma',
volname => "$storage_dir/dump/vzdump-qemu-16110-2020_03_30-21_13_55.vma", volname => "$storage_dir/dump/vzdump-qemu-16110-2020_03_30-21_13_55.vma",
expected => [ expected => [
'iso', 'backup',
'local:backup/vzdump-qemu-16110-2020_03_30-21_13_55.vma', 'local:backup/vzdump-qemu-16110-2020_03_30-21_13_55.vma',
], ],
}, },
@ -96,7 +96,7 @@ my @tests = (
description => 'Backup, tar.lzo', description => 'Backup, tar.lzo',
volname => "$storage_dir/dump/vzdump-lxc-16112-2020_03_30-21_39_30.tar.lzo", volname => "$storage_dir/dump/vzdump-lxc-16112-2020_03_30-21_39_30.tar.lzo",
expected => [ expected => [
'iso', 'backup',
'local:backup/vzdump-lxc-16112-2020_03_30-21_39_30.tar.lzo', 'local:backup/vzdump-lxc-16112-2020_03_30-21_39_30.tar.lzo',
], ],
}, },