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

11
PVE/Storage/ISCSIDirectPlugin.pm
View File

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

158
PVE/Storage/NexentaPlugin.pm
View File

@ -13,141 +13,120 @@ use PVE::JSONSchema qw(get_standard_option);
use base qw(PVE::Storage::Plugin); use base qw(PVE::Storage::Plugin);
sub nexenta_request { sub nexenta_request {
my ($scfg, $json) = @_; my ($scfg, $json) = @_;
my $uri = "http://".$scfg->{portal}.":2000/rest/nms/"; my $uri = "http://".$scfg->{portal}.":2000/rest/nms/";
my $req = HTTP::Request->new( 'POST', $uri ); my $req = HTTP::Request->new( 'POST', $uri );
$req->header( 'Content-Type' => 'application/json' ); $req->header( 'Content-Type' => 'application/json' );
$req->content( $json ); $req->content( $json );
my $token = encode_base64("$scfg->{login}:$scfg->{password}"); my $token = encode_base64("$scfg->{login}:$scfg->{password}");
$req->header( Authorization => "Basic $token" ); $req->header( Authorization => "Basic $token" );
my $ua = LWP::UserAgent->new; # You might want some options here my $ua = LWP::UserAgent->new; # You might want some options here
my $res = $ua->request($req); my $res = $ua->request($req);
if (!$res->is_success) { if (!$res->is_success) {
die $res->content; die $res->content;
}
} my $obj = from_json($res->content);
my $obj = from_json($res->content); print $obj->{error}->{message} if $obj->{error}->{message};
print $obj->{error}->{message} if $obj->{error}->{message}; return undef if $obj->{error}->{message};
return undef if $obj->{error}->{message}; return $obj->{result} if $obj->{result};
return $obj->{result} if $obj->{result}; return 1;
return 1;
} }
sub nexenta_list_lun_mapping_entries { sub nexenta_list_lun_mapping_entries {
my ($zvol, $scfg) = @_; my ($zvol, $scfg) = @_;
my $json = '{"method": "list_lun_mapping_entries","object" : "scsidisk","params": ["'.$scfg->{pool}.'/'.$zvol.'"]}';
my $map = nexenta_request($scfg,$json);
return $map if $map;
return undef;
my $json = '{"method": "list_lun_mapping_entries","object" : "scsidisk","params": ["'.$scfg->{pool}.'/'.$zvol.'"]}';
my $map = nexenta_request($scfg,$json);
return $map if $map;
return undef;
} }
sub nexenta_add_lun_mapping_entry { sub nexenta_add_lun_mapping_entry {
my ($zvol, $scfg) = @_; my ($zvol, $scfg) = @_;
my $json = '{"method": "add_lun_mapping_entry","object" : "scsidisk","params": ["'.$scfg->{pool}.'/'.$zvol.'",{"target_group": "All"}]}';
my $json = '{"method": "add_lun_mapping_entry","object" : "scsidisk","params": ["'.$scfg->{pool}.'/'.$zvol.'",{"target_group": "All"}]}'; return undef if !nexenta_request($scfg, $json);
return 1;
return undef if !nexenta_request($scfg, $json);
return 1;
} }
sub nexenta_delete_lu { sub nexenta_delete_lu {
my ($zvol, $scfg) = @_; my ($zvol, $scfg) = @_;
my $json = '{"method": "delete_lu","object" : "scsidisk","params": ["'.$scfg->{pool}.'/'.$zvol.'"]}';
return undef if !nexenta_request($scfg, $json);
return 1;
my $json = '{"method": "delete_lu","object" : "scsidisk","params": ["'.$scfg->{pool}.'/'.$zvol.'"]}';
return undef if !nexenta_request($scfg, $json);
return 1;
} }
sub nexenta_create_lu { sub nexenta_create_lu {
my ($zvol, $scfg) = @_; my ($zvol, $scfg) = @_;
my $json = '{"method": "create_lu","object" : "scsidisk","params": ["'.$scfg->{pool}.'/'.$zvol.'",{}]}'; my $json = '{"method": "create_lu","object" : "scsidisk","params": ["'.$scfg->{pool}.'/'.$zvol.'",{}]}';
return undef if !nexenta_request($scfg, $json);
return 1;
return undef if !nexenta_request($scfg, $json);
return 1;
} }
sub nexenta_create_zvol { sub nexenta_create_zvol {
my ($zvol, $size, $scfg) = @_; my ($zvol, $size, $scfg) = @_;
my $blocksize = $scfg->{blocksize};
my $nexentapool = $scfg->{pool};
my $blocksize = $scfg->{blocksize}; my $json = '{"method": "create","object" : "zvol","params": ["'.$nexentapool.'/'.$zvol.'", "'.$size.'KB", "'.$blocksize.'", "1"]}';
my $nexentapool = $scfg->{pool};
my $json = '{"method": "create","object" : "zvol","params": ["'.$nexentapool.'/'.$zvol.'", "'.$size.'KB", "'.$blocksize.'", "1"]}';
return undef if !nexenta_request($scfg, $json);
return 1;
return undef if !nexenta_request($scfg, $json);
return 1;
} }
sub nexenta_delete_zvol { sub nexenta_delete_zvol {
my ($zvol, $scfg) = @_; my ($zvol, $scfg) = @_;
sleep 5;
my $json = '{"method": "destroy","object" : "zvol","params": ["'.$scfg->{pool}.'/'.$zvol.'", ""]}';
return undef if !nexenta_request($scfg, $json);
return 1;
sleep 5;
my $json = '{"method": "destroy","object" : "zvol","params": ["'.$scfg->{pool}.'/'.$zvol.'", ""]}';
return undef if !nexenta_request($scfg, $json);
return 1;
} }
sub nexenta_list_zvol { sub nexenta_list_zvol {
my ($scfg) = @_; my ($scfg) = @_;
my $json = '{"method": "get_names","object" : "zvol","params": [""]}';
my $volumes = {};
my $zvols = nexenta_request($scfg, $json);
return undef if !$zvols;
my $json = '{"method": "get_names","object" : "zvol","params": [""]}'; my $list = {};
my $volumes = {};
my $zvols = nexenta_request($scfg, $json); foreach my $zvol (@$zvols) {
return undef if !$zvols; my @values = split('/', $zvol);
#$volumes->{$values[0]}->{$values[1]}->{volname} = $values[1];
my $list = {};
foreach my $zvol (@$zvols) {
my @values = split('/', $zvol);
#$volumes->{$values[0]}->{$values[1]}->{volname} = $values[1];
my $pool = $values[0];
my $image = $values[1];
my $owner;
if ($image =~ m/^(vm-(\d+)-\S+)$/) {
$owner = $2;
}
$list->{$pool}->{$image} = {
name => $image,
size => "",
vmid => $owner
};
my $pool = $values[0];
my $image = $values[1];
my $owner;
if ($image =~ m/^(vm-(\d+)-\S+)$/) {
$owner = $2;
} }
$list->{$pool}->{$image} = {
name => $image,
size => "",
vmid => $owner
};
return $list; }
return $list;
} }
# Configuration # Configuration
sub type { sub type {
return 'nexenta'; return 'nexenta';
} }
@ -158,10 +137,8 @@ sub plugindata {
}; };
} }
sub properties { sub properties {
return { return {
login => { login => {
description => "login", description => "login",
type => 'string', type => 'string',
@ -174,7 +151,6 @@ sub properties {
description => "block size", description => "block size",
type => 'string', type => 'string',
}, },
}; };
} }
@ -195,7 +171,6 @@ sub options {
sub parse_volname { sub parse_volname {
my ($class, $volname) = @_; my ($class, $volname) = @_;
if ($volname =~ m/^(vm-(\d+)-\S+)$/) { if ($volname =~ m/^(vm-(\d+)-\S+)$/) {
return ('images', $1, $2); return ('images', $1, $2);
} }
@ -216,7 +191,6 @@ sub path {
die "could not find lun number" if !$map; die "could not find lun number" if !$map;
my $lun = @$map[0]->{lun}; my $lun = @$map[0]->{lun};
my $path = "iscsi://$portal/$target/$lun"; my $path = "iscsi://$portal/$target/$lun";
return ($path, $vmid, $vtype); return ($path, $vmid, $vtype);
@ -231,12 +205,9 @@ sub alloc_image {
die "illegal name '$name' - sould be 'vm-$vmid-*'\n" die "illegal name '$name' - sould be 'vm-$vmid-*'\n"
if $name && $name !~ m/^vm-$vmid-/; if $name && $name !~ m/^vm-$vmid-/;
my $nexentapool = $scfg->{'pool'}; my $nexentapool = $scfg->{'pool'};
if (!$name) { if (!$name) {
my $volumes = nexenta_list_zvol($scfg); my $volumes = nexenta_list_zvol($scfg);
die "unable de get zvol list" if !$volumes; die "unable de get zvol list" if !$volumes;
@ -340,5 +311,4 @@ sub deactivate_volume {
return 1; return 1;
} }
1; 1;