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

remove unused method

Browse Source 
only used by test case, which should use what the rest of
the codebase uses as well
This commit is contained in:
Fabian Grünbichler
2016-09-15 13:17:44 +02:00
committed by Dietmar Maurer
parent cfd58f1fcc
commit 9924228be1
2 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
PVE/Storage.pm
View File

@ -341,27 +341,6 @@ sub parse_volume_id {
return PVE::Storage::Plugin::parse_volume_id($volid, $noerr);
}
sub volume_is_base {
my ($cfg, $volid) = @_;
my ($sid, $volname) = parse_volume_id($volid, 1);
return 0 if !$sid;
if (my $scfg = $cfg->{ids}->{$sid}) {
my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =
$plugin->parse_volname($volname);
return $isBase ? 1 : 0;
} else {
# stale volid with undefined storage - so we can just guess
if ($volid =~ m/base-/) {
return 1;
}
}
return 0;
}
# try to map a filesystem path to a volume identifier
sub path_to_volume_id {
my ($cfg, $path) = @_;

21
test/run_test_zfspoolplugin.pl
View File

@ -818,7 +818,7 @@ my $test10 =sub {
print "\nrun test10 \"volume_is_base\"\n";
eval {
if (1 == PVE::Storage::volume_is_base($cfg, "$storagename:$vmdisk")) {
if (1 == volume_is_base($cfg, "$storagename:$vmdisk")) {
$count++;
warn "Test10 a: is no base";
}
@ -830,7 +830,7 @@ my $test10 =sub {
}
eval {
if (0 == PVE::Storage::volume_is_base($cfg, "$storagename:$vmbase")) {
if (0 == volume_is_base($cfg, "$storagename:$vmbase")) {
$count++;
warn "Test10 b: is base";
}
@ -842,7 +842,7 @@ my $test10 =sub {
}
eval {
if (1 == PVE::Storage::volume_is_base($cfg, "$storagename:$vmbase\/$vmlinked")) {
if (1 == volume_is_base($cfg, "$storagename:$vmbase\/$vmlinked")) {
$count++;
warn "Test10 c: is no base";
}
@ -854,7 +854,7 @@ my $test10 =sub {
}
eval {
if (1 == PVE::Storage::volume_is_base($cfg, "$storagename:$ctdisk")) {
if (1 == volume_is_base($cfg, "$storagename:$ctdisk")) {
$count++;
warn "Test10 d: is no base";
}
@ -866,7 +866,7 @@ my $test10 =sub {
}
eval {
if (0 == PVE::Storage::volume_is_base($cfg, "$storagename:$ctbase")) {
if (0 == volume_is_base($cfg, "$storagename:$ctbase")) {
$count++;
warn "Test10 e: is base";
}
@ -878,7 +878,7 @@ my $test10 =sub {
}
eval {
if (1 == PVE::Storage::volume_is_base($cfg, "$storagename:$ctbase\/$ctlinked")) {
if (1 == volume_is_base($cfg, "$storagename:$ctbase\/$ctlinked")) {
$count++;
warn "Test10 f: is no base";
}
@ -2640,6 +2640,15 @@ sub clean_up_zpool {
unlink 'zpool.img';
}
sub volume_is_base {
my ($cfg, $volid) = @_;
my (undef, undef, undef, undef, undef, $isBase, undef) = PVE::Storage::parse_volname($cfg, $volid);
return $isBase;
}
setup_zpool();
my $time = time;