fence-agents: master - fence agents: autodetect of EOL in fence agents

[Marek Grác]

Gitweb:       
http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit:        52eee63e2aad2434b996c4c19efe350510a9399b
Parent:        87cbe09e06ce8a5fb578cffe21b3d2137d5f0e17
Author:        Marek 'marx' Grac <mgrac(a)redhat.com&gt;
AuthorDate:    Mon May 21 11:12:41 2012 +0200
Committer:     Marek 'marx' Grac <mgrac(a)redhat.com&gt;
CommitterDate: Mon May 21 11:12:41 2012 +0200

fence agents: autodetect of EOL in fence agents

Fence agents diffes in EOL they accept. EOL \r\n is quite universal but in some cases
it is translated to \n\n what makes login process impossible to complete as it ends like
(capitals are fence agent response)

Login: USER\n
Password: \n

Login: PASSWORD\n

Until now there was a device option that handles that login_eol_lf but we found out that
there are few
APC devices which does not work correctly with \r\n and needs \n. So we have to autodetect
it, this feature was
added to standard library. As it can also helps with common problem when you have to write
exactly
conn.send("message" + "\r\n"). Method conn.sendline("") uses
EOL according to platform, so we have decided to create
new method conn.send_eol("message") which uses correct EOL. We need
conn.sendline in communication with other local
application so we should not reuse it for this purpose.

Resolves: rhbz#810949
---
 fence/agents/alom/fence_alom.py               |    6 ++--
 fence/agents/apc/fence_apc.py                 |   44 ++++++++++++------------
 fence/agents/bladecenter/fence_bladecenter.py |   18 +++++-----
 fence/agents/drac5/fence_drac5.py             |   12 +++---
 fence/agents/ilo_mp/fence_ilo_mp.py           |   12 +++---
 fence/agents/ldom/fence_ldom.py               |   10 +++---
 fence/agents/lib/fencing.py.py                |   43 ++++++++++++++---------
 fence/agents/rsa/fence_rsa.py                 |    6 ++--
 fence/agents/rsb/fence_rsb.py                 |   10 +++---
 fence/agents/sanbox2/fence_sanbox2.py         |   32 +++++++++---------
 fence/agents/wti/fence_wti.py                 |    2 +-
 11 files changed, 102 insertions(+), 93 deletions(-)

diff --git a/fence/agents/alom/fence_alom.py b/fence/agents/alom/fence_alom.py
index 6223608..a964be5 100644
--- a/fence/agents/alom/fence_alom.py
+++ b/fence/agents/alom/fence_alom.py
@@ -18,7 +18,7 @@ BUILD_DATE=""
 def get_power_status(conn, options):
 	result = ""
 	try:
-		conn.sendline("showplatform")
+		conn.send_eol("showplatform")
                 conn.log_expect(options, options["-c"],
int(options["-Y"]))
 		status = re.search("standby",conn.before.lower())
 		result=(status!=None and "off" or "on")
@@ -32,7 +32,7 @@ def get_power_status(conn, options):
 def set_power_status(conn, options):
 	try:
 		cmd_line=(options["-o"]=="on" and "poweron" or
"poweroff -f -y")
-		conn.sendline(cmd_line)
+		conn.send_eol(cmd_line)
 		conn.log_expect(options, options["-c"],int(options["-g"]))
 		#Get the machine some time between poweron and poweroff
 		time.sleep(int(options["-g"]))
@@ -73,7 +73,7 @@ agent which can be used with ALOM connected machines."
 
 	# Logout from system
 	try:
-		conn.sendline("logout")
+		conn.send_eol("logout")
 		conn.close()
 	except exceptions.OSError:
 		pass
diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py
index d10dd5f..61463d0 100644
--- a/fence/agents/apc/fence_apc.py
+++ b/fence/agents/apc/fence_apc.py
@@ -28,7 +28,7 @@ def get_power_status(conn, options):
 	exp_result = 0
 	outlets = {}
 	try:
-		conn.send("1\r\n")
+		conn.send_eol("1")
 		conn.log_expect(options, options["-c"], int(options["-Y"]))
 
 		version = 0
@@ -57,15 +57,15 @@ def get_power_status(conn, options):
 		if switch == 0:
 			if version == 2:
 				if admin == 0:
-					conn.send("2\r\n")
+					conn.send_eol("2")
 				else:
-					conn.send("3\r\n")
+					conn.send_eol("3")
 			else:
-				conn.send("2\r\n")
+				conn.send_eol("2")
 				conn.log_expect(options, options["-c"], int(options["-Y"]))
-				conn.send("1\r\n")
+				conn.send_eol("1")
 		else:
-			conn.send(options["-s"]+"\r\n")
+			conn.send_eol(options["-s"])
 			
 		while True:
 			exp_result = conn.log_expect(options, [ options["-c"],  "Press
<ENTER>" ], int(options["-Y"]))
@@ -75,7 +75,7 @@ def get_power_status(conn, options):
 				res = show_re.search(x)
 				if (res != None):
 					outlets[res.group(2)] = (res.group(3), res.group(4))
-			conn.send("\r\n")
+			conn.send_eol("")
 			if exp_result == 0:
 				break
 		conn.send(chr(03))		
@@ -102,7 +102,7 @@ def set_power_status(conn, options):
 	}[options["-o"]]
 
 	try:
-		conn.send("1\r\n")
+		conn.send_eol("1")
 		conn.log_expect(options, options["-c"], int(options["-Y"]))
 
 		version = 0
@@ -137,41 +137,41 @@ def set_power_status(conn, options):
 		if switch == 0:
 			if version == 2:
 				if admin2 == 0:
-					conn.send("2\r\n")
+					conn.send_eol("2")
 				else:
-					conn.send("3\r\n")
+					conn.send_eol("3")
 			else:
-				conn.send("2\r\n")
+				conn.send_eol("2")
 				conn.log_expect(options, options["-c"], int(options["-Y"]))
 				if (None == re.compile('.*2- Outlet Restriction.*', re.IGNORECASE |
re.S).match(conn.before)):
 					admin3 = 0
 				else:
 					admin3 = 1
-				conn.send("1\r\n")
+				conn.send_eol("1")
 		else:
-			conn.send(options["-s"] + "\r\n")
+			conn.send_eol(options["-s"])
 
 		while 1 == conn.log_expect(options, [ options["-c"],  "Press
<ENTER>" ], int(options["-Y"])):
-			conn.send("\r\n")
-		conn.send(options["-n"]+"\r\n")
+			conn.send_eol("")
+		conn.send_eol(options["-n"]+"")
 		conn.log_expect(options, options["-c"], int(options["-Y"]))
 
 		if switch == 0:
 			if admin2 == 1:
-				conn.send("1\r\n")
+				conn.send_eol("1")
 				conn.log_expect(options, options["-c"], int(options["-Y"]))
 			if admin3 == 1:
-				conn.send("1\r\n")
+				conn.send_eol("1")
 				conn.log_expect(options, options["-c"], int(options["-Y"]))
 		else:
-			conn.send("1\r\n")
+			conn.send_eol("1")
 			conn.log_expect(options, options["-c"], int(options["-Y"]))
 			
-		conn.send(action+"\r\n")
+		conn.send_eol(action)
 		conn.log_expect(options, "Enter 'YES' to continue or <ENTER> to
cancel :", int(options["-Y"]))
-		conn.send("YES\r\n")
+		conn.send_eol("YES")
 		conn.log_expect(options, "Press <ENTER> to continue...",
int(options["-Y"]))
-		conn.send("\r\n")
+		conn.send_eol("")
 		conn.log_expect(options, options["-c"], int(options["-Y"]))
 		conn.send(chr(03))
 		conn.log_expect(options, "- Logout", int(options["-Y"]))
@@ -230,7 +230,7 @@ will block any necessary fencing actions."
 	## a problem because everything is checked before.
 	######
 	try:
-		conn.sendline("4")
+		conn.send_eol("4")
 		conn.close()
 	except exceptions.OSError:
 		pass
diff --git a/fence/agents/bladecenter/fence_bladecenter.py
b/fence/agents/bladecenter/fence_bladecenter.py
index c699b75..958ceb0 100644
--- a/fence/agents/bladecenter/fence_bladecenter.py
+++ b/fence/agents/bladecenter/fence_bladecenter.py
@@ -26,7 +26,7 @@ def get_power_status(conn, options):
 	try:
 		node_cmd = "system:blade\[" + options["-n"] + "\]>"
 
-		conn.send("env -T system:blade[" + options["-n"] +
"]\r\n")
+		conn.send_eol("env -T system:blade[" + options["-n"] +
"]")
 		i = conn.log_expect(options, [ node_cmd, "system>" ] ,
int(options["-Y"]))
 		if i == 1:
 			## Given blade number does not exist
@@ -34,10 +34,10 @@ def get_power_status(conn, options):
 				return "off"
 			else:
 				fail(EC_STATUS)
-		conn.send("power -state\r\n")
+		conn.send_eol("power -state")
 		conn.log_expect(options, node_cmd, int(options["-Y"]))
 		status = conn.before.splitlines()[-1]
-		conn.send("env -T system\r\n")
+		conn.send_eol("env -T system")
 		conn.log_expect(options, options["-c"], int(options["-Y"]))
 	except pexpect.EOF:
 		fail(EC_CONNECTION_LOST)
@@ -55,7 +55,7 @@ def set_power_status(conn, options):
 	try:
 		node_cmd = "system:blade\[" + options["-n"] + "\]>"
 
-		conn.send("env -T system:blade[" + options["-n"] +
"]\r\n")
+		conn.send_eol("env -T system:blade[" + options["-n"] +
"]")
 		i = conn.log_expect(options, [ node_cmd, "system>" ] ,
int(options["-Y"]))
 		if i == 1:
 			## Given blade number does not exist
@@ -64,9 +64,9 @@ def set_power_status(conn, options):
 			else:
 				fail(EC_GENERIC_ERROR)
 
-		conn.send("power -"+options["-o"]+"\r\n")
+		conn.send_eol("power -"+options["-o"])
 		conn.log_expect(options, node_cmd, int(options["-Y"]))
-		conn.send("env -T system\r\n")
+		conn.send_eol("env -T system")
 		conn.log_expect(options, options["-c"], int(options["-Y"]))
 	except pexpect.EOF:
 		fail(EC_CONNECTION_LOST)
@@ -78,9 +78,9 @@ def get_blades_list(conn, options):
 	try:
 		node_cmd = "system>"
 
-		conn.send("env -T system\r\n")
+		conn.send_eol("env -T system")
 		conn.log_expect(options, node_cmd, int(options["-Y"]))
-		conn.send("list -l 2\r\n")
+		conn.send_eol("list -l 2")
 		conn.log_expect(options, node_cmd, int(options["-Y"]))
 
 		lines = conn.before.split("\r\n")
@@ -130,7 +130,7 @@ and uses the command line interface to power on and off blades."
 	## Logout from system
 	######
 	try:
-		conn.send("exit\r\n")
+		conn.send_eol("exit")
 		conn.close()
 	except exceptions.OSError:
 		pass
diff --git a/fence/agents/drac5/fence_drac5.py b/fence/agents/drac5/fence_drac5.py
index f3102cd..3e9a8d2 100644
--- a/fence/agents/drac5/fence_drac5.py
+++ b/fence/agents/drac5/fence_drac5.py
@@ -25,9 +25,9 @@ BUILD_DATE="March, 2008"
 def get_power_status(conn, options):
 	try:
 		if options["model"] == "DRAC CMC":
-			conn.sendline("racadm serveraction powerstatus -m " +
options["-m"])
+			conn.send_eol("racadm serveraction powerstatus -m " +
options["-m"])
 		elif options["model"] == "DRAC 5":
-			conn.sendline("racadm serveraction powerstatus")
+			conn.send_eol("racadm serveraction powerstatus")
 		
 		conn.log_expect(options, options["-c"], int(options["-Y"]))
 	except pexpect.EOF:
@@ -49,9 +49,9 @@ def set_power_status(conn, options):
 
 	try:
 		if options["model"] == "DRAC CMC":
-			conn.sendline("racadm serveraction " + action + " -m " +
options["-m"])
+			conn.send_eol("racadm serveraction " + action + " -m " +
options["-m"])
 		elif options["model"] == "DRAC 5":
-			conn.sendline("racadm serveraction " + action)
+			conn.send_eol("racadm serveraction " + action)
 		conn.log_expect(options, options["-c"], int(options["-g"]))
 	except pexpect.EOF:
 		fail(EC_CONNECTION_LOST)
@@ -63,7 +63,7 @@ def get_list_devices(conn, options):
 
 	try:
 		if options["model"] == "DRAC CMC":
-			conn.sendline("getmodinfo")
+			conn.send_eol("getmodinfo")
 
 			list_re = re.compile("^([^\s]*?)\s+Present\s*(ON|OFF)\s*.*$")
 			conn.log_expect(options, options["-c"], int(options["-g"]))
@@ -133,7 +133,7 @@ By default, the telnet interface is not  enabled."
 	## Logout from system
 	######
 	try:
-		conn.sendline("exit")
+		conn.send_eol("exit")
 		time.sleep(1)
 		conn.close()
 	except exceptions.OSError:
diff --git a/fence/agents/ilo_mp/fence_ilo_mp.py b/fence/agents/ilo_mp/fence_ilo_mp.py
index 1618216..3af3048 100644
--- a/fence/agents/ilo_mp/fence_ilo_mp.py
+++ b/fence/agents/ilo_mp/fence_ilo_mp.py
@@ -12,7 +12,7 @@ BUILD_DATE=""
 
 def get_power_status(conn, options):
 	try:
-		conn.send("show /system1\r\n")
+		conn.send_eol("show /system1")
 		
 		re_state = re.compile('EnabledState=(.*)', re.IGNORECASE)
 		conn.log_expect(options, re_state, int(options["-Y"]))
@@ -31,9 +31,9 @@ def get_power_status(conn, options):
 def set_power_status(conn, options):
 	try:
 		if options["-o"] == "on":
-			conn.send("start /system1\r\n")
+			conn.send_eol("start /system1")
 		else:
-			conn.send("stop -f /system1\r\n")
+			conn.send_eol("stop -f /system1")
 
 		conn.log_expect(options, options["-c"], int(options["-g"]))
 
@@ -46,7 +46,7 @@ def set_power_status(conn, options):
 def main():
 	device_opt = [  "help", "version", "agent",
"quiet", "verbose", "debug",
 			"action", "ipaddr", "login", "passwd",
"passwd_script",
-			"secure", "identity_file", "cmd_prompt",
"ipport", "login_eol_lf",
+			"secure", "identity_file", "cmd_prompt",
"ipport",
 			"separator", "inet4_only", "inet6_only",
 			"power_timeout", "shell_timeout", "login_timeout",
"power_wait" ]
 
@@ -64,7 +64,7 @@ def main():
 	show_docs(options, docs)
 	
 	conn = fence_login(options)
-	conn.send("SMCLP\r\n")
+	conn.send_eol("SMCLP")
 
 	##
 	## Fence operations
@@ -72,7 +72,7 @@ def main():
 	result = fence_action(conn, options, set_power_status, get_power_status)
 
 	try:
-		conn.send("exit\r\n")
+		conn.send_eol("exit")
 	except exceptions.OSError:
 		pass
 	except pexpect.ExceptionPexpect:
diff --git a/fence/agents/ldom/fence_ldom.py b/fence/agents/ldom/fence_ldom.py
index 507a97a..c971c04 100644
--- a/fence/agents/ldom/fence_ldom.py
+++ b/fence/agents/ldom/fence_ldom.py
@@ -22,11 +22,11 @@ COMMAND_PROMPT_NEW="[PEXPECT]"
 
 # Start comunicating after login. Prepare good environment.
 def start_communication(conn, options):
-	conn.sendline ("PS1='"+COMMAND_PROMPT_NEW+"'")
+	conn.send_eol ("PS1='"+COMMAND_PROMPT_NEW+"'")
 	res=conn.expect([pexpect.TIMEOUT, COMMAND_PROMPT_REG],int(options["-Y"]))
 	if res==0:
 		#CSH stuff
-		conn.sendline("set prompt='"+COMMAND_PROMPT_NEW+"'")
+		conn.send_eol("set prompt='"+COMMAND_PROMPT_NEW+"'")
 		conn.log_expect(options, COMMAND_PROMPT_REG,int(options["-Y"]))
 	
 
@@ -34,7 +34,7 @@ def get_power_status(conn, options):
 	try:
 		start_communication(conn,options)
 		
-		conn.sendline("ldm ls")
+		conn.send_eol("ldm ls")
 		    
 		conn.log_expect(options,COMMAND_PROMPT_REG,int(options["-Y"]))
 
@@ -71,7 +71,7 @@ def set_power_status(conn, options):
          	
 		cmd_line="ldm "+(options["-o"]=="on" and
"start" or "stop -f")+"
\""+options["-n"]+"\""
             	
-		conn.sendline(cmd_line)
+		conn.send_eol(cmd_line)
 		    
 		conn.log_expect(options,COMMAND_PROMPT_REG,int(options["-g"]))
 		
@@ -126,7 +126,7 @@ root. Than prompt is $, so again, you must use parameter -c."
 	## Logout from system
 	######
 	try:
-		conn.sendline("logout")
+		conn.send_eol("logout")
 		conn.close()
 	except exceptions.OSError:
 		pass
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 5748391..2a62242 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -175,11 +175,6 @@ all_opt = {
 		"required" : "0",
 		"shortdesc" : "Force ribcl version to use",
 		"order" : 1 },
-	"login_eol_lf" : {
-		"getopt" : "",
-		"help" : "",
-		"order" : 1
-		},
 	"cmd_prompt" : {
 		"getopt" : "c:",
 		"longopt" : "command-prompt",
@@ -407,12 +402,20 @@ all_opt = {
 common_opt = [ "retry_on", "delay" ]
 
 class fspawn(pexpect.spawn):
+	def __init__(self, options, command):
+		pexpect.spawn.__init__(self, command)
+		self.opt = options
+		
 	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
 
+	# send EOL according to what was detected in login process (telnet)
+	def send_eol(self, message):
+		self.send(message + self.opt["eol"])
+
 def atexit_handler():
 	try:
 		sys.stdout.close()
@@ -864,10 +867,7 @@ def fence_login(options):
 	if (options.has_key("-4")):
 		force_ipvx="-4 "
 
-	if (options["device_opt"].count("login_eol_lf")):
-		login_eol = "\n"
-	else:
-		login_eol = "\r\n"
+	options["eol"] = "\r\n"
 
 	## Do the delay of the fence device before logging in
 	## Delay is important for two-node clusters fencing but we do not need to delay
'status' operations
@@ -881,7 +881,7 @@ def fence_login(options):
 		if options.has_key("-z"):
 			command = '%s %s %s %s' % (SSL_PATH, force_ipvx, options["-a"],
options["-u"])
 			try:
-				conn = fspawn(command)
+				conn = fspawn(options, command)
 			except pexpect.ExceptionPexpect, ex:
 			 	## SSL telnet is part of the fencing package
 			 	sys.stderr.write(str(ex) + "\n")
@@ -891,7 +891,7 @@ def fence_login(options):
 			if options.has_key("ssh_options"):
 				command += ' ' + options["ssh_options"]
 			try:
-				conn = fspawn(command)
+				conn = fspawn(options, command)
 			except pexpect.ExceptionPexpect, ex:
 				sys.stderr.write(str(ex) + "\n")
 				sys.stderr.write("Due to limitations, binary dependencies on fence agents
"
@@ -920,7 +920,7 @@ def fence_login(options):
 			if options.has_key("ssh_options"):
 				command += ' ' + options["ssh_options"]
 			try:
-				conn = fspawn(command)
+				conn = fspawn(options, command)
 			except pexpect.ExceptionPexpect, ex:
 				sys.stderr.write(str(ex) + "\n")
 				sys.stderr.write("Due to limitations, binary dependencies on fence agents
"
@@ -939,7 +939,7 @@ def fence_login(options):
 					fail_usage("Failed: You have to enter passphrase (-p) for identity file")
 		else:
 			try:
-				conn = fspawn(TELNET_PATH)
+				conn = fspawn(options, TELNET_PATH)
 				conn.send("set binary\n")
 				conn.send("open %s -%s\n"%(options["-a"],
options["-u"]))
 			except pexpect.ExceptionPexpect, ex:
@@ -948,11 +948,20 @@ def fence_login(options):
 				"are not in the spec file and must be installed separately." +
"\n")
 				sys.exit(EC_GENERIC_ERROR)
 
-			conn.log_expect(options, re_login, int(options["-y"]))
-			conn.send(options["-l"] + login_eol)
-			conn.log_expect(options, re_pass, int(options["-Y"]))
+			result = conn.log_expect(options, re_login, int(options["-y"]))
+			conn.send_eol(options["-l"])
+
+			## automatically change end of line separator
+			screen = conn.read_nonblocking(size=100, timeout=int(options["-Y"]))
+			if (re_login.search(screen) != None):
+				options["eol"] = "\n"
+				conn.send_eol(options["-l"])
+				result = conn.log_expect(options, re_pass, int(options["-y"]))
+			elif (re_pass.search(screen) == None):
+				conn.log_expect(options, re_pass, int(options["-Y"]))
+
 			try:
-				conn.send(options["-p"] + login_eol)
+				conn.send_eol(options["-p"])
 				conn.log_expect(options, options["-c"], int(options["-Y"]))
 			except KeyError:
 				fail(EC_PASSWORD_MISSING)
diff --git a/fence/agents/rsa/fence_rsa.py b/fence/agents/rsa/fence_rsa.py
index 845bddb..e9f87cd 100644
--- a/fence/agents/rsa/fence_rsa.py
+++ b/fence/agents/rsa/fence_rsa.py
@@ -19,7 +19,7 @@ BUILD_DATE=""
 
 def get_power_status(conn, options):
 	try:
-		conn.send("power state\r\n")
+		conn.send_eol("power state")
 		conn.log_expect(options, options["-c"], int(options["-Y"]))
 	except pexpect.EOF:
 		fail(EC_CONNECTION_LOST)
@@ -36,7 +36,7 @@ def get_power_status(conn, options):
 
 def set_power_status(conn, options):
 	try:
-		conn.send("power " + options["-o"] + "\r\n")
+		conn.send_eol("power " + options["-o"])
 		conn.log_expect(options, options["-c"], int(options["-g"]))
 	except pexpect.EOF:
 		fail(EC_CONNECTION_LOST)
@@ -84,7 +84,7 @@ will block any necessary fencing actions."
 	## Logout from system
 	######
 	try:
-		conn.sendline("exit")
+		conn.send_eol("exit")
 		conn.close()
 	except exceptions.OSError:
 		pass
diff --git a/fence/agents/rsb/fence_rsb.py b/fence/agents/rsb/fence_rsb.py
index fe1ec60..7ce1906 100755
--- a/fence/agents/rsb/fence_rsb.py
+++ b/fence/agents/rsb/fence_rsb.py
@@ -33,13 +33,13 @@ def set_power_status(conn, options):
 	try:
 		conn.send("2")
 		conn.log_expect(options, options["-c"], int(options["-Y"]))
-		conn.sendline(action)
+		conn.send_eol(action)
 		conn.log_expect(options, ["want to power off", "'yes' or
'no'"], int(options["-Y"]))
-		conn.send("yes\r")
+		conn.send_eol("yes")
 		conn.log_expect(options, "any key to continue",
int(options["-g"]))
-		conn.send("\r")
+		conn.send_eol("")
 		conn.log_expect(options, options["-c"], int(options["-Y"]))
-		conn.sendline("0")
+		conn.send_eol("0")
 		conn.log_expect(options, options["-c"], int(options["-Y"]))
 	except pexpect.EOF:
 		fail(EC_CONNECTION_LOST)
@@ -100,7 +100,7 @@ will block any necessary fencing actions."
 	## a problem because everything is checked before.
 	######
 	try:
-		conn.sendline("0")
+		conn.send_eol("0")
 		conn.close()
 	except exceptions.OSError:
 		pass
diff --git a/fence/agents/sanbox2/fence_sanbox2.py
b/fence/agents/sanbox2/fence_sanbox2.py
index 47f3bc8..92c5d4a 100644
--- a/fence/agents/sanbox2/fence_sanbox2.py
+++ b/fence/agents/sanbox2/fence_sanbox2.py
@@ -24,14 +24,14 @@ def get_power_status(conn, options):
 		'offline' : "off"
 	}
 	try:
-		conn.send("show port " + options["-n"] + "\n")
+		conn.send_eol("show port " + options["-n"])
 		conn.log_expect(options, options["-c"], int(options["-Y"]))
 	except pexpect.EOF:
 		fail(EC_CONNECTION_LOST)
 	except pexpect.TIMEOUT:
 		try:
-			conn.send("admin end\n")
-			conn.send("exit\n")
+			conn.send_eol("admin end")
+			conn.send_eol("exit")
 			conn.close()
 		except:
 			pass
@@ -51,28 +51,28 @@ def set_power_status(conn, options):
 	}[options["-o"]]
 
         try:
-        	conn.send("set port " + options["-n"] + " state "
+ action + "\n")
+        	conn.send_eol("set port " + options["-n"] + " state
" + action)
 		conn.log_expect(options, options["-c"], int(options["-g"]))
 	except pexpect.EOF:
 		fail(EC_CONNECTION_LOST)
 	except pexpect.TIMEOUT:
 		try:
-			conn.send("admin end\n")
-			conn.send("exit\n")
+			conn.send_eol("admin end")
+			conn.send_eol("exit")
 			conn.close()
 		except:
 			pass
 		fail(EC_TIMED_OUT)                                                                     
   	
 
 	try:
-		conn.send("set port " + options["-n"] + " state " +
action + "\n")
+		conn.send_eol("set port " + options["-n"] + " state " +
action)
 		conn.log_expect(options, options["-c"], int(options["-g"]))
 	except pexpect.EOF:
 		fail(EC_CONNECTION_LOST)
 	except pexpect.TIMEOUT:
 		try:
-			conn.send("admin end\n")
-			conn.send("exit\n")
+			conn.send_eol("admin end")
+			conn.send_eol("exit")
 			conn.close()
 		except:
 			pass
@@ -82,7 +82,7 @@ def get_list_devices(conn, options):
 	outlets = { }
 
 	try:
-		conn.send("show port" + "\n")
+		conn.send_eol("show port")
 		conn.log_expect(options, options["-c"], int(options["-Y"]))
 
 		list_re = re.compile("^\s+(\d+?)\s+(Online|Offline)\s+", re.IGNORECASE)
@@ -98,8 +98,8 @@ def get_list_devices(conn, options):
 		fail(EC_CONNECTION_LOST)
 	except pexpect.TIMEOUT:
 		try:
-			conn.send("admin end\n")
-			conn.send("exit\n")
+			conn.send_eol("admin end")
+			conn.send_eol("exit")
 			conn.close()
 		except:
 			pass
@@ -110,7 +110,7 @@ def get_list_devices(conn, options):
 def main():
 	device_opt = [  "help", "version", "agent",
"quiet", "verbose", "debug",
 			"io_fencing", "ipaddr", "login", "passwd",
"passwd_script",
-			"cmd_prompt", "port", "ipport",
"login_eol_lf", "separator",
+			"cmd_prompt", "port", "ipport", "separator",
 			"power_timeout", "shell_timeout", "login_timeout",
"power_wait" ]
 
 	atexit.register(atexit_handler)
@@ -138,7 +138,7 @@ because the connection will block any necessary fencing
actions."
 	##
 	conn = fence_login(options)
 
-	conn.send("admin start\n")
+	conn.send_eol("admin start")
 	conn.log_expect(options, options["-c"], int(options["-Y"]))
 
 	if (re.search("\(admin\)", conn.before, re.MULTILINE) == None):
@@ -153,8 +153,8 @@ because the connection will block any necessary fencing
actions."
 	## Logout from system
 	######
 	try:
-		conn.send("admin end\n")
-		conn.send("exit\n")
+		conn.send_eol("admin end")
+		conn.send_eol("exit\n")
 		conn.close()
 	except exceptions.OSError:
 		pass
diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py
index 8caa4c2..b7c41f3 100644
--- a/fence/agents/wti/fence_wti.py
+++ b/fence/agents/wti/fence_wti.py
@@ -124,7 +124,7 @@ is running because the connection will block any necessary fencing
actions."
 	if 0 == options.has_key("-x"):
 		try:
 			try:
-				conn = fspawn(TELNET_PATH)
+				conn = fspawn(options, TELNET_PATH)
 				conn.send("set binary\n")
 				conn.send("open %s -%s\n"%(options["-a"],
options["-u"]))
 			except pexpect.ExceptionPexpect, ex: