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

Fix: add missing snippets subdir

Browse Source 
since it is a valid content type and adapt the path_to_volume_id_test.
Also adds an extra check if all vtype_subdirs are returned.

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

4
PVE/Storage.pm
View File

@ -512,6 +512,7 @@ sub path_to_volume_id {
my $tmpldir = $plugin->get_subdir($scfg, 'vztmpl'); my $tmpldir = $plugin->get_subdir($scfg, 'vztmpl');
my $backupdir = $plugin->get_subdir($scfg, 'backup'); my $backupdir = $plugin->get_subdir($scfg, 'backup');
my $privatedir = $plugin->get_subdir($scfg, 'rootdir'); my $privatedir = $plugin->get_subdir($scfg, 'rootdir');
my $snippetsdir = $plugin->get_subdir($scfg, 'snippets');
if ($path =~ m!^$imagedir/(\d+)/([^/\s]+)$!) { if ($path =~ m!^$imagedir/(\d+)/([^/\s]+)$!) {
my $vmid = $1; my $vmid = $1;
@ -537,6 +538,9 @@ sub path_to_volume_id {
} 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 ('backup', "$sid:backup/$name"); return ('backup', "$sid:backup/$name");
} elsif ($path =~ m!^$snippetsdir/([^/]+)$!) {
my $name = $1;
return ('snippets', "$sid:snippets/$name");
} }
} }

26
test/path_to_volume_id_test.pm
View File

@ -134,18 +134,24 @@ my @tests = (
'local:1234/subvol-1234-disk-0.subvol' 'local:1234/subvol-1234-disk-0.subvol'
], ],
}, },
# no matches
{ {
description => 'Snippets, yaml', description => 'Snippets, yaml',
volname => "$storage_dir/snippets/userconfig.yaml", volname => "$storage_dir/snippets/userconfig.yaml",
expected => [''], expected => [
'snippets',
'local:snippets/userconfig.yaml',
],
}, },
{ {
description => 'Snippets, hookscript', description => 'Snippets, hookscript',
volname => "$storage_dir/snippets/hookscript.pl", volname => "$storage_dir/snippets/hookscript.pl",
expected => [''], expected => [
'snippets',
'local:snippets/hookscript.pl',
],
}, },
# no matches
{ {
description => 'CT template, tar.xz', description => 'CT template, tar.xz',
volname => "$storage_dir/template/cache/debian-10.0-standard_10.0-1_amd64.tar.xz", volname => "$storage_dir/template/cache/debian-10.0-standard_10.0-1_amd64.tar.xz",
@ -210,7 +216,10 @@ my @tests = (
}, },
); );
plan tests => scalar @tests; plan tests => scalar @tests + 1;
my $seen_vtype;
my $vtype_subdirs = { map { $_ => 1 } keys %{ PVE::Storage::Plugin::get_vtype_subdirs() } };
foreach my $tt (@tests) { foreach my $tt (@tests) {
my $file = $tt->{volname}; my $file = $tt->{volname};
@ -232,8 +241,15 @@ foreach my $tt (@tests) {
$got = $@ if $@; $got = $@ if $@;
is_deeply($got, $expected, $description) || diag(explain($got)); is_deeply($got, $expected, $description) || diag(explain($got));
$seen_vtype->{@$expected[0]} = 1
if ( @$expected[0] ne '' && scalar @$expected > 1);
} }
# to check if all $vtype_subdirs are defined in path_to_volume_id
# or have a test
is_deeply($seen_vtype, $vtype_subdirs, "vtype_subdir check");
#cleanup #cleanup
# File::Temp unlinks tempdir on exit # File::Temp unlinks tempdir on exit