cleanup white space errors

diff --git a/PVE/Storage/ISCSIDirectPlugin.pm b/PVE/Storage/ISCSIDirectPlugin.pm
index 82b7521b51d1b2c3c3251a76ef6df1bfd83de7b5..dafa174e6961a6bf0b7b96586a0c1aabc0284b59 100644 (file)
--- a/PVE/Storage/ISCSIDirectPlugin.pm
+++ b/PVE/Storage/ISCSIDirectPlugin.pm
@@ -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;

diff --git a/PVE/Storage/NexentaPlugin.pm b/PVE/Storage/NexentaPlugin.pm
index 2943227060562acc3286262507e1f39d92522d87..d2c4a24c5eebdf9b288c280b3c5c4247337336aa 100644 (file)
--- a/PVE/Storage/NexentaPlugin.pm
+++ b/PVE/Storage/NexentaPlugin.pm
@@ -13,140 +13,119 @@ use PVE::JSONSchema qw(get_standard_option);
 
 use base qw(PVE::Storage::Plugin);
 
+sub nexenta_request {
+    my ($scfg, $json) = @_;
 
+    my $uri = "http://".$scfg->{portal}.":2000/rest/nms/";
+    my $req = HTTP::Request->new( 'POST', $uri );
 
-sub nexenta_request {
- my ($scfg, $json) = @_;
-
-        my $uri = "http://".$scfg->{portal}.":2000/rest/nms/";
-        my $req = HTTP::Request->new( 'POST', $uri );
-
-        $req->header( 'Content-Type' => 'application/json' );
-        $req->content( $json );
-        my $token = encode_base64("$scfg->{login}:$scfg->{password}");
-        $req->header( Authorization => "Basic $token" );
-
-        my $ua = LWP::UserAgent->new; # You might want some options here
-        my $res = $ua->request($req);
-        if (!$res->is_success) {
-                die $res->content;
-
-        }
-        my $obj = from_json($res->content);
-        print $obj->{error}->{message} if $obj->{error}->{message};
-        return undef if $obj->{error}->{message};
-        return $obj->{result} if $obj->{result};
-        return 1;
-}
+    $req->header( 'Content-Type' => 'application/json' );
+    $req->content( $json );
+    my $token = encode_base64("$scfg->{login}:$scfg->{password}");
+    $req->header( Authorization => "Basic $token" );
 
+    my $ua = LWP::UserAgent->new; # You might want some options here
+    my $res = $ua->request($req);
+    if (!$res->is_success) {
+       die $res->content;
+    }
+    my $obj = from_json($res->content);
+    print $obj->{error}->{message} if $obj->{error}->{message};
+    return undef if $obj->{error}->{message};
+    return $obj->{result} if $obj->{result};
+    return 1;
+}
 
 sub nexenta_list_lun_mapping_entries {
- 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 ($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;
 }
 
 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"}]}';
- 
-        return undef if !nexenta_request($scfg, $json);
-       return 1;
+    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;
 }
 
-
 sub nexenta_delete_lu {
- my ($zvol, $scfg) = @_;
-
-        my $json = '{"method": "delete_lu","object" : "scsidisk","params": ["'.$scfg->{pool}.'/'.$zvol.'"]}';
-        return undef if !nexenta_request($scfg, $json);
-       return 1;
+    my ($zvol, $scfg) = @_;
 
+    my $json = '{"method": "delete_lu","object" : "scsidisk","params": ["'.$scfg->{pool}.'/'.$zvol.'"]}';
+    return undef if !nexenta_request($scfg, $json);
+    return 1;
 }
 
 sub nexenta_create_lu {
     my ($zvol, $scfg) = @_;
 
-       my $json = '{"method": "create_lu","object" : "scsidisk","params": ["'.$scfg->{pool}.'/'.$zvol.'",{}]}';
-
-        return undef if !nexenta_request($scfg, $json);
-       return 1;
+    my $json = '{"method": "create_lu","object" : "scsidisk","params": ["'.$scfg->{pool}.'/'.$zvol.'",{}]}';
 
+    return undef if !nexenta_request($scfg, $json);
+    return 1;
 }
 
 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 $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;
+    my $json = '{"method": "create","object" : "zvol","params": ["'.$nexentapool.'/'.$zvol.'", "'.$size.'KB", "'.$blocksize.'", "1"]}';
 
+    return undef if !nexenta_request($scfg, $json);
+    return 1;
 }
+
 sub nexenta_delete_zvol {
     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 {
     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 $volumes = {};
-       
-       my $zvols = nexenta_request($scfg, $json);
-       return undef if !$zvols;
-
-       my $list = {};
+    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
-           };
+    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
+       };
 
-       return $list;
+    }
 
+    return $list;
 }
 
-
-
-
-# Configuration 
-
+# Configuration
 
 sub type {
     return 'nexenta';
@@ -158,10 +137,8 @@ sub plugindata {
     };
 }
 
-
 sub properties {
     return {
-
        login => {
            description => "login",
            type => 'string',
@@ -174,7 +151,6 @@ sub properties {
            description => "block size",
            type => 'string',
        },
-
     };
 }
 
@@ -195,7 +171,6 @@ sub options {
 sub parse_volname {
     my ($class, $volname) = @_;
 
-   
     if ($volname =~ m/^(vm-(\d+)-\S+)$/) {
        return ('images', $1, $2);
     }
@@ -216,7 +191,6 @@ sub path {
     die "could not find lun number" if !$map;
     my $lun = @$map[0]->{lun};
 
-
     my $path = "iscsi://$portal/$target/$lun";
 
     return ($path, $vmid, $vtype);
@@ -228,15 +202,12 @@ sub alloc_image {
 
     die "unsupported format '$fmt'" if $fmt ne 'raw';
 
-    die "illegal name '$name' - sould be 'vm-$vmid-*'\n" 
+    die "illegal name '$name' - sould be 'vm-$vmid-*'\n"
        if  $name && $name !~ m/^vm-$vmid-/;
 
-  
-
     my $nexentapool = $scfg->{'pool'};
 
     if (!$name) {
-       
        my $volumes = nexenta_list_zvol($scfg);
        die "unable de get zvol list" if !$volumes;
 
@@ -340,5 +311,4 @@ sub deactivate_volume {
     return 1;
 }
 
-
 1;