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=e5142bcc8e6135fac357c1398da110d21a27a21e The branch, RHEL4 has been updated via e5142bcc8e6135fac357c1398da110d21a27a21e (commit) via 19afd3bfce41cbc4fa54e468c73a5b6604feb9c4 (commit) via d8dffdf362256dea024f64a8703f401082124f8a (commit) from 59ba19aa6b41cad189af153e27469056206e782d (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 e5142bcc8e6135fac357c1398da110d21a27a21e Author: Marek 'marx' Grac <[EMAIL PROTECTED]> Date: Tue May 13 18:21:44 2008 +0200 [FENCE] Fix typo in name of the exceptions in fencing agents Exceptions should be pexpect.EOF, pexpect.TIMEOUT (not pexcept.*). This problem only occured in set_status(). Function get_status() contains correct exceptions. commit 19afd3bfce41cbc4fa54e468c73a5b6604feb9c4 Author: Marek 'marx' Grac <[EMAIL PROTECTED]> Date: Tue May 13 17:26:56 2008 +0200 [FENCE] Fix problem with different menu for admin/user for APC In APC user/admin can see a different menu and they have to use different sequence of keystrokes to access Outlet Controls. Previously only support for user was provided. commit d8dffdf362256dea024f64a8703f401082124f8a Author: Marek 'marx' Grac <[EMAIL PROTECTED]> Date: Tue May 13 17:00:57 2008 +0200 [FENCE] Fix name of the option in fencing library We were testing for option 'plug_no' but in every other file we have 'port'. ----------------------------------------------------------------------- Summary of changes: fence/agents/apc/fence_apc.py | 30 +++++++++++++++++++++--- fence/agents/bladecenter/fence_bladecenter.py | 4 +- fence/agents/drac/fence_drac5.py | 4 +- fence/agents/ilo/fence_ilo.py | 4 +- fence/agents/lib/fencing.py.py | 2 +- fence/agents/wti/fence_wti.py | 4 +- 6 files changed, 35 insertions(+), 13 deletions(-) diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py index e132f10..5bf74bc 100755 --- a/fence/agents/apc/fence_apc.py +++ b/fence/agents/apc/fence_apc.py @@ -30,13 +30,23 @@ def get_power_status(conn, options): conn.log_expect(options, options["-c"], SHELL_TIMEOUT) version = 0 + admin = 0 + 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 version == 2: - conn.send("2\r\n") + 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) @@ -68,13 +78,22 @@ def set_power_status(conn, options): conn.log_expect(options, options["-c"], SHELL_TIMEOUT) version = 0 + admin = 0 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 version == 2: - conn.send("2\r\n") + 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) @@ -84,6 +103,9 @@ def set_power_status(conn, options): conn.send("\r\n") conn.send(options["-n"]+"\r\n") conn.log_expect(options, options["-c"], SHELL_TIMEOUT) + 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) @@ -96,9 +118,9 @@ def set_power_status(conn, options): conn.send(chr(03)) conn.log_expect(options, "- Logout", SHELL_TIMEOUT) conn.log_expect(options, options["-c"], SHELL_TIMEOUT) - except pexcept.EOF: + except pexpect.EOF: fail(EC_CONNECTION_LOST) - except pexcept.TIMEOUT: + except pexpect.TIMEOUT: fail(EC_TIMED_OUT) def main(): diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py index a3ff651..6670bcb 100755 --- a/fence/agents/bladecenter/fence_bladecenter.py +++ b/fence/agents/bladecenter/fence_bladecenter.py @@ -56,9 +56,9 @@ def set_power_status(conn, options): conn.log_expect(options, node_cmd, SHELL_TIMEOUT) conn.send("env -T system\r\n") conn.log_expect(options, options["-c"], SHELL_TIMEOUT) - except pexcept.EOF: + except pexpect.EOF: fail(EC_CONNECTION_LOST) - except pexcept.TIMEOUT: + except pexpect.TIMEOUT: fail(EC_TIMED_OUT) def main(): diff --git a/fence/agents/drac/fence_drac5.py b/fence/agents/drac/fence_drac5.py index d73b8f0..12cd5f7 100755 --- a/fence/agents/drac/fence_drac5.py +++ b/fence/agents/drac/fence_drac5.py @@ -44,9 +44,9 @@ def set_power_status(conn, options): try: conn.sendline("racadm serveraction " + action) conn.log_expect(options, options["-c"], POWER_TIMEOUT) - except pexcept.EOF: + except pexpect.EOF: fail(EC_CONNECTION_LOST) - except pexcept.TIMEOUT: + except pexpect.TIMEOUT: fail(EC_TIMED_OUT) def main(): diff --git a/fence/agents/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py index 9a0dfbb..740add5 100755 --- a/fence/agents/ilo/fence_ilo.py +++ b/fence/agents/ilo/fence_ilo.py @@ -43,9 +43,9 @@ def set_power_status(conn, options): try: conn.send("power " + options["-o"] + "\r\n") conn.log_expect(options, options["-c"], POWER_TIMEOUT) - except pexcept.EOF: + except pexpect.EOF: fail(EC_CONNECTION_LOST) - except pexcept.TIMEOUT: + except pexpect.TIMEOUT: fail(EC_TIMED_OUT) def main(): diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 647fadc..0ddf173 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -260,7 +260,7 @@ def check_input(device_opt, opt): if 1 == (options.has_key("-p") and options.has_key("-S")): fail_usage("Failed: You have to enter password or password script") - if (0 == options.has_key("-n")) and (device_opt.count("plug_no")): + 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"): diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py index 4bef408..bbfc7e5 100755 --- a/fence/agents/wti/fence_wti.py +++ b/fence/agents/wti/fence_wti.py @@ -60,9 +60,9 @@ def set_power_status(conn, options): try: conn.send(action + " " + options["-n"] + ",y\r\n") conn.log_expect(options, options["-c"], POWER_TIMEOUT) - except pexcept.EOF: + except pexpect.EOF: fail(EC_CONNECTION_LOST) - except pexcept.TIMEOUT: + except pexpect.TIMEOUT: fail(EC_TIMED_OUT) def main(): hooks/post-receive -- Cluster Project
