fence-agents: master - fence_bladecenter: Fix telnet login failure

Marek GrĂ¡c marx at fedoraproject.org
Thu Aug 29 16:32:30 UTC 2013


Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=5d31cbaee51eb77795a3d91dae5da5f3c46c64af
Commit:        5d31cbaee51eb77795a3d91dae5da5f3c46c64af
Parent:        d1baa1ba63f92a00f78ae3c344886dfbc08ca1d5
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Wed Aug 28 14:17:04 2013 +0200
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Thu Aug 29 18:30:11 2013 +0200

fence_bladecenter: Fix telnet login failure

Problem occured due to fact that welcome message contains string which looks like login prompt.

Resolves: rhbz#997416
---
 fence/agents/bladecenter/fence_bladecenter.py |    2 +-
 fence/agents/lib/fencing.py.py                |    5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py
index 43c5076..14a152b 100644
--- a/fence/agents/bladecenter/fence_bladecenter.py
+++ b/fence/agents/bladecenter/fence_bladecenter.py
@@ -100,7 +100,7 @@ and uses the command line interface to power on and off blades."
 	##
 	## Operate the fencing device
 	######
-	conn = fence_login(options)
+	conn = fence_login(options, "(username: )")
 	result = fence_action(conn, options, set_power_status, get_power_status, get_blades_list)
 
 	##
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 097c167..bb144bb 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -892,8 +892,8 @@ def fence_action(tn, options, set_power_fn, get_power_fn, get_outlet_list = None
 	
 	return result
 
-def fence_login(options):
-	force_ipvx = ""
+def fence_login(options, re_login_string = "(login\s*: )|(Login Name:  )|(username: )|(User Name :)"):
+	force_ipvx=""
 
 	if (options.has_key("--inet6-only")):
 		force_ipvx = "-6 "
@@ -913,7 +913,6 @@ def fence_login(options):
 		time.sleep(int(options["--delay"]))
 
 	try:
-		re_login_string = "(login\s*: )|(Login Name:  )|(username: )|(User Name :)"
 		re_login = re.compile(re_login_string, re.IGNORECASE)
 		re_pass  = re.compile("(password)|(pass phrase)", re.IGNORECASE)
 


More information about the cluster-commits mailing list