[Cluster-devel] cluster/fence/agents/drac fence_drac.pl

[jparsons@sourceware.org <jparsons@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	jparsons at sourceware.org	2006-10-20 16:21:53

Modified files:
	fence/agents/drac: fence_drac.pl 

Log message:
	Addresses bz175538 by adding 4/I support and increasing the telnet timeout value, and ALSO adds drac 4p support for firmware 1.40 and later

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/agents/drac/fence_drac.pl.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.3.2.5&r2=1.3.2.6

--- cluster/fence/agents/drac/fence_drac.pl	2006/09/06 15:32:36	1.3.2.5
+++ cluster/fence/agents/drac/fence_drac.pl	2006/10/20 16:21:53	1.3.2.6
@@ -32,7 +32,7 @@
 s/.*\///;
 my $pname = $_;
 
-my $telnet_timeout = 5;      # Seconds to wait for matching telent response
+my $telnet_timeout = 10;      # Seconds to wait for matching telent response
 my $power_timeout = 20;      # time to wait in seconds for power state changes
 $action = 'reboot';          # Default fence action.  
 
@@ -45,6 +45,7 @@
 my $DRAC_VERSION_III_XT  = 'DRAC III/XT';
 my $DRAC_VERSION_MC      = 'DRAC/MC';
 my $DRAC_VERSION_4I	 = 'DRAC 4/I';
+my $DRAC_VERSION_4P	 = 'DRAC 4/P';
 
 # WARNING!! Do not add code bewteen "#BEGIN_VERSION_GENERATION" and 
 # "#END_VERSION_GENERATION"  It is generated by the Makefile
@@ -168,6 +169,11 @@
 		$cmd_prompt = "/\\[$login\\]# /" 
 			unless defined $cmd_prompt;
 	}
+  elsif ($drac_version =~ /$DRAC_VERSION_4P/)
+  {
+        $cmd_prompt = "/\\[$login\\]# /"
+          unless defined $cmd_prompt;
+  } 
 	else
 	{
 		print "WARNING: unsupported DRAC version '$drac_version'\n";
@@ -309,7 +315,7 @@
 		my ($group,$arrow,$module,$presence,$pwrstate,$health,
 			$svctag,$junk) = split /\s+/;
 
-		if ($drac_version eq  $DRAC_VERSION_III_XT || $drac_version eq $DRAC_VERSION_4I)
+		if ($drac_version eq  $DRAC_VERSION_III_XT || $drac_version eq $DRAC_VERSION_4I || $drac_version eq $DRAC_VERSION_4P)
 		{
 			fail "failed: extraneous output detected from 'getmodinfo'" if $found_module;
 			$found_module = 1;