svn commit: r1041906 - /incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm

[ar...@apache.org]

Author: arkurth
Date: Fri Dec  3 16:57:15 2010
New Revision: 1041906

URL: http://svn.apache.org/viewvc?rev=1041906&view=rev
Log:
VCL-394
Changed if/else block that is used to detect which vim-cmd executable is installed on the VM host.  Full ESX includes both vim-cmd and vmware-vim-cmd.  The code was failing if it found both.

Modified:
    incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm

Modified: incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm?rev=1041906&r1=1041905&r2=1041906&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm Fri Dec  3 16:57:15 2010
@@ -130,14 +130,11 @@ sub initialize {
 		# Output contains the line: 'vim-cmd: command not found'
 		$self->{vim_cmd} = 'vmware-vim-cmd';
 	}
-	elsif (grep(/: vmware-vim-cmd:.*not found/i, @$output)) {
+	else {
 		# Output contains the line: 'vmware-vim-cmd: command not found'
+		# Note: VMware ESX 4.1 has BOTH vim-cmd and vmware-vim-cmd
 		$self->{vim_cmd} = 'vim-cmd';
 	}
-	else {
-		notify($ERRORS{'WARNING'}, 0, "unexpected output returned while attempting to determine which VIM executable is available on the VM host, output:\n" . join("\n", @$output));
-		return;
-	}
 	notify($ERRORS{'DEBUG'}, 0, "VIM executable available on VM host: $self->{vim_cmd}");
 	
 	notify($ERRORS{'DEBUG'}, 0, ref($self) . " object initialized");