Gitweb:
http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=ca652f...
Commit: ca652f4da2d9319c2b04000531745873613f4b2e
Parent: aad5c7524d6842e7a276c7d75044ccfe86646b4c
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Wed Aug 28 14:17:04 2013 +0200
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Wed Aug 28 14:17:04 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 | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/fence/agents/bladecenter/fence_bladecenter.py
b/fence/agents/bladecenter/fence_bladecenter.py
index 958ceb0..09f4a86 100644
--- a/fence/agents/bladecenter/fence_bladecenter.py
+++ b/fence/agents/bladecenter/fence_bladecenter.py
@@ -123,7 +123,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 0316b58..1de9a15 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -861,7 +861,7 @@ def fence_action(tn, options, set_power_fn, get_power_fn,
get_outlet_list = None
return result
-def fence_login(options):
+def fence_login(options, re_login_string = "(login\s*: )|(Login Name: )|(username:
)|(User Name :)"):
force_ipvx=""
if (options.has_key("-6")):
@@ -879,7 +879,6 @@ def fence_login(options):
time.sleep(int(options["-f"]))
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)