Gitweb:
http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=d99314...
Commit: d99314f845e4974bfa4868f9608f82fb52baaa5a
Parent: 766e747471acce46b8e3a5fb77a944008ad5a452
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Wed Nov 19 15:36:06 2014 +0100
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Wed Nov 19 15:36:06 2014 +0100
fence_bladecenter: Simplify login process
Previously, unique regular expression was used what could cause problems in
planned autodetection of fence agents.
---
fence/agents/bladecenter/fence_bladecenter.py | 2 +-
fence/agents/lib/fencing.py.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fence/agents/bladecenter/fence_bladecenter.py
b/fence/agents/bladecenter/fence_bladecenter.py
index 9dc71e9..314ced3 100644
--- a/fence/agents/bladecenter/fence_bladecenter.py
+++ b/fence/agents/bladecenter/fence_bladecenter.py
@@ -102,7 +102,7 @@ and uses the command line interface to power on and off blades."
##
## Operate the fencing device
######
- conn = fence_login(options, "(username: )")
+ conn = fence_login(options)
result = fence_action(conn, options, set_power_status, get_power_status,
get_blades_list)
fence_logout(conn, "exit")
sys.exit(result)
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 56c84da..740a4e0 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -1003,7 +1003,7 @@ def fence_action(tn, options, set_power_fn, get_power_fn,
get_outlet_list=None,
return result
-def fence_login(options, re_login_string=r"(login\s*: )|(Login Name: )|(username:
)|(User Name :)"):
+def fence_login(options, re_login_string=r"(login\s*: )|((?!Last )Login Name:
)|(username: )|(User Name :)"):
force_ipvx = ""
if options.has_key("--inet6-only"):