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

nexenta: fix parse_volname

Browse Source 
And some coding style cleanups.
This commit is contained in:
Dietmar Maurer
2012-09-19 07:38:40 +02:00
parent 2570fb94e8
commit ac4329f3d8
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
PVE/Storage/NexentaPlugin.pm
View File

@ -20,13 +20,13 @@ sub nexenta_request {
my $json = encode_json($apicall); my $json = encode_json($apicall);
my $uri = ( $scfg->{ssl} ? "https" : "http" ) . "://" . $scfg->{portal} . ":2000/rest/nms/"; my $uri = ($scfg->{ssl} ? "https" : "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);
@ -68,8 +68,6 @@ sub nexenta_create_lu {
my ($scfg, $zvol) = @_; my ($scfg, $zvol) = @_;
nexenta_request($scfg, 'create_lu', 'scsidisk', "$scfg->{pool}/$zvol", {}); nexenta_request($scfg, 'create_lu', 'scsidisk', "$scfg->{pool}/$zvol", {});
return 1;
} }
sub nexenta_create_zvol { sub nexenta_create_zvol {
@ -77,8 +75,6 @@ sub nexenta_create_zvol {
nexenta_request($scfg, 'create', 'zvol', "$scfg->{pool}/$zvol", "${size}KB", nexenta_request($scfg, 'create', 'zvol', "$scfg->{pool}/$zvol", "${size}KB",
$scfg->{blocksize}, 1); $scfg->{blocksize}, 1);
return 1;
} }
sub nexenta_delete_zvol { sub nexenta_delete_zvol {
@ -161,7 +157,6 @@ sub options {
ssl => { optional => 1 }, ssl => { optional => 1 },
content => { optional => 1 }, content => { optional => 1 },
}; };
} }
# Storage implementation # Storage implementation
@ -173,8 +168,7 @@ sub parse_volname {
return ('images', $1, $2); return ('images', $1, $2);
} }
return('images',$volname,''); die "unable to parse nexenta volume name '$volname'\n";
#die "unable to parse lvm volume name '$volname'\n";
} }
sub path { sub path {