pvesm iscsiscan: fix cli parameters

[pve-storage.git] / PVE / Storage.pm

diff --git a/PVE/Storage.pm b/PVE/Storage.pm
index 6a2b40b1d8cb712a487b9ade2cb17ba05d5e22ed..f9732feec778b1623e19362341a77baf068f7eb1 100755 (executable)
--- a/PVE/Storage.pm
+++ b/PVE/Storage.pm
@@ -28,6 +28,7 @@ use PVE::Storage::NFSPlugin;
 use PVE::Storage::CIFSPlugin;
 use PVE::Storage::ISCSIPlugin;
 use PVE::Storage::RBDPlugin;
+use PVE::Storage::CephFSPlugin;
 use PVE::Storage::SheepdogPlugin;
 use PVE::Storage::ISCSIDirectPlugin;
 use PVE::Storage::GlusterfsPlugin;
@@ -46,6 +47,7 @@ PVE::Storage::NFSPlugin->register();
 PVE::Storage::CIFSPlugin->register();
 PVE::Storage::ISCSIPlugin->register();
 PVE::Storage::RBDPlugin->register();
+PVE::Storage::CephFSPlugin->register();
 PVE::Storage::SheepdogPlugin->register();
 PVE::Storage::ISCSIDirectPlugin->register();
 PVE::Storage::GlusterfsPlugin->register();
@@ -1065,8 +1067,7 @@ sub storage_info {
            next;
        }
 
-       my ($total, $avail, $used, $active);
-       eval { ($total, $avail, $used, $active) = $plugin->status($storeid, $scfg, $cache); };
+       my ($total, $avail, $used, $active) = eval { $plugin->status($storeid, $scfg, $cache); };
        warn $@ if $@;
        next if !$active;
        $info->{$storeid}->{total} = int($total);
@@ -1116,6 +1117,41 @@ sub scan_nfs {
     return $res;
 }
 
+sub scan_cifs {
+    my ($server_in, $user, $password, $domain) = @_;
+
+    my $server;
+    if (!($server = resolv_server ($server_in))) {
+       die "unable to resolve address for server '${server_in}'\n";
+    }
+
+    # we support only Windows grater than 2012 cifsscan so use smb3
+    my $cmd = ['/usr/bin/smbclient', '-m', 'smb3', '-d', '0', '-L', $server];
+    if (defined($user)) {
+       die "password is required" if !defined($password);
+       push @$cmd, '-U', "$user\%$password";
+       push @$cmd, '-W', $domain if defined($domain);
+    } else {
+       push @$cmd, '-N';
+    }
+
+    my $res = {};
+    run_command($cmd,
+               outfunc => sub {
+                   my $line = shift;
+                   if ($line =~ m/(\S+)\s*Disk\s*(\S*)/) {
+                       $res->{$1} = $2;
+                   } elsif ($line =~ m/(NT_STATUS_(\S*))/) {
+                       $res->{$1} = '';
+                   }
+               },
+               errfunc => sub {},
+               noerr => 1
+    );
+
+    return $res;
+}
+
 sub scan_zfs {
 
     my $cmd = ['zfs',  'list', '-t', 'filesystem', '-H', '-o', 'name,avail,used'];