[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] Cluster Project branch, RHEL47, updated. gfs-kernel_2_6_9_76-80-ga174220



This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=a174220359c48ad23e7474f71e40bfc5fedd3906

The branch, RHEL47 has been updated
       via  a174220359c48ad23e7474f71e40bfc5fedd3906 (commit)
       via  60fee48cafe707666a485d965cabf1074c452023 (commit)
       via  9f69d3f3479f5c07cadcede5d4c644ef0477125b (commit)
       via  084b7d6f54bd8d817430542e2d672aac59183e73 (commit)
       via  a89214ffd334cc0ea53d131855555d68121658c8 (commit)
       via  403be19e09ffd7e549d1736ff27283237720615e (commit)
       via  34cfe3c00dbf2f0047c78aba34d2cd9ae0a55e2e (commit)
       via  cb94aae43993ec570774abc6697ed6708448ebf1 (commit)
       via  49c55b114a5faf12525edd4fe4eedab3aa2bfd84 (commit)
       via  e0a06f6ae7cdea0c5cdbd889bb956bc8491fbb21 (commit)
       via  1e11f600093c1bfadf1a0766af0d1e5b8a838056 (commit)
       via  8e636ed6d3f51c62c1ea011049c4eba39eb09738 (commit)
       via  5e7638dcc3b9089a14d8314bf6e39cde61f69c56 (commit)
       via  e75084a271bb9677fbf79cf81b5b843989cd789d (commit)
      from  da24f0a30cb5b9950061cf1502adf263b7e3f68b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a174220359c48ad23e7474f71e40bfc5fedd3906
Author: Fabio M. Di Nitto <fdinitto redhat com>
Date:   Wed Jun 4 07:01:53 2008 +0200

    Revert "fence/agents: New fencings agents"
    
    This reverts commit 5caef3654553344dbf1719a4d6cb8fe986cd5007.

commit 60fee48cafe707666a485d965cabf1074c452023
Author: Fabio M. Di Nitto <fdinitto redhat com>
Date:   Wed Jun 4 07:01:52 2008 +0200

    Revert "[FENCE] Enable new fence agents by default"
    
    This reverts commit 3096e17f93719d3551a302eb886703d953b15e21.

commit 9f69d3f3479f5c07cadcede5d4c644ef0477125b
Author: Fabio M. Di Nitto <fdinitto redhat com>
Date:   Wed Jun 4 07:01:52 2008 +0200

    Revert "[BUILD] Fix fence/lib install target"
    
    This reverts commit 63caf4e0ef629010891af407d29d2e9a2a598e11.

commit 084b7d6f54bd8d817430542e2d672aac59183e73
Author: Fabio M. Di Nitto <fdinitto redhat com>
Date:   Wed Jun 4 07:01:52 2008 +0200

    Revert "[FENCE] SSH support using stdin options"
    
    This reverts commit 71f39467f02f161b1af03fe36a2fe4aac2488ee2.

commit a89214ffd334cc0ea53d131855555d68121658c8
Author: Fabio M. Di Nitto <fdinitto redhat com>
Date:   Wed Jun 4 07:01:52 2008 +0200

    Revert "[FENCE] Fix #444615: Support for 24 port APC fencing device"
    
    This reverts commit c9d8820962da727dcf4e2edfd755c33ce5b41b6b.

commit 403be19e09ffd7e549d1736ff27283237720615e
Author: Fabio M. Di Nitto <fdinitto redhat com>
Date:   Wed Jun 4 07:01:52 2008 +0200

    Revert "[FENCE] Fix name of the option in fencing library"
    
    This reverts commit 964af06d6caa04aedfce077b54b85dfae08161ef.

commit 34cfe3c00dbf2f0047c78aba34d2cd9ae0a55e2e
Author: Fabio M. Di Nitto <fdinitto redhat com>
Date:   Wed Jun 4 07:01:52 2008 +0200

    Revert "[FENCE] Fix problem with different menu for admin/user for APC"
    
    This reverts commit 70f574bc704dadbc0173ea69aca6678ed8d0a00a.

commit cb94aae43993ec570774abc6697ed6708448ebf1
Author: Fabio M. Di Nitto <fdinitto redhat com>
Date:   Wed Jun 4 07:01:52 2008 +0200

    Revert "[FENCE] Fix typo in name of the exceptions in fencing agents"
    
    This reverts commit 0028f87a40bae07016fff180cdd3836902741e2e.

commit 49c55b114a5faf12525edd4fe4eedab3aa2bfd84
Author: Fabio M. Di Nitto <fdinitto redhat com>
Date:   Wed Jun 4 07:01:52 2008 +0200

    Revert "[BUILD] Fix drac5 generation"
    
    This reverts commit f9daca2d6e65a8265c2358714e5038426adabe49.

commit e0a06f6ae7cdea0c5cdbd889bb956bc8491fbb21
Author: Fabio M. Di Nitto <fdinitto redhat com>
Date:   Wed Jun 4 07:01:52 2008 +0200

    Revert "[FENCE] Fix #248609: SSH support in Bladecenter fencing (ssh)"
    
    This reverts commit 115f01bfcf32a87e9d3bc0b215ad9a61ecf9b903.

commit 1e11f600093c1bfadf1a0766af0d1e5b8a838056
Author: Fabio M. Di Nitto <fdinitto redhat com>
Date:   Wed Jun 4 07:01:52 2008 +0200

    Revert "[FENCE] Fix #446995: Parse error: Unknown option 'switch=3'"
    
    This reverts commit 06ec63d1c054e324dc17324cf3917b51924df73f.

commit 8e636ed6d3f51c62c1ea011049c4eba39eb09738
Author: Fabio M. Di Nitto <fdinitto redhat com>
Date:   Wed Jun 4 07:01:52 2008 +0200

    Revert "[BUILD] Fix fence agents generation"
    
    This reverts commit 386eb6f9e8378896ffcb80c12604cc1904c68d12.

commit 5e7638dcc3b9089a14d8314bf6e39cde61f69c56
Author: Fabio M. Di Nitto <fdinitto redhat com>
Date:   Wed Jun 4 07:01:52 2008 +0200

    Revert "[FENCE] Fix #447378 - fence_apc unable to connect via ssh to APC 7900"
    
    This reverts commit c258b270df02b4b64f900265272b7845d636c239.

commit e75084a271bb9677fbf79cf81b5b843989cd789d
Author: Fabio M. Di Nitto <fdinitto redhat com>
Date:   Wed Jun 4 07:01:52 2008 +0200

    Revert "[FENCE] Fix #446995: Unknown option"
    
    This reverts commit da24f0a30cb5b9950061cf1502adf263b7e3f68b.

-----------------------------------------------------------------------

Summary of changes:
 fence/agents/Makefile                         |    3 -
 fence/agents/apc/fence_apc.py                 | 1002 ++++++++++++++++++++-----
 fence/agents/bladecenter/Makefile             |   10 +-
 fence/agents/bladecenter/fence_bladecenter.py |   90 ---
 fence/agents/drac/Makefile                    |   39 +-
 fence/agents/drac/fence_drac5.py              |   79 --
 fence/agents/ilo/Makefile                     |    8 +-
 fence/agents/ilo/fence_ilo.py                 |   77 --
 fence/agents/lib/Makefile                     |   35 -
 fence/agents/lib/fencing.py.py                |  378 ----------
 fence/agents/wti/Makefile                     |    8 +-
 fence/agents/wti/fence_wti.py                 |  109 ---
 fence/bin/Makefile                            |   11 +-
 13 files changed, 844 insertions(+), 1005 deletions(-)
 mode change 100755 => 100644 fence/agents/apc/fence_apc.py
 delete mode 100755 fence/agents/bladecenter/fence_bladecenter.py
 delete mode 100755 fence/agents/drac/fence_drac5.py
 delete mode 100755 fence/agents/ilo/fence_ilo.py
 delete mode 100644 fence/agents/lib/Makefile
 delete mode 100644 fence/agents/lib/fencing.py.py
 delete mode 100755 fence/agents/wti/fence_wti.py

diff --git a/fence/agents/Makefile b/fence/agents/Makefile
index 080863c..8418016 100644
--- a/fence/agents/Makefile
+++ b/fence/agents/Makefile
@@ -13,7 +13,6 @@
 
 
 all:
-	cd lib && ${MAKE} all
 	cd apc && ${MAKE} all
 	cd apc_snmp && ${MAKE} all
 	cd rsa && ${MAKE} all
@@ -41,7 +40,6 @@ all:
 	# cd zvm && ${MAKE} all
 
 copytobin:
-	cd lib && ${MAKE} copytobin
 	cd apc && ${MAKE} copytobin
 	cd apc_snmp && ${MAKE} copytobin
 	cd rsa && ${MAKE} copytobin
@@ -69,7 +67,6 @@ copytobin:
 	# cd zvm && ${MAKE} copytobin
 
 clean:
-	cd lib && ${MAKE} clean
 	cd apc && ${MAKE} clean
 	cd apc_snmp && ${MAKE} clean
 	cd rsa && ${MAKE} clean
diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py
old mode 100755
new mode 100644
index 4ac8be9..e28d6e2
--- a/fence/agents/apc/fence_apc.py
+++ b/fence/agents/apc/fence_apc.py
@@ -1,200 +1,832 @@
 #!/usr/bin/python
 
+###############################################################################
+###############################################################################
 ##
-## Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
+##  Copyright (C) 2006 Red Hat, Inc.  All rights reserved.
 ##
-## The Following Agent Has Been Tested On:
+##  This copyrighted material is made available to anyone wishing to use,
+##  modify, copy, or redistribute it subject to the terms and conditions
+##  of the GNU General Public License v.2.
 ##
-##  Model       Firmware
-## +---------------------------------------------+
-##  AP7951	AOS v2.7.0, PDU APP v2.7.3
-##  AP7941      AOS v3.5.7, PDU APP v3.5.6
-##  AP9606	AOS v2.5.4, PDU APP v2.7.3
-##
-## @note: ssh is very slow on AP79XX devices protocol (1) and 
-##        cipher (des/blowfish) have to be defined
-#####
+###############################################################################
+###############################################################################
+
+import getopt, sys
+import os
+import socket
+import time
+
+from telnetlib import Telnet
 
-import sys, re, pexpect
-sys.path.append("/usr/lib/fence")
-from fencing import *
+TELNET_TIMEOUT=5  #How long to wait for a response from a telnet try
+
+# WARNING!! Do not add code bewteen "#BEGIN_VERSION_GENERATION" and
+# "#END_VERSION_GENERATION"  It is generated by the Makefile
 
 #BEGIN_VERSION_GENERATION
-FENCE_RELEASE_NAME=""
+FENCE_RELEASE_NAME="New APC Agent - test release"
 REDHAT_COPYRIGHT=""
-BUILD_DATE=""
+BUILD_DATE="September 21, 2006"
 #END_VERSION_GENERATION
 
-def get_power_status(conn, options):
-	result = ""
-	try:
-		conn.send("1\r\n")
-		conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
-
-		version = 0
-		admin = 0
-		switch = 0;
-
-		if (None != re.compile('.* MasterSwitch plus.*', re.IGNORECASE | re.S).match(conn.before)):
-			switch = 1;
-			if (None != re.compile('.* MasterSwitch plus 2', re.IGNORECASE | re.S).match(conn.before)):
-				if (0 == options.has_key("-s")):
-					fail_usage("Failed: You have to enter physical switch number")
-			else:
-				if (0 == options.has_key("-s")):
-					options["-s"] = 1
-
-		if (None == re.compile('.*Outlet Management.*', re.IGNORECASE | re.S).match(conn.before)):
-			version = 2
-		else:
-			version = 3
-
-		if (None == re.compile('.*Outlet Control/Configuration.*', re.IGNORECASE | re.S).match(conn.before)):
-			admin = 0
-		else:
-			admin = 1
-
-		if switch == 0:
-			if version == 2:
-				if admin == 0:
-					conn.send("2\r\n")
-				else:
-					conn.send("3\r\n")
-			else:
-				conn.send("2\r\n")
-				conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
-				conn.send("1\r\n")
-		else:
-			conn.send(options["-s"]+"\r\n")
-			
-		while 1 == conn.log_expect(options, [ options["-c"],  "Press <ENTER>" ], SHELL_TIMEOUT):
-			result += conn.before
-			conn.send("\r\n")
-		result += conn.before
-		conn.send(chr(03))		
-		conn.log_expect(options, "- Logout", SHELL_TIMEOUT)
-		conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
-	except pexpect.EOF:
-		fail(EC_CONNECTION_LOST)
-	except pexpect.TIMEOUT:
-		fail(EC_TIMED_OUT)
-
-	status = re.compile("\s*"+options["-n"]+"-.*(ON|OFF)", re.IGNORECASE).search(result).group(1)
-	return status.lower().strip()
-
-def set_power_status(conn, options):
-	action = {
-		'on' : "1",
-		'off': "2"
-	}[options["-o"]]
-
-	try:
-		conn.send("1\r\n")
-		conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
-
-		version = 0
-		admin = 0
-		switch = 0
-
-		if (None != re.compile('.* MasterSwitch plus.*', re.IGNORECASE | re.S).match(conn.before)):
-			switch = 1;
-			## MasterSwitch has different schema for on/off actions
-			action = {
-				'on' : "1",
-				'off': "3"
-			}[options["-o"]]
-			if (None != re.compile('.* MasterSwitch plus 2', re.IGNORECASE | re.S).match(conn.before)):
-				if (0 == options.has_key("-s")):
-					fail_usage("Failed: You have to enter physical switch number")
-			else:
-				if (0 == options.has_key("-s")):
-					options["-s"] = 1
-
-		if (None == re.compile('.*Outlet Management.*', re.IGNORECASE | re.S).match(conn.before)):
-			version = 2
-		else:
-			version = 3
-
-		if (None == re.compile('.*Outlet Control/Configuration.*', re.IGNORECASE | re.S).match(conn.before)):
-			admin = 0
-		else:
-			admin = 1
-
-		if switch == 0:
-			if version == 2:
-				if admin == 0:
-					conn.send("2\r\n")
-				else:
-					conn.send("3\r\n")
-			else:
-				conn.send("2\r\n")
-				conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
-				conn.send("1\r\n")
-		else:
-			conn.send(options["-s"] + "\r\n")
-
-		while 1 == conn.log_expect(options, [ options["-c"],  "Press <ENTER>" ], SHELL_TIMEOUT):
-			conn.send("\r\n")
-		conn.send(options["-n"]+"\r\n")
-		conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
-
-		if switch == 0:
-			if admin == 1:
-				conn.send("1\r\n")
-				conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
-			if version == 3:
-				conn.send("1\r\n")
-				conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
-		else:
-			conn.send("1\r\n")
-			conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
-			
-		conn.send(action+"\r\n")
-		conn.log_expect(options, "Enter 'YES' to continue or <ENTER> to cancel :", SHELL_TIMEOUT)
-		conn.send("YES\r\n")
-		conn.log_expect(options, "Press <ENTER> to continue...", SHELL_TIMEOUT)
-		conn.send("\r\n")
-		conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
-		conn.send(chr(03))
-		conn.log_expect(options, "- Logout", SHELL_TIMEOUT)
-		conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
-	except pexpect.EOF:
-		fail(EC_CONNECTION_LOST)
-	except pexpect.TIMEOUT:
-		fail(EC_TIMED_OUT)
+POWER_OFF = 0
+POWER_ON = 1
+POWER_STATUS = 2
+POWER_REBOOT = 3
+
+COMPLETE = 0
+NOT_COMPLETE = 1
+
+ON = "ON"
+OFF = "OFF"
+
+SUCCESS = "success"
+FAIL = "fail"
+
+address = ""
+login = ""
+passwd = ""
+passwd_script = ""
+port = ""
+switchnum = ""
+action = POWER_REBOOT   #default action
+verbose = False
+
+logfile = None
+
+#set up regex list
+CONTROL_CONSOLE = "Control Console -----"
+DEVICE_MANAGER = "Device Manager -----"
+OUTLET_CONTROL = "- Outlet Control/Configuration -----"
+OUTLET_MANAGE = "- Outlet Management -----"
+CONTROL_OUTLET = "- Control Outlet -----"
+CONTROL_OUTLET_2 = "- Outlet Control "
+COMMAND_SUCCESS = "Command successfully issued."
+COMMAND_SUCCESS_2 = " Success"
+CONFIRM = "Enter 'YES' to continue or <ENTER> to cancel :"
+CONTINUE = "Press <ENTER> to continue..."
+SCREEN_END = "<ESC>- Main Menu, <ENTER>- Refresh, <CTRL-L>- Event Log"
+SCREEN_END_2 = "<ESC>- Back, <ENTER>- Refresh, <CTRL-L>- Event Log"
+USERNAME = "User Name :"
+PASSWORD = "Password  :"
+MASTER = "------- MasterSwitch"
+FIRMWARE_STR = "Rack PDU APP"
+
+CONTINUE_INDEX = 0
+
+FIRMWARE_REV = 2
+
+regex_list = list()
+regex_list.append(CONTINUE)
+regex_list.append(SCREEN_END)
+regex_list.append(SCREEN_END_2)
+regex_list.append(USERNAME)
+regex_list.append(PASSWORD)
+
+def usage():
+  print "Usage:\n"
+  print "fence_apc [options]"
+  print "Options:"
+  print "   -a <ipaddress>           ip or hostname of APC switch"
+  print "   -h                       print out help"
+  print "   -l [login]               login name"
+  print "   -n [port]                switch port"
+  print "   -p [password]            password"
+  print "   -S [path]                script to run to retrieve password"
+  print "   -o [action]              Reboot (default), Off, On, or Status"
+  print "   -v Verbose               Verbose mode - writes file to /tmp/apclog"
+  print "   -V                       Print Version, then exit"
+
+  sys.exit (0)
+
+def version():
+  print "fence_apc %s  %s\n" % (FENCE_RELEASE_NAME, BUILD_DATE)
+  print "%s\n" % REDHAT_COPYRIGHT
+  sys.exit(0)
 
 def main():
-	device_opt = [  "help", "version", "agent", "quiet", "verbose", "debug",
-			"action", "ipaddr", "login", "passwd", "passwd_script",
-			"secure", "port", "switch", "test" ]
-
-	options = check_input(device_opt, process_input(device_opt))
-
-	## 
-	## Fence agent specific defaults
-	#####
-	options["ssh_options"] = "-1 -c blowfish"
-
-	if 0 == options.has_key("-c"):
-		options["-c"] = "\n>"
-
-	## Support for -n [switch]:[plug] notation that was used before
-	if (-1 != options["-n"].find(":")):
-		(switch, plug) = options["-n"].split(":", 1)
-		options["-s"] = switch;
-		options["-n"] = plug;
-
-	##
-	## Operate the fencing device
-	####
-	conn = fence_login(options)
-	fence_action(conn, options, set_power_status, get_power_status)
-
-	##
-	## Logout from system
-	######
-	conn.sendline("4")
-	conn.close()
+
+  global address, login, passwd, passwd_script, port, action, verbose, logfile, switchnum
+
+  if len(sys.argv) > 1:
+    try:
+      opts, args = getopt.getopt(sys.argv[1:], "a:hl:o:n:p:S:vV", ["help", "output="])
+    except getopt.GetoptError:
+      #print help info and quit
+      usage()
+      sys.exit(2)
+      
+    for o, a in opts:
+      if o == "-v":
+        verbose = True
+      if o == "-V":
+        version()
+      if o in ("-h", "--help"):
+        usage()
+        sys.exit()
+      if o == "-l":
+        login = a
+      if o == "-p":
+        passwd = a
+      if o == "-S":
+        passwd_script = a
+      if o == "-n":
+        dex = a.find(":")
+        if dex == (-1):
+          port = a
+        else:
+          switchnum = a[:dex]
+          port = a[(dex+1):]
+      if o  == "-o":
+        if a == "Off" or a == "OFF" or a == "off":
+          action = POWER_OFF
+        elif a == "On" or a == "ON" or a == "on":
+          action = POWER_ON
+        elif a == "Status" or a == "STATUS" or a == "status":
+          action = POWER_STATUS
+        elif a == "Reboot" or a == "REBOOT" or a == "reboot":
+          action = POWER_REBOOT
+        else:
+          usage()
+          sys.exit()
+      if o == "-a":
+        address = a
+    if address == "" or login == "" or (passwd == "" and passwd_script == "") or port == "":
+      usage()
+      sys.exit()
+    
+  else: #Take args from stdin...
+    params = {}
+    #place params in dict
+    for line in sys.stdin:
+      val = line.split("=")
+      if len(val) == 2:
+        params[val[0].strip()] = val[1].strip()
+
+    try:
+      address = params["ipaddr"]
+    except KeyError, e:
+      sys.stderr.write("FENCE: Missing ipaddr param for fence_apc...exiting")
+      sys.exit(1)
+    try:
+      login = params["login"]
+    except KeyError, e:
+      sys.stderr.write("FENCE: Missing login param for fence_apc...exiting")
+      sys.exit(1)
+    try:
+      if 'passwd' in params:
+        passwd = params["passwd"]
+      if 'passwd_script' in params:
+        passwd_script = params['passwd_script']
+      if passwd == "" and passwd_script == "":
+        raise "missing password"
+    except:
+      sys.stderr.write("FENCE: Missing passwd for fence_apc...exiting")
+      sys.exit(1)
+    try:
+      port = params["port"]
+    except KeyError, e:
+      sys.stderr.write("FENCE: Missing port param for fence_apc...exiting")
+      sys.exit(1)
+    try:
+      switchnum = params["switch"]
+    except KeyError, e:
+      pass
+    try:
+      verbose = params["verbose"]
+      verbose = (verbose == 'True' or verbose == 'true' or verbose == 'TRUE')
+    except KeyError, e:
+      pass
+    
+    try:
+      a = params["option"]
+      if a == "Off" or a == "OFF" or a == "off":
+        action = POWER_OFF
+      elif a == "On" or a == "ON" or a == "on":
+        action = POWER_ON
+      elif a == "Reboot" or a == "REBOOT" or a == "reboot":
+        action = POWER_REBOOT
+    except KeyError, e:
+      action = POWER_REBOOT
+    
+    #### End of stdin section
+  
+  
+  # retrieve passwd from passwd_script (if specified)
+  passwd_scr = ''
+  if len(passwd_script):
+    try:
+      if not os.access(passwd_script, os.X_OK):
+        raise 'script not executable'
+      p = os.popen(passwd_script, 'r', 1024)
+      passwd_scr = p.readline().strip()
+      if p.close() != None:
+        raise 'script failed'
+    except:
+      sys.stderr.write('password-script "%s" failed\n' % passwd_script)
+      passwd_scr = ''
+    
+  if passwd == "" and passwd_scr == "":
+    sys.stderr.write('password not available, exiting...')
+    sys.exit(1)
+  elif passwd == passwd_scr:
+    pass
+  elif passwd and passwd_scr:
+    # execute self, with password_scr as passwd,
+    # if that fails, continue with "passwd" argument as password
+    if len(sys.argv) > 1:
+      comm = sys.argv[0]
+      skip_next = False
+      for w in sys.argv[1:]:
+        if skip_next:
+          skip_next = False
+        elif w in ['-p', '-S']:
+          skip_next = True
+        else:
+          comm += ' ' + w
+      comm += ' -p ' + passwd_scr
+      ret = os.system(comm)
+      if ret != -1 and os.WIFEXITED(ret) and os.WEXITSTATUS(ret) == 0:
+        # success
+        sys.exit(0)
+      else:
+        sys.stderr.write('Use of password from "passwd_script" failed, trying "passwd" argument\n')
+    else: # use stdin
+      p = os.popen(sys.argv[0], 'w', 1024)
+      for par in params:
+        if par not in ['passwd', 'passwd_script']:
+          p.write(par + '=' + params[par] + '\n')
+      p.write('passwd=' + passwd_scr + '\n')
+      p.flush()
+      if p.close() == None:
+        # success
+        sys.exit(0)
+      else:
+        sys.stderr.write('Use of password from "passwd_script" failed, trying "passwd" argument\n')
+  elif passwd_scr:
+    passwd = passwd_scr
+  # passwd all set
+  
+  
+  
+  ### Order of events
+  # 0) If verbose, prepare log file handle
+  # 1) Open socket
+  # 2) Log in
+  # 3) Evaluate task. Task will be one of:
+  # 3a - Check status and print to stdout (or log file if verbose)
+  # 3b - Turn a port off, then confirm
+  # 3c - Turn a port on, then confirm
+  # 3d - Reboot by turning a port off, then on, and confirming each step.
+
+  if verbose:
+    setup_logging()
+
+  sock = setup_socket()
+
+  # Ok, now lets log in...
+  do_login(sock)
+
+  # Now we should be at the outside Control screen
+    
+  if action == POWER_STATUS:
+    # We should be at the Control screen, so we need to write a '1'
+    # to kick things off
+    sock.write("1\r")
+    statusval = do_status_check(sock)
+    backout(sock)
+    sock.write("4\r")  # Logs out
+    
+  elif action == POWER_OFF:
+    sock.write("1\r")
+    do_power_off(sock)
+    backout(sock) # Return to control screen
+    statusval = do_status_check(sock)
+    if statusval == OFF:
+      if verbose:
+        logit("Power Off successful\n")
+      print "Power Off successful"
+      backout(sock)
+      sock.write("4\r")  # Logs out
+      sock.close()
+      sys.exit(0)
+    else:
+      if verbose:
+        logit("Power Off unsuccessful\n")
+        logit("Undetermined error\n")
+      sys.stderr.write("Power Off unsuccessful")
+      backout(sock)
+      sock.write("4\r")  # Logs out
+      sock.close()
+      sys.exit(1)
+    
+  elif action == POWER_ON:
+    sock.write("1\r")
+    do_power_on(sock)
+    backout(sock) # Return to control screen
+    statusval = do_status_check(sock)
+    if statusval == ON:
+      if verbose:
+        logit("Power On successful\n")
+      print "Power On successful"
+      backout(sock)
+      sock.write("4\r")  # logs out
+      sock.close()
+      sys.exit(0)
+    else:
+      if verbose:
+        logit("Power On unsuccessful\n")
+        logit("Undetermined error\n")
+      sys.stderr.write("Power On unsuccessful")
+      backout(sock)
+      sock.write("4\r")  # Logs out
+      sock.close()
+      sys.exit(1)
+
+  elif action == POWER_REBOOT:
+    sock.write("1\r")
+    do_power_off(sock)
+    backout(sock) # Return to control screen
+    statusval = do_status_check(sock)
+    if statusval == OFF:
+      if verbose:
+        logit("Power Off successful\n")
+      print "Power Off successful"
+      backout(sock)
+    else:
+      if verbose:
+        logit("Power Off unsuccessful\n")
+        logit("Undetermined error\n")
+      sys.stderr.write("Power Off unsuccessful")
+      backout(sock)
+      sock.write("4\r")  # Logs out
+      sock.close()
+      sys.exit(1)
+    do_power_on(sock)
+    backout(sock) # Return to control screen
+    statusval = do_status_check(sock)
+    if statusval == ON:
+      if verbose:
+        logit("Power Reboot successful\n")
+      print "Power Reboot successful"
+      backout(sock)
+      sock.write("4\r")  # Logs out
+      sock.close()
+      sys.exit(0)
+    else:
+      if verbose:
+        logit("Power Reboot unsuccessful\n")
+        logit("Undetermined error\n")
+      sys.stderr.write("Power Reboot unsuccessful")
+      backout(sock)
+      sock.write("4\r")  # Logs out
+      sock.close()
+      sys.exit(1)
+    
+  sock.close()
+
+def backout(sock):
+  sock.write(chr(27))
+  
+  while (1):
+    i, mo, txt = sock.expect(regex_list, TELNET_TIMEOUT)
+
+    if regex_list[i] == SCREEN_END:
+      break
+    elif regex_list[i] == SCREEN_END_2:
+      sock.write(chr(27))
+
+def setup_socket():
+  ## Time to open telnet session and log in. 
+  try:
+    sock = Telnet(address.strip())
+  except socket.error, (errno, msg):
+    my_msg = "FENCE: A problem was encountered opening a telnet session with " + address
+    if verbose:
+      logit(my_msg)
+      logit("FENCE: Error number: %d -- Message: %s\n" % (errno, msg))
+      logit("Firewall issue? Correct address?\n")
+
+    sys.stderr.write(my_msg)
+    sys.stderr.write(("FENCE: Error number: %d -- Message: %s\n" % (errno, msg)))
+    sys.stderr.write("Firewall issue? Correct address?\n")
+    sys.exit(1)
+
+  if verbose:
+    logit("\nsocket open to %s\n" % address)
+
+  return sock
+
+def setup_logging( log_location="/tmp/apclog"):
+  global logfile
+  try:
+    logfile = open(log_location, 'a')
+    logfile.write("###############################################\n")
+    logfile.write("Telnetting to apc switch %s\n" % address)
+    now = time.localtime(time.time())
+    logfile.write(time.asctime(now))
+  except IOError, e:
+    sys.stderr.write("Failed to open log file %s" % log_location)
+    logfile = None
+
+def logit(instr):
+  if logfile != None:
+    logfile.write(instr)
+
+def do_login(sock):
+  result_code = 1
+
+  ## This loop tries to assemble complete telnet screens and passes
+  ## them to helper methods to handle responses accordingly.
+  while result_code:
+    try:
+      i, mo, txt = sock.expect(regex_list, TELNET_TIMEOUT)
+    except socket.error, (errno, msg):
+      my_msg = "FENCE: A problem was encountered opening a telnet session with " + address + "\n"
+      if verbose:
+        logit(my_msg)
+        logit("FENCE: Error number: %d -- Message: %s\n" % (errno, msg))
+
+      sys.stderr.write(my_msg)
+      sys.stderr.write(("FENCE: Error number: %d -- Message: %s\n" % (errno, msg)))
+      sys.exit(1)
+
+    if i == CONTINUE_INDEX: # Capture the rest of the screen...
+      sock.write("\r")
+      ii,moo,txtt = sock.expect(regex_list, TELNET_TIMEOUT)
+      txt = txt + txtt
+
+    ndbuf = sock.read_eager() # Scoop up remainder
+    if verbose:
+      logit(txt + ndbuf)
+    result_code,response = log_in(txt + ndbuf)
+    if result_code:
+      try:
+        sock.write(response)
+      except socket.error, (errno, msg):
+        if verbose:
+          logit("Error #%s" % errno)
+          logit(msg)
+        sys.stderr.write("Error #%s:  %s" % (errno,msg))
+        sys.exit(1)
+
+def log_in(buffer):
+  global FIRMWARE_REV
+  lines = buffer.splitlines()
+
+  for i in lines:
+    if i.find(USERNAME) != (-1):
+      if verbose:
+        logit("Sending login: %s\n" % login)
+      return (NOT_COMPLETE, login + "\r")
+    elif i.find(PASSWORD) != (-1):
+      if verbose:
+        logit("Sending password: %s\n" % passwd)
+      return (NOT_COMPLETE, passwd + "\r")
+    elif i.find(CONTROL_CONSOLE) != (-1):
+      #while we are here, grab the firmware revision
+      rev_search_lines = buffer.splitlines()
+      for rev_search_line in rev_search_lines: #search screen again
+        rev_dex = rev_search_line.find(FIRMWARE_STR)
+        if rev_dex != (-1): #found revision line
+          scratch_rev = rev_search_line[rev_dex:]
+          v_dex = scratch_rev.find("v")
+          if v_dex != (-1):
+            if scratch_rev[v_dex + 1] == "3": #format is v3.3.4
+              FIRMWARE_REV = 3
+              break
+      return (COMPLETE, "1\r") 
+
+def do_status_check(sock):
+  result_code = 1
+  while result_code:
+    i, mo, txt = sock.expect(regex_list, TELNET_TIMEOUT)
+    if i == CONTINUE_INDEX: # Capture the rest of the screen...
+      sock.write("\r")
+      ii,moo,txtt = sock.expect(regex_list, TELNET_TIMEOUT)
+      txt = txt + txtt
+
+    ndbuf = sock.read_eager() # Scoop up remainder
+    if verbose:
+      logit(txt + ndbuf)
+    (result_code,response,statusval) = return_status(txt + ndbuf)
+    if result_code:
+      try:
+        sock.write(response)
+      except socket.error, (errno, msg):
+        if verbose:
+          logit("Status check failed.")
+          logit("Error #%s" % errno)
+          logit(msg)
+        sys.stderr.write("Status check failed.")
+        sys.stderr.write("Error #%s:  %s" % (errno,msg))
+        sys.exit(1)
+  # Back from status check - value should be in status var
+  if response == SUCCESS:
+    if switchnum == "":
+      if verbose:
+        logit("Status check successful. Port %s is %s" % (port,statusval))
+      print "Status check successful. Port %s is %s" % (port,statusval)
+    else:
+      if verbose:
+        logit("Status check successful. Port %s:%s is %s" % (switchnum, port, statusval))
+      print "Status check successful. Port %s:%s is %s" % (switchnum, port, statusval)
+
+    return statusval
+  else:
+    if verbose:
+      logit("Status check failed, unknown reason.")
+    sys.stderr.write("Status check failed, unknown reason.\n")
+    sock.close()
+    sys.exit(1) 
+
+def return_status(buffer):
+  global switchnum, port
+
+  lines = buffer.splitlines()
+
+  for i in lines:
+    if i.find(CONTROL_CONSOLE) != (-1):
+      return (NOT_COMPLETE, "1\r", "Status Unknown")
+    elif i.find(DEVICE_MANAGER) != (-1):
+      if switchnum != "":
+        res = switchnum + "\r"
+      else:
+        if FIRMWARE_REV == 2:
+          res = "3\r"
+        elif FIRMWARE_REV == 3:
+          res = "2\r1\r"
+        else: #placeholder for future revisions 
+          res = "3\r"
+      return (NOT_COMPLETE, res, "Status Unknown")
+    elif i.find(OUTLET_CONTROL) != (-1):
+      ls = buffer.splitlines()
+      portval = port.strip()
+      portval = " " + portval + " "
+      portval2 = " " + port.strip() + "- "
+      found_portval = False
+      for l in ls:
+        if l.find(portval) != (-1) or l.find(portval2) != (-1):
+          found_portval = True
+          linesplit = l.split()
+          linelen = len(linesplit)
+          return (COMPLETE,SUCCESS,linesplit[linelen - 1])
+    elif i.find(MASTER) != (-1):
+      try:
+        e = int(port.strip())
+        portval = port.strip()
+        switchval = switchnum.strip()
+        portval = switchval + ":" + portval
+      except ValueError, e:
+        portval = port.strip()
+      ls = buffer.splitlines()
+      found_portval = False
+      for l in ls:
+        words = l.split()
+        if len(words) > 3:
+          if words[2] == portval or words[3] == portval:
+            found_portval = True
+            linesplit = l.split()
+            linelen = len(linesplit)
+            return (COMPLETE, SUCCESS, linesplit[linelen - 3])
+      return (COMPLETE, FAIL, "Incorrect port number")
+  return (NOT_COMPLETE, chr(27), "Status Unknown")
+
+def do_power_switch(sock, status):
+  result_code = 1
+
+  while result_code:
+    i, mo, txt = sock.expect(regex_list, TELNET_TIMEOUT)
+    if i == CONTINUE_INDEX: # Capture the rest of the screen...
+      sock.write("\r")
+      ii,moo,txtt = sock.expect(regex_list, TELNET_TIMEOUT)
+      txt = txt + txtt
+
+    ndbuf = sock.read_eager() # Scoop up remainder
+    if verbose:
+      logit(txt + ndbuf)
+
+    if status == "off":
+      result_code, response = power_off(txt + ndbuf)
+    elif status == "on":
+      result_code, response = power_on(txt + ndbuf)
+    else:
+      if verbose:
+        logit("Invalid status in do_power_switch() function")
+      sys.stderr.write("Invalid status in do_power_switch() function") 
+      sys.exit(1)
+
+    if result_code:
+      try:
+        sock.write(response)
+      except socket.error, (errno, msg):
+        if verbose:
+          logit("Error #%s" % errno)
+          logit(msg)
+        sys.stderr.write("Error #%s:  %s" % (errno,msg))
+        sys.exit(1)
+      # FIXME: always returns COMPLETE (0)
+    else:
+      try:
+        sock.write(response)
+      except socket.error, (errno, msg):
+        if verbose:
+          logit("Error #%s" % errno)
+          logit(msg)
+        sys.stderr.write("Error #%s:  %s" % (errno,msg))
+        sys.exit(1)
+      return COMPLETE
+
+
+def power_switch(buffer, escape, control_outlet, control_outlet2):
+  # If port is not aliased, then outlet control screen will have the word
+  # 'Outlet' in the header. If the name is aliased, it will only have the 
+  # alias in the header.
+
+  outlet_search_str1 = "Outlet " + port.strip() + " ------------"
+  outlet_search_str2 = port.strip() + " ------------"
+  outlet_search_str3 = "Outlet " + switchnum.strip() + ":" + port.strip() + " ------"
+  outlet_search_str4 = "        Outlet       : " + port.strip()
+  outlet_search_str5 = "        Outlet Name : " + port.strip()
+  master_search_str1 = "-------- Master"
+  lines = buffer.splitlines()
+
+  for i in lines:
+    if i.find(CONTROL_CONSOLE) != (-1):
+      return (NOT_COMPLETE,"1\r")
+
+    elif i.find(DEVICE_MANAGER) != (-1):
+      if switchnum != "":
+        res = switchnum + "\r"
+      else:
+        if FIRMWARE_REV == 2:
+          res = "3\r"
+        elif FIRMWARE_REV == 3:
+          #Changed for bz299191
+          #res = "2\r1\r"
+          res = "2\r"
+        else: #placeholder for future revisions - sheesh
+          res = "3\r"
+      return (NOT_COMPLETE, res)
+      
+    elif (i.find(master_search_str1) != (-1)):
+      return (NOT_COMPLETE, port.strip() + "\r")
+      
+    elif i.find(outlet_search_str1) != (-1) and (switchnum == ""):
+      return (NOT_COMPLETE,"1\r")
+
+    elif i.find(outlet_search_str2) != (-1) and (switchnum == ""):
+      return (NOT_COMPLETE,"1\r")
+    
+    elif i.find(outlet_search_str3) != (-1):
+      return (NOT_COMPLETE, "1\r")
+    
+    elif i == outlet_search_str4:
+      return (NOT_COMPLETE, "1\r")
+    
+    elif i == outlet_search_str5:
+      return (NOT_COMPLETE, "1\r")
+    
+    elif i.find(OUTLET_MANAGE) != (-1):
+      #Changed for bz299191
+      #return (NOT_COMPLETE, "\r")
+      return (NOT_COMPLETE, "1\r")
+
+    #elif i.find(OUTLET_CONTROL) != (-1) or i.find(OUTLET_MANAGE) != (-1):
+    elif i.find(OUTLET_CONTROL) != (-1):
+      ls = buffer.splitlines()
+      portval = port.strip()
+      portval = " " + portval + " "
+      found_portval = False
+      i = 0
+      # look for aliased name 
+      for l in ls:
+        i = i + 1
+        if l.find(portval) != (-1):
+          found_portval = True
+          linesplit = l.split()
+          outlet_str = linesplit[0]
+          dex = outlet_str.find("-")
+          if dex <= (0):
+            if verbose:
+              logit("Problem identifying outlet\n")
+              logit("Looking for %s in string %s\n" % (portval,outlet_str))
+            sys.stderr.write("Problem identifying outlet\n")
+            sys.stderr.write("Looking for %s in string %s\n" % (portval,outlet_str))
+            sys.exit(1)
+          normalized_outlet_str = outlet_str[:dex]
+          return (NOT_COMPLETE, normalized_outlet_str + "\r")
+      # look for portnum
+      portval = " " + port.strip() + "-"
+      i = 0
+      for l in ls:
+        i = i + 1
+        if l.find(portval) != (-1):
+          found_portval = True
+          linesplit = l.split()
+          outlet_str = linesplit[0]
+          dex = outlet_str.find("-")
+          if dex <= (0):
+            if verbose:
+              logit("Problem identifying outlet\n")
+              logit("Looking for %s in string %s\n" % (portval,outlet_str))
+            sys.stderr.write("Problem identifying outlet\n")
+            sys.stderr.write("Looking for %s in string %s\n" % (portval,outlet_str))
+            sys.exit(1)
+          normalized_outlet_str = outlet_str[:dex]
+          return (NOT_COMPLETE, normalized_outlet_str + "\r")
+      if found_portval == False:
+        if verbose:
+          logit("Problem identifying outlet\n")
+          logit("Looking for '%s' in string '%s'\n" % (portval, ls))
+        sys.stderr.write("Problem identifying outlet\n")
+        sys.stderr.write("Looking for '%s' in string '%s'\n" % (portval, ls))
+        sys.exit(1)
+
+    elif i.find(MASTER) != (-1):
+      ls = buffer.splitlines()
+      found_portval = False
+      # look for aliased name
+      portval = port.strip()
+      for l in ls:
+        words = l.strip().split()
+        if len(words) > 3:
+          if '----' not in words[0] and words[3].strip() == portval:
+            outlet_str = words[0]
+            dex = outlet_str.find("-")
+            if dex <= (0):
+              if verbose:
+                logit("Problem identifying outlet\n")
+                logit("Looking for %s in string %s\n" % (portval, outlet_str))
+              sys.stderr.write("Problem identifying outlet\n")
+              sys.stderr.write("Looking for %s in string %s\n" % (portval, outlet_str))
+              sys.exit(1)
+            normalized_outlet_str = outlet_str[:dex]
+            return (NOT_COMPLETE, (normalized_outlet_str + "\r"))
+      # look for portnum
+      portval = port.strip()
+      portval = switchnum.strip() + ":" + portval + " "
+      i = 0
+      for l in ls:
+        i = i + 1
+        if l.find(portval) != (-1):
+          found_portval = True
+          linesplit = l.split()
+          outlet_str = linesplit[0]
+          dex = outlet_str.find("-")
+          if dex <= (0):
+            if verbose:
+              logit("Problem identifying outlet\n")
+              logit("Looking for %s in string %s\n" % (portval,outlet_str))
+            sys.stderr.write("Problem identifying outlet\n")
+            sys.stderr.write("Looking for %s in string %s\n" % (portval,outlet_str))
+            sys.exit(1)
+          normalized_outlet_str = outlet_str[:dex]
+          return (NOT_COMPLETE, (normalized_outlet_str + "\r"))
+      if found_portval == False:
+        if verbose:
+          logit("Problem identifying outlet\n")
+          logit("Looking for '%s' in string '%s'\n" % (portval, ls))
+        sys.stderr.write("Problem identifying outlet\n")
+        sys.stderr.write("Looking for '%s' in string '%s'\n" % (portval, ls))
+        sys.exit(1)
+
+    elif i.find(CONFIRM) != (-1):
+      return (NOT_COMPLETE,"YES\r")
+
+    elif i.find(COMMAND_SUCCESS) != (-1):
+      return (COMPLETE,"\r")
+
+    elif i.find(COMMAND_SUCCESS_2) != (-1):
+      return (COMPLETE,"\r")
+
+    elif i.find(CONTROL_OUTLET) != (-1):
+      return (NOT_COMPLETE, control_outlet + "\r")
+
+    elif i.find(CONTROL_OUTLET_2) != (-1):
+      return (NOT_COMPLETE, control_outlet2 + "\r")
+  
+  if (escape == True):
+    return (NOT_COMPLETE, chr(27))
+  else:
+    raise "unknown screen encountered in \n" + str(lines) + "\n"
+
+def do_power_off(sock):
+  x = do_power_switch(sock, "off")
+  return x
+
+def power_off(buffer):
+  x = power_switch(buffer, False, "2", "3");
+  return x
+
+def do_power_on(sock):
+  x = do_power_switch(sock, "on")
+  return x
+
+def power_on(buffer):
+  x = power_switch(buffer, True, "1", "1");
+  return x
 
 if __name__ == "__main__":
-	main()
+  main()
diff --git a/fence/agents/bladecenter/Makefile b/fence/agents/bladecenter/Makefile
index 5a617df..6bd15a8 100644
--- a/fence/agents/bladecenter/Makefile
+++ b/fence/agents/bladecenter/Makefile
@@ -11,7 +11,7 @@
 ###############################################################################
 ###############################################################################
 
-SOURCE= fence_bladecenter.py
+SOURCE= fence_bladecenter.pl
 TARGET= fence_bladecenter
 
 top_srcdir=../..
@@ -19,12 +19,12 @@ include ${top_srcdir}/make/defines.mk
 
 all: $(TARGET)
 
-fence_bladecenter: fence_bladecenter.py
+fence_bladecenter: fence_bladecenter.pl
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
-	echo "FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
-	${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf sh REDHAT_COPYRIGHT >> $(TARGET)
-	echo "BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
+	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
+	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
 	chmod +x $(TARGET)
 
diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py
deleted file mode 100755
index ff7ad67..0000000
--- a/fence/agents/bladecenter/fence_bladecenter.py
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/usr/bin/python
-
-##
-## Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
-##
-## The Following Agent Has Been Tested On:
-##
-##  Model                 Firmware
-## +--------------------+---------------------------+
-## (1) Main application	  BRET85K, rev 16  
-##     Boot ROM           BRBR67D, rev 16
-##     Remote Control     BRRG67D, rev 16
-##
-#####
-
-import sys, re, pexpect
-sys.path.append("/usr/lib/fence")
-from fencing import *
-
-#BEGIN_VERSION_GENERATION
-FENCE_RELEASE_NAME=""
-REDHAT_COPYRIGHT=""
-BUILD_DATE=""
-#END_VERSION_GENERATION
-
-def get_power_status(conn, options):
-	try:
-		node_cmd = "system:blade\[" + options["-n"] + "\]>"
-
-		conn.send("env -T system:blade[" + options["-n"] + "]\r\n")
-		conn.log_expect(options, node_cmd, SHELL_TIMEOUT)
-		conn.send("power -state\r\n")
-		conn.log_expect(options, node_cmd, SHELL_TIMEOUT)
-		status = conn.before.splitlines()[-1]
-		conn.send("env -T system\r\n")
-		conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
-	except pexpect.EOF:
-		fail(EC_CONNECTION_LOST)
-	except pexpect.TIMEOUT:
-		fail(EC_TIMED_OUT)
-
-	return status.lower().strip()
-
-def set_power_status(conn, options):
-	action = {
-		'on' : "powerup",
-		'off': "powerdown"
-	}[options["-o"]]
-
-	try:
-		node_cmd = "system:blade\[" + options["-n"] + "\]>"
-
-		conn.send("env -T system:blade[" + options["-n"] + "]\r\n")
-		conn.log_expect(options, node_cmd, SHELL_TIMEOUT)
-		conn.send("power -"+options["-o"]+"\r\n")
-		conn.log_expect(options, node_cmd, SHELL_TIMEOUT)
-		conn.send("env -T system\r\n")
-		conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
-	except pexpect.EOF:
-		fail(EC_CONNECTION_LOST)
-	except pexpect.TIMEOUT:
-		fail(EC_TIMED_OUT)
-
-def main():
-	device_opt = [  "help", "version", "agent", "quiet", "verbose", "debug",
-			"action", "ipaddr", "login", "passwd", "passwd_script",
-			"cmd_prompt", "secure", "port", "identity_file" ]
-
-	options = check_input(device_opt, process_input(device_opt))
-
-	## 
-	## Fence agent specific defaults
-	#####
-	if 0 == options.has_key("-c"):
-		options["-c"] = "system>"
-
-	##
-	## Operate the fencing device
-	######
-	conn = fence_login(options)
-	fence_action(conn, options, set_power_status, get_power_status)
-
-	##
-	## Logout from system
-	######
-	conn.send("exit\r\n")
-	conn.close()
-
-if __name__ == "__main__":
-	main()
diff --git a/fence/agents/drac/Makefile b/fence/agents/drac/Makefile
index 914d2c9..258f5ff 100644
--- a/fence/agents/drac/Makefile
+++ b/fence/agents/drac/Makefile
@@ -11,38 +11,25 @@
 ###############################################################################
 ###############################################################################
 
-SOURCE1= fence_drac.pl
-TARGET1= fence_drac
-
-SOURCE2= fence_drac5.py
-TARGET2= fence_drac5
+SOURCE= fence_drac.pl
+TARGET= fence_drac
 
 top_srcdir=../..
 include ${top_srcdir}/make/defines.mk
 
-all: $(TARGET1) $(TARGET2)
+all: $(TARGET)
 
 fence_drac: fence_drac.pl
-	: > $(TARGET1)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE1) >> $(TARGET1)
-	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET1)
-	${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET1)
-	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET1)
-	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE1) >> $(TARGET1)
-	chmod +x $(TARGET1)
-
-fence_drac5: fence_drac5.py
-	: > $(TARGET2)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE2) >> $(TARGET2)
-	echo "FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET2)
-	${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf sh REDHAT_COPYRIGHT >> $(TARGET2)
-	echo "BUILD_DATE=\"(built `date`)\";" >> $(TARGET2)
-	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE2) >> $(TARGET2)
-	chmod +x $(TARGET2)
+	: > $(TARGET)
+	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
+	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
+	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
+	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
+	chmod +x $(TARGET)
 
-copytobin: ${TARGET1} ${TARGET2}
-	cp ${TARGET1} ${top_srcdir}/bin/${TARGET1}
-	cp ${TARGET2} ${top_srcdir}/bin/${TARGET2}
+copytobin: ${TARGET}
+	cp ${TARGET} ${top_srcdir}/bin/${TARGET}
 
 clean:
-	rm -f $(TARGET1) $(TARGET2)
+	rm -f $(TARGET)
diff --git a/fence/agents/drac/fence_drac5.py b/fence/agents/drac/fence_drac5.py
deleted file mode 100755
index 12cd5f7..0000000
--- a/fence/agents/drac/fence_drac5.py
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/usr/bin/python
-
-##
-## Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
-##
-## The Following Agent Has Been Tested On:
-##
-##  DRAC Version       Firmware
-## +-----------------+---------------------------+
-##  DRAC 5             1.0  (Build 06.05.12)
-##  DRAC 5             1.21 (Build 07.05.04)
-##
-## @note: drac_version, modulename were removed
-#####
-
-import sys, re, pexpect
-sys.path.append("/usr/lib/fence")
-from fencing import *
-
-#BEGIN_VERSION_GENERATION
-FENCE_RELEASE_NAME=""
-REDHAT_COPYRIGHT=""
-BUILD_DATE=""
-#END_VERSION_GENERATION
-
-def get_power_status(conn, options):
-	try:
-		conn.sendline("racadm serveraction powerstatus")
-		conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
-	except pexpect.EOF:
-		fail(EC_CONNECTION_LOST)
-	except pexpect.TIMEOUT:
-		fail(EC_TIMED_OUT)
-				
-	status = re.compile("Server power status: (.*)", re.IGNORECASE).search(conn.before).group(1)
-	return status.lower().strip()
-
-def set_power_status(conn, options):
-	action = {
-		'on' : "powerup",
-		'off': "powerdown"
-	}[options["-o"]]
-
-	try:
-		conn.sendline("racadm serveraction " + action)
-		conn.log_expect(options, options["-c"], POWER_TIMEOUT)
-	except pexpect.EOF:
-		fail(EC_CONNECTION_LOST)
-	except pexpect.TIMEOUT:
-		fail(EC_TIMED_OUT)
-
-def main():
-	device_opt = [  "help", "version", "agent", "quiet", "verbose", "debug",
-			"action", "ipaddr", "login", "passwd", "passwd_script",
-			"cmd_prompt", "secure",
-			"drac_version", "module_name" ]
-
-	options = check_input(device_opt, process_input(device_opt))
-
-	## 
-	## Fence agent specific defaults
-	#####
-	if 0 == options.has_key("-c"):
-		options["-c"] = "\$"
-
-	##
-	## Operate the fencing device
-	######
-	conn = fence_login(options)
-	fence_action(conn, options, set_power_status, get_power_status)
-
-	##
-	## Logout from system
-	######
-	conn.sendline("exit")
-	conn.close()
-
-if __name__ == "__main__":
-	main()
diff --git a/fence/agents/ilo/Makefile b/fence/agents/ilo/Makefile
index 794eb13..4ea4299 100644
--- a/fence/agents/ilo/Makefile
+++ b/fence/agents/ilo/Makefile
@@ -11,7 +11,7 @@
 ###############################################################################
 ###############################################################################
 
-SOURCE= fence_ilo.py
+SOURCE= fence_ilo.pl
 TARGET= fence_ilo
 
 top_srcdir=../..
@@ -22,9 +22,9 @@ all: $(TARGET)
 fence_ilo: $(SOURCE)
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
-	echo "FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
-	${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf sh REDHAT_COPYRIGHT >> $(TARGET)
-	echo "BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
+	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
+	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
 	chmod +x $(TARGET)
 
diff --git a/fence/agents/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py
deleted file mode 100755
index 740add5..0000000
--- a/fence/agents/ilo/fence_ilo.py
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/python
-
-##
-## Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
-##
-## The Following Agent Has Been Tested On:
-##
-##  iLO Version       
-## +---------------------------------------------+
-##  iLO Advanced 1.91 
-##
-## @note: We can't use conn.sendline because we need to send CR/LF
-#####
-
-import sys, re, pexpect
-sys.path.append("/usr/lib/fence")
-from fencing import *
-
-#BEGIN_VERSION_GENERATION
-FENCE_RELEASE_NAME=""
-REDHAT_COPYRIGHT=""
-BUILD_DATE=""
-#END_VERSION_GENERATION
-
-def get_power_status(conn, options):
-	try:
-		conn.send("POWER\r\n")
-		conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
-	except pexpect.EOF:
-		fail(EC_CONNECTION_LOST)
-	except pexpect.TIMEOUT:
-		fail(EC_TIMED_OUT)
-				
-	status = re.compile("server power is currently: (.*)", re.IGNORECASE).search(conn.before).group(1)
-	return status.lower().strip()
-
-def set_power_status(conn, options):
-	action = {
-		'on' : "powerup",
-		'off': "powerdown"
-	}[options["-o"]]
-
-	try:
-		conn.send("power " + options["-o"] + "\r\n")
-		conn.log_expect(options, options["-c"], POWER_TIMEOUT)
-	except pexpect.EOF:
-		fail(EC_CONNECTION_LOST)
-	except pexpect.TIMEOUT:
-		fail(EC_TIMED_OUT)
-
-def main():
-	device_opt = [  "help", "version", "agent", "quiet", "verbose", "debug",
-			"action", "ipaddr", "login", "passwd", "passwd_script",
-			"secure", "ribcl" ]
-
-	options = check_input(device_opt, process_input(device_opt))
-
-	## 
-	## Fence agent specific defaults
-	#####
-	if 0 == options.has_key("-c"):
-		options["-c"] = "</>hpiLO->"
-
-	##
-	## Operate the fencing device
-	####
-	conn = fence_login(options)
-	fence_action(conn, options, set_power_status, get_power_status)
-
-	##
-	## Logout from system
-	######
-	conn.send("quit\r\n")
-	conn.close()
-
-if __name__ == "__main__":
-	main()
diff --git a/fence/agents/lib/Makefile b/fence/agents/lib/Makefile
deleted file mode 100644
index d27454d..0000000
--- a/fence/agents/lib/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-###############################################################################
-###############################################################################
-##
-##  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.
-##  Copyright (C) 2004 Red Hat, Inc.  All rights reserved.
-##  
-##  This copyrighted material is made available to anyone wishing to use,
-##  modify, copy, or redistribute it subject to the terms and conditions
-##  of the GNU General Public License v.2.
-##
-###############################################################################
-###############################################################################
-
-SOURCE= fencing.py.py
-TARGET= fencing.py
-
-top_srcdir=../..
-include ${top_srcdir}/make/defines.mk
-
-all: $(TARGET)
-
-$(TARGET): $(SOURCE)
-	: > $(TARGET)
-	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
-	echo "FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
-	${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf sh REDHAT_COPYRIGHT >> $(TARGET)
-	echo "BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
-	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
-	chmod +x $(TARGET)
-
-copytobin: ${TARGET}
-	cp ${TARGET} ${top_srcdir}/bin/${TARGET}
-
-clean:
-	rm -f $(TARGET)
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
deleted file mode 100644
index b58d9d8..0000000
--- a/fence/agents/lib/fencing.py.py
+++ /dev/null
@@ -1,378 +0,0 @@
-#!/usr/bin/python
-
-##
-## Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
-##
-#####
-import sys, getopt, time, os
-import pexpect, re
-import telnetlib
-
-## do not add code here.
-#BEGIN_VERSION_GENERATION
-FENCE_RELEASE_NAME=""
-REDHAT_COPYRIGHT=""
-BUILD_DATE=""
-#END_VERSION_GENERATION
-
-POWER_TIMEOUT = 20
-SHELL_TIMEOUT = 3
-LOGIN_TIMEOUT = 5
-
-LOG_MODE_VERBOSE = 100
-LOG_MODE_QUIET = 0
-
-EC_BAD_ARGS        = 2
-EC_LOGIN_DENIED    = 3
-EC_CONNECTION_LOST = 4
-EC_TIMED_OUT       = 5
-EC_WAITING_ON      = 6
-EC_WAITING_OFF     = 7
-
-all_opt = {
-	"help"    : {
-		"getopt" : "h",
-		"help" : "-h             Display this help and exit",
-		"order" : 54 },
-	"version" : { 
-		"getopt" : "V",
-		"help" : "-V             Output version information and exit",
-		"order" : 53 },
-	"quiet"   : {
-		"getopt" : "q",
-		"help" : "-q             Quiet mode",
-		"order" : 50 },
-	"verbose" : {
-		"getopt" : "v",
-		"help" : "-v             Verbose mode",
-		"order" : 51 },
-	"debug" : {
-		"getopt" : "D:",
-		"help" : "-D <debugfile> Debugging to output file",
-		"order" : 52 },
-	"agent"   : {
-		"getopt" : "",
-		"help" : "",
-		"order" : 1 },
-	"action" : {
-		"getopt" : "o:",
-		"help" : "-o <action>    Action: status, reboot (default), off or on",
-		"order" : 1 },
-	"ipaddr" : {
-		"getopt" : "a:",
-		"help" : "-a <ip>        IP address or hostname of fencing device",
-		"order" : 1 },
-	"login" : {
-		"getopt" : "l:",
-		"help" : "-l <name>      Login name",
-		"order" : 1 },
-	"no_login" : {
-		"getopt" : "",
-		"help" : "",
-		"order" : 1 },
-	"passwd" : {
-		"getopt" : "p:",
-		"help" : "-p <password>  Login password or passphrase",
-		"order" : 1 },
-	"passwd_script" : {
-		"getopt" : "S:",
-		"help" : "-S <script>    Script to run to retrieve password",
-		"order" : 1 },
-	"identity_file" : {
-		"getopt" : "k:",
-		"help" : "-k <filename>  Identity file (private key) for ssh ",
-		"order" : 1 },
-	"module_name" : {
-		"getopt" : "m:",
-		"help" : "-m <module>    DRAC/MC module name",
-		"order" : 1 },
-	"drac_version" : {
-		"getopt" : "d:",
-		"help" : "-D <version>   Force DRAC version to use",
-		"order" : 1 },
-	"ribcl" : {
-		"getopt" : "r:",
-		"help" : "-r <version>   Force ribcl version to use",
-		"order" : 1 },
-	"cmd_prompt" : {
-		"getopt" : "c:",
-		"help" : "-c <prompt>    Force command prompt",
-		"order" : 1 },
-	"secure" : {
-		"getopt" : "x",
-		"help" : "-x             Use ssh connection",
-		"order" : 1 },
-	"port" : {
-		"getopt" : "n:",
-		"help" : "-n <id>        Physical plug number on device",
-		"order" : 1 },
-	"switch" : {
-		"getopt" : "s:",
-		"help" : "-s <id>        Physical switch number on device",
-		"order" : 1 },
-	"test" : {
-		"getopt" : "T",
-		"help" : "",
-		"order" : 1,
-		"obsolete" : "use -o status instead" }
-}
-
-class fspawn(pexpect.spawn):
-	def log_expect(self, options, pattern, timeout):
-		result = self.expect(pattern, timeout)
-		if options["log"] >= LOG_MODE_VERBOSE:
-			options["debug_fh"].write(self.before + self.after)
-		return result
-
-def version(command, release, build_date, copyright):
-	print command, " ", release, " ", build_date;
-	if len(copyright) > 0:
-		print copyright
-
-def fail_usage(message = ""):
-	if len(message) > 0:
-		sys.stderr.write(message+"\n")
-	sys.stderr.write("Please use '-h' for usage\n")
-	sys.exit(EC_BAD_ARGS)
-
-def fail(error_code):
-	message = {
-		EC_LOGIN_DENIED : "Unable to connect/login to fencing device",
-		EC_CONNECTION_LOST : "Connection lost",
-		EC_TIMED_OUT : "Connection timed out",
-		EC_WAITING_ON : "Failed: Timed out waiting to power ON",
-		EC_WAITING_OFF : "Failed: Timed out waiting to power OFF"
-	}[error_code] + "\n"
-	sys.stderr.write(message)
-	sys.exit(error_code)
-
-def usage(avail_opt):
-	global all_opt
-
-	print "Usage:"
-	print "\t" + os.path.basename(sys.argv[0]) + " [options]"
-	print "Options:"
-
-	sorted_list = [ (key, all_opt[key]) for key in avail_opt ]
-	sorted_list.sort(lambda x, y: cmp(x[1]["order"], y[1]["order"]))
-
-	for key, value in sorted_list:
-		if len(value["help"]) != 0:
-			print "   " + value["help"]
-
-def process_input(avail_opt):
-	global all_opt
-
-	##
-	## Set standard environment
-	#####
-	os.unsetenv("LANG")
-
-	##
-	## Prepare list of options for getopt
-	#####
-	getopt_string = ""
-	for k in avail_opt:
-		if all_opt.has_key(k):
-			getopt_string += all_opt[k]["getopt"]
-		else:
-			fail_usage("Parse error: unknown option '"+k+"'");
-
-	##
-	## Read options from command line or standard input
-	#####
-	if len(sys.argv) > 1:
-		try:
-			opt, args = getopt.gnu_getopt(sys.argv[1:], getopt_string)
-		except getopt.GetoptError, error:
-			fail_usage("Parse error: " + error.msg)
-
-		## Compatibility Layer
-		#####
-		z = dict(opt)
-		if z.has_key("-T") == 1:
-			z["-o"] = "status"
-
-		opt = z
-		##
-		#####
-	else:
-		opt = { }
-		name = ""
-		for line in sys.stdin.readlines():
-			line = line.strip()
-			if ((line.startswith("#")) or (len(line) == 0)): pass
-
-			(name, value) = (line + "=").split("=", 1)
-			value = value[:-1]
-
-			## Compatibility Layer
-			######
-			if name == "blade":
-				name = "port"
-			elif name == "option":
-				name = "action"
-			elif name == "fm":
-				name = "port"
-			elif name == "hostname":
-				name = "ipaddr"
-
-			##
-			######
-			if avail_opt.count(name) == 0:
-				fail_usage("Parse error: Unknown option '"+line+"'")
-
-			if all_opt[name]["getopt"].endswith(":"):
-				opt["-"+all_opt[name]["getopt"].rstrip(":")] = value
-			elif ((value == "1") or (value.lower() == "yes")):
-				opt["-"+all_opt[name]["getopt"]] = "1"
-	return opt
-
-##
-## This function checks input and answers if we want to have same answers 
-## in each of the fencing agents. It looks for possible errors and run
-## password script to set a correct password
-######
-def check_input(device_opt, opt):
-	options = dict(opt)
-
-	if options.has_key("-h"): 
-		usage(device_opt)
-		sys.exit(0)
-
-	if options.has_key("-V"):
-		print FENCE_RELEASE_NAME, BUILD_DATE
-		print REDHAT_COPYRIGHT
-		sys.exit(0)
-
-	if options.has_key("-v"):
-		options["log"] = LOG_MODE_VERBOSE
-	else:
-		options["log"] = LOG_MODE_QUIET
-
-	if 0 == options.has_key("-o"):
-		options["-o"] = "reboot"
-
-	if 0 == ["on", "off", "reboot", "status"].count(options["-o"].lower()):
-		fail_usage("Failed: Unrecognised action '" + options["-o"] + "'")
-
-	if (0 == options.has_key("-l")) and device_opt.count("login") and (device_opt.count("no_login") == 0):
-		fail_usage("Failed: You have to set login name")
-
-	if 0 == options.has_key("-a"):
-		fail_usage("Failed: You have to enter fence address")
-
-	if 0 == device_opt.count("identity_file"):
-		if 0 == (options.has_key("-p") or options.has_key("-S")):
-			fail_usage("Failed: You have to enter password or password script")
-	else: 
-		if 0 == (options.has_key("-p") or options.has_key("-S") or options.has_key("-k")):
-			fail_usage("Failed: You have to enter password, password script or identity file")
-
-	if 0 == options.has_key("-x") and 1 == options.has_key("-k"):
-		fail_usage("Failed: You have to use identity file together with ssh connection (-x)")
-
-	if 1 == options.has_key("-k"):
-		if 0 == os.path.isfile(options["-k"]):
-			fail_usage("Failed: Identity file " + options["-k"] + " does not exist")
-
-	if (0 == options.has_key("-n")) and (device_opt.count("port")):
-		fail_usage("Failed: You have to enter plug number")
-
-	if options.has_key("-S"):
-		options["-p"] = os.popen(options["-S"]).read().rstrip()
-
-	if options.has_key("-D"):
-		try:
-			options["debug_fh"] = file (options["-D"], "w")
-		except IOError:
-			fail_usage("Failed: Unable to create file "+options["-D"])
-
-	if options.has_key("-v") and options.has_key("debug_fh") == 0:
-		options["debug_fh"] = sys.stderr
-
-	return options
-	
-def wait_power_status(tn, options, get_power_fn):
-	for x in range(POWER_TIMEOUT):
-		if get_power_fn(tn, options) != options["-o"]:
-			time.sleep(1)
-		else:
-			return 1
-	return 0
-
-def fence_action(tn, options, set_power_fn, get_power_fn):
-	status = get_power_fn(tn, options)
-
-	if options["-o"] == "on":
-		if status == "on":
-			print "Success: Already ON"
-		else:
-			set_power_fn(tn, options)
-			if wait_power_status(tn, options, get_power_fn):
-				print "Success: Powered ON"
-			else:
-				fail(EC_WAITING_ON)
-	elif options["-o"] == "off":
-		if status == "off":
-			print "Success: Already OFF"
-		else:
-			set_power_fn(tn, options)
-			if wait_power_status(tn, options, get_power_fn):
-				print "Success: Powered OFF"
-			else:
-				fail(EC_WAITING_OFF)
-	elif options["-o"] == "reboot":
-		if status != "off":
-			options["-o"] = "off"
-			set_power_fn(tn, options)
-			if wait_power_status(tn, options, get_power_fn) == 0:
-				fail(EC_WAITING_OFF)
-		options["-o"] = "on"
-		set_power_fn(tn, options)
-		if wait_power_status(tn, options, get_power_fn) == 0:
-			fail(EC_WAITING_ON)
-		print "Success: Rebooted"
-	elif options["-o"] == "status":
-		print "Status: " + status.upper()
-
-def fence_login(options):
-	try:
-		re_login = re.compile("(login: )|(Login Name:  )|(username: )|(User Name :)", re.IGNORECASE)
-		re_pass  = re.compile("password", re.IGNORECASE)
-
-		if options.has_key("-x") and 0 == options.has_key("-k"):
-			command = 'ssh ' + options["-l"] + "@" + options["-a"]
-			if options.has_key("ssh_options"):
-				command += ' ' + options["ssh_options"]
-			conn = fspawn (command)
-			result = conn.log_expect(options, [ "ssword:", "Are you sure you want to continue connecting (yes/no)?" ], LOGIN_TIMEOUT)
-			if result == 1:
-				conn.sendline("yes")
-				conn.log_expect(options, "ssword:", SHELL_TIMEOUT)
-			conn.sendline(options["-p"])
-			conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
-		elif options.has_key("-x") and 1 == options.has_key("-k"):
-			conn = fspawn ('ssh ' + options["-l"] + "@" + options["-a"] + " -i " + options["-k"])
-			result = conn.log_expect(options, [ options["-c"], "Are you sure you want to continue connecting (yes/no)?", "Enter passphrase for key '"+options["-k"]+"':" ], LOGIN_TIMEOUT)
-			if result == 1:
-				conn.sendline("yes")
-				conn.log_expect(options, [ options["-c"], "Enter passphrase for key '"+options["-k"]+"':"] , SHELL_TIMEOUT)
-			if result != 0:
-				if options.has_key("-p"):
-					conn.sendline(options["-p"])
-					conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
-				else:
-					fail_usage("Failed: You have to enter passphrase (-p) for identity file")
-		else:
-			conn = fspawn ('telnet ' + options["-a"])
-			conn.log_expect(options, re_login, LOGIN_TIMEOUT)
-			conn.send(options["-l"]+"\r\n")
-			conn.log_expect(options, re_pass, SHELL_TIMEOUT)
-			conn.send(options["-p"]+"\r\n")
-			conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
-	except pexpect.EOF:
-		fail(EC_LOGIN_DENIED) 
-	except pexpect.TIMEOUT:
-		fail(EC_LOGIN_DENIED)
-	return conn
diff --git a/fence/agents/wti/Makefile b/fence/agents/wti/Makefile
index 50d6672..2a47d4b 100644
--- a/fence/agents/wti/Makefile
+++ b/fence/agents/wti/Makefile
@@ -11,7 +11,7 @@
 ###############################################################################
 ###############################################################################
 
-SOURCE= fence_wti.py
+SOURCE= fence_wti.pl
 TARGET= fence_wti
 
 top_srcdir=../..
@@ -22,9 +22,9 @@ all: $(TARGET)
 $(TARGET): $(SOURCE)
 	: > $(TARGET)
 	awk "{print}(\$$1 ~ /#BEGIN_VERSION_GENERATION/){exit 0}" $(SOURCE) >> $(TARGET)
-	echo "FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
-	${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf sh REDHAT_COPYRIGHT >> $(TARGET)
-	echo "BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
+	echo "\$$FENCE_RELEASE_NAME=\"${RELEASE}\";" >> $(TARGET)
+	${top_srcdir}/scripts/define2var ${top_srcdir}/config/copyright.cf perl REDHAT_COPYRIGHT >> $(TARGET)
+	echo "\$$BUILD_DATE=\"(built `date`)\";" >> $(TARGET)
 	awk -v p=0 "(\$$1 ~ /#END_VERSION_GENERATION/){p = 1} {if(p==1)print}" $(SOURCE) >> $(TARGET)
 	chmod +x $(TARGET)
 
diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py
deleted file mode 100755
index bbfc7e5..0000000
--- a/fence/agents/wti/fence_wti.py
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/bin/python
-
-##
-## Copyright (C) 2008 Red Hat, Inc. All Rights Reserved.
-##
-## The Following Agent Has Been Tested On:
-##
-##  Version            Firmware
-## +-----------------+---------------------------+
-##  WTI RSM-8R4         ?? unable to find out ??
-##  WTI MPC-??? 	?? unable to find out ??
-##  WTI IPS-800-CE     v1.40h		(no username)
-#####
-
-import sys, re, pexpect
-sys.path.append("/usr/lib/fence")
-from fencing import *
-
-#BEGIN_VERSION_GENERATION
-FENCE_RELEASE_NAME=""
-REDHAT_COPYRIGHT=""
-BUILD_DATE=""
-#END_VERSION_GENERATION
-
-def get_power_status(conn, options):
-	try:
-		conn.send("/S"+"\r\n")
-		conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
-	except pexpect.EOF:
-		fail(EC_CONNECTION_LOST)
-	except pexpect.TIMEOUT:
-		fail(EC_TIMED_OUT)
-	
-	plug_section = 0
-	for line in conn.before.splitlines():
-		if (plug_section == 2) and line.find("|") >= 0:
-			plug_line = [x.strip().lower() for x in line.split("|")]
-			if len(plug_line) < len(plug_header):
-				plug_section = -1
-				pass
-			if options["-n"].lower() == plug_line[plug_index]:
-				return plug_line[status_index]
-		elif (plug_section == 1):
-			plug_section = 2
-			pass
-		elif (line.upper().startswith("PLUG")):
-			plug_section = 1
-			plug_header = [x.strip().lower() for x in line.split("|")]
-			plug_index = plug_header.index("plug")
-			status_index = plug_header.index("status")
-
-	return "PROBLEM"
-
-def set_power_status(conn, options):
-	action = {
-		'on' : "/on",
-		'off': "/off"
-	}[options["-o"]]
-
-	try:
-		conn.send(action + " " + options["-n"] + ",y\r\n")
-		conn.log_expect(options, options["-c"], POWER_TIMEOUT)
-	except pexpect.EOF:
-		fail(EC_CONNECTION_LOST)
-	except pexpect.TIMEOUT:
-		fail(EC_TIMED_OUT)
-
-def main():
-	device_opt = [  "help", "version", "agent", "quiet", "verbose", "debug",
-			"action", "ipaddr", "login", "passwd", "passwd_script",
-			"cmd_prompt", "secure", "port", "no_login", "test" ]
-
-	options = check_input(device_opt, process_input(device_opt))
-
-	## 
-	## Fence agent specific defaults
-	#####
-	if 0 == options.has_key("-c"):
-		options["-c"] = [ "RSM>", "MPC>", "IPS>" ]
-
-	##
-	## Operate the fencing device
-	##
-	## @note: if there is not a login name then we assume that it is WTI-IPS
-	##        where no login name is used
-	#####	
-	if (0 == options.has_key("-l")):
-		try:
-			conn = fspawn ('telnet ' + options["-a"])
-			conn.log_expect(options, "Password: ", SHELL_TIMEOUT)
-			conn.send(options["-p"]+"\r\n")
-			conn.log_expect(options, options["-c"], SHELL_TIMEOUT)
-		except pexpect.EOF:
-			fail(EC_LOGIN_DENIED) 
-		except pexpect.TIMEOUT:
-			fail(EC_LOGIN_DENIED)		
-	else:
-		conn = fence_login(options)
-
-	fence_action(conn, options, set_power_status, get_power_status)
-
-	##
-	## Logout from system
-	######
-	conn.send("/X"+"\r\n")
-	conn.close()
-
-if __name__ == "__main__":
-	main()
diff --git a/fence/bin/Makefile b/fence/bin/Makefile
index b6b9f9c..68bf9a7 100644
--- a/fence/bin/Makefile
+++ b/fence/bin/Makefile
@@ -25,7 +25,6 @@ SBINPROGS= \
 	fence_baytech \
 	fence_brocade \
 	fence_drac \
-	fence_drac5 \
 	fence_egenera \
 	fence_ilo \
 	fence_manual \
@@ -47,8 +46,6 @@ SHAREPROGS = \
 	     powernet369.mib \
 	     README_SNMP
 
-FENCEPYLIB = \
-	     fencing.py
 
 include ${top_srcdir}/make/defines.mk
 
@@ -73,13 +70,7 @@ install: all
 	for v in ${SHAREPROGS}; do \
 		install -m644 $${v} ${sharedir}; \
 	done
-	if [ ! -d ${DESTDIR}/usr/lib/fence ]; then \
-		install -d ${DESTDIR}/usr/lib/fence; \
-	fi
-	for v in ${FENCEPYLIB}; do \
-		install -m644 $${v} ${DESTDIR}/usr/lib/fence; \
-	done
 
 uninstall:
 	${UNINSTALL} ${SBINPROGS} ${sbindir}
-	${UNINSTALL} ${FENCEPYLIB} ${DESTDIR}/usr/lib/fence
+


hooks/post-receive
--
Cluster Project


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]