From 3664f1d5c3290b988581864303fefe9bfd7e4ac6 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jbjohnso@us.ibm.com>
Date: Mon, 28 Oct 2013 20:26:40 -0400
Subject: [PATCH] Implement rescansan in esx.pm and wire up svc.pm to issue
 rescansan

---
 xCAT-server/lib/xcat/plugins/esx.pm | 21 ++++++++++++++++-----
 xCAT-server/lib/xcat/plugins/svc.pm |  9 ++++++---
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/esx.pm b/xCAT-server/lib/xcat/plugins/esx.pm
index 44bf57902..168fa6515 100644
--- a/xCAT-server/lib/xcat/plugins/esx.pm
+++ b/xCAT-server/lib/xcat/plugins/esx.pm
@@ -126,6 +126,7 @@ sub handled_commands{
 		rsetboot => 'nodehm:power,mgt',
 		rmigrate => 'nodehm:power,mgt',
         formatdisk => "nodetype:os=(esxi.*)",
+        rescansan => "nodetype:os=(esxi.*)",
 		mkvm => 'nodehm:mgt',
 		rmvm => 'nodehm:mgt',
         clonevm => 'nodehm:mgt',
@@ -211,7 +212,7 @@ sub preprocess_request {
 
 	my $vmtabhash = $vmtab->getNodesAttribs($noderange,['host','migrationdest']);
 	foreach my $node (@$noderange){
-        if ($command eq "rmhypervisor" or $command eq 'lsvm' or $command eq 'rshutdown' or $command eq "chhypervisor" or $command eq "formatdisk") {
+        if ($command eq "rmhypervisor" or $command eq 'lsvm' or $command eq 'rshutdown' or $command eq "chhypervisor" or $command eq "formatdisk" or $command eq 'rescansan') {
             $hyp_hash{$node}{nodes} = [$node];
         } else {
         my $ent = $vmtabhash->{$node}->[0];
@@ -320,6 +321,7 @@ sub process_request {
     if ($request->{_xcat_authname}->[0]) {
         $requester=$request->{_xcat_authname}->[0];
     }
+    %vcenterhash = ();#A data structure to reflect the state of vcenter connectivity to hypervisors
 	my $level = shift;
 	my $distname = undef;
 	my $arch = undef;
@@ -639,6 +641,8 @@ sub do_cmd {
         generic_vm_operation(['config.name','config','runtime.host','layoutEx'],\&inv,@exargs);
     } elsif ($command eq 'formatdisk') {
         generic_hyp_operation(\&formatdisk,@exargs);
+    } elsif ($command eq 'rescansan') {
+        generic_hyp_operation(\&rescansan,@exargs);
     } elsif ($command eq 'rmhypervisor') {
         generic_hyp_operation(\&rmhypervisor,@exargs);
     } elsif ($command eq 'rshutdown') {
@@ -2176,6 +2180,17 @@ sub rshutdown_inmaintenance {
     return;
 }
 
+sub rescansan {
+    my %args = @_;
+    my $hyp = $args{hyp};
+    my $hostview = get_hostview(hypname=>$hyp,conn=>$hyphash{$hyp}->{conn},properties=>['config','configManager']);
+    if (defined $hostview) {
+        my $hdss = $hostview->{vim}->get_view(mo_ref=>$hostview->configManager->storageSystem);
+        $hdss->RescanAllHba();
+        $hdss->RescanVmfs();
+    }
+}
+
 sub formatdisk {
     my %args = @_;
     my $hyp = $args{hyp};
@@ -4959,7 +4974,6 @@ sub cpNetbootImages {
 		    chdir($tmpDir);
             xCAT::SvrUtils::sendmsg("extracting netboot files from OS image.  This may take about a minute or two...hopefully you have ~1GB free in your /tmp dir\n", $output_handler);
             my $cmd = "tar zxf $srcDir/image.tgz";
-            print "\n$cmd\n";
             if(system($cmd)){
                 xCAT::SvrUtils::sendmsg([1,"Unable to extract $srcDir/image.tgz\n"], $output_handler); 
             }
@@ -4971,13 +4985,11 @@ sub cpNetbootImages {
 	
             # now we need to get partition 5 which has the installation goods in it.
             my $scmd = "fdisk -lu $tmpDir/usr/lib/vmware/installer/*dd 2>&1 | grep dd5 | awk '{print \$2}'";
-            print "running: $scmd\n";
             my $sector = `$scmd`;
             chomp($sector);
             my $offset = $sector * 512;
             mkdir "/mnt/xcat";
             my $mntcmd = "mount $tmpDir/usr/lib/vmware/installer/*dd  /mnt/xcat -o loop,offset=$offset";
-            print "$mntcmd\n";
             if(system($mntcmd)){
                 xCAT::SvrUtils::sendmsg([1,"unable to mount partition 5 of the ESX netboot image to /mnt/xcat"], $output_handler);
                 return;
@@ -4999,7 +5011,6 @@ sub cpNetbootImages {
             }
             chdir("/tmp");
             system("umount /mnt/xcat");
-            print "tempDir: $tmpDir\n";
             system("rm -rf $tmpDir");
             } elsif (-r "$srcDir/cim.vgz" and -r "$srcDir/vmkernel.gz" and -r "$srcDir/vmkboot.gz" and -r "$srcDir/sys.vgz") {
                 use File::Basename;
diff --git a/xCAT-server/lib/xcat/plugins/svc.pm b/xCAT-server/lib/xcat/plugins/svc.pm
index e3830a975..c807b87ba 100644
--- a/xCAT-server/lib/xcat/plugins/svc.pm
+++ b/xCAT-server/lib/xcat/plugins/svc.pm
@@ -185,14 +185,17 @@ sub mkstorage {
         my %namemap = makehosts($wwns, controller=>$controller, cfg=>$storents);
         my @names = values %namemap;
         bindhosts(\@names, $lun, controller=>$controller);
-        if ($format) { 
+        if ($format) {
             my %request = (
                 node => [$nodes[0]],
                 command => [ 'formatdisk' ],
                 arg => [ '--id', $lun->{wwn}, '--name', $lun->{name} ]
             );
-            use Data::Dumper;
-            print Dumper($request{arg});
+            $dorequest->(\%request, $callback);
+            %request = (
+                node => \@nodes,
+                command => [ 'rescansan' ],
+            );
             $dorequest->(\%request, $callback);
         }
     } else {