From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6200 invoked by alias); 6 May 2008 15:03:11 -0000 Received: (qmail 6159 invoked by uid 9650); 6 May 2008 15:03:11 -0000 Date: Tue, 06 May 2008 15:03:00 -0000 Message-ID: <20080506150311.6143.qmail@sourceware.org> From: mgrac@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, RHEL4, updated. gfs-kernel_2_6_9_76-53-gb5ab5af X-Git-Refname: refs/heads/RHEL4 X-Git-Reftype: branch X-Git-Oldrev: 82270e2e03d662a31e7372fa1abfcbd65feb30a7 X-Git-Newrev: b5ab5afac7d6cd8c696b46bacb022ae528d636fe Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q2/txt/msg00249.txt.bz2 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=b5ab5afac7d6cd8c696b46bacb022ae528d636fe The branch, RHEL4 has been updated via b5ab5afac7d6cd8c696b46bacb022ae528d636fe (commit) from 82270e2e03d662a31e7372fa1abfcbd65feb30a7 (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 b5ab5afac7d6cd8c696b46bacb022ae528d636fe Author: Marek 'marx' Grac Date: Tue May 6 16:50:00 2008 +0200 [FENCE] Fix #444615: Support for 24 port APC fencing device Fixed in the new version of python fencing agent. But there was still a problem because there is major change of interface between firmware v2.7.x and v3.5.x. After this patch both types of firmware version should work. ----------------------------------------------------------------------- Summary of changes: fence/agents/apc/fence_apc.py | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py index a588236..e132f10 100755 --- a/fence/agents/apc/fence_apc.py +++ b/fence/agents/apc/fence_apc.py @@ -8,6 +8,7 @@ ## Model Firmware ## +---------------------------------------------+ ## AP7951 AOS v2.7.0, PDU APP v2.7.3 +## AP7941 AOS v3.5.7, PDU APP v3.5.6 ## ## @note: ssh is very slow on AP7951 device ##### @@ -27,7 +28,20 @@ def get_power_status(conn, options): try: conn.send("1\r\n") conn.log_expect(options, options["-c"], SHELL_TIMEOUT) - conn.send("2\r\n") + + version = 0 + if (None == re.compile('.*Outlet Management.*', re.IGNORECASE | re.S).match(conn.before)): + version = 2 + else: + version = 3 + + if version == 2: + conn.send("2\r\n") + else: + conn.send("2\r\n") + conn.log_expect(options, options["-c"], SHELL_TIMEOUT) + conn.send("1\r\n") + while 1 == conn.log_expect(options, [ options["-c"], "Press " ], SHELL_TIMEOUT): result += conn.before conn.send("\r\n") @@ -52,11 +66,27 @@ def set_power_status(conn, options): try: conn.send("1\r\n") conn.log_expect(options, options["-c"], SHELL_TIMEOUT) - conn.send("2\r\n") + + version = 0 + if (None == re.compile('.*Outlet Management.*', re.IGNORECASE | re.S).match(conn.before)): + version = 2 + else: + version = 3 + + if version == 2: + conn.send("2\r\n") + else: + conn.send("2\r\n") + conn.log_expect(options, options["-c"], SHELL_TIMEOUT) + conn.send("1\r\n") + while 1 == conn.log_expect(options, [ options["-c"], "Press " ], SHELL_TIMEOUT): conn.send("\r\n") conn.send(options["-n"]+"\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) conn.send(action+"\r\n") conn.log_expect(options, "Enter 'YES' to continue or to cancel :", SHELL_TIMEOUT) conn.send("YES\r\n") hooks/post-receive -- Cluster Project