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

cleanup white space errors

Browse Source
This commit is contained in:
Dietmar Maurer
2012-07-17 11:55:38 +02:00
parent 40cd7d27d5
commit 2677f6239d
2 changed files with 73 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
PVE/Storage/ISCSIDirectPlugin.pm
View File

@ -11,16 +11,14 @@ use PVE::JSONSchema qw(get_standard_option);
use base qw(PVE::Storage::Plugin);
sub iscsi_ls{
my ($scfg, $storeid) = @_;
sub iscsi_ls {
my ($scfg, $storeid) = @_;
my $portal = $scfg->{portal};
my $cmd = ['/usr/bin/iscsi-ls', '-s', 'iscsi://'.$portal ];
my $list = {};
my $test = "";
my $errfunc = sub {
my $line = shift;
$line = trim($line);
@ -30,15 +28,15 @@ sub iscsi_ls{
eval {
run_command($cmd, errmsg => "iscsi error", errfunc => $errfunc,outfunc => sub {
run_command($cmd, errmsg => "iscsi error", errfunc => $errfunc, outfunc => sub {
my $line = shift;
$line = trim($line);
if( $line =~ /Lun:(\d+)\s+([A-Za-z0-9\-\_\.\:]*)\s+\(Size:(\d+)G\)/ ) {
$test = $1;
my $image = $1;
my $size = $3;
$list->{$storeid}->{$image} = {
name => $image,
size => $size,
@ -50,7 +48,6 @@ sub iscsi_ls{
my $err = $@;
die $err if $err && $err !~ m/TESTUNITREADY failed with SENSE KEY/ ;
return $list;
}
# Configuration
@ -75,13 +72,12 @@ sub options {
};
}
# Storage implementation
sub parse_volname {
my ($class, $volname) = @_;
if ($volname =~ m/^(\d+)$/) {
return ('images', $1, undef);
}
@ -185,5 +181,4 @@ sub deactivate_volume {
return 1;
}
1;