From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 32114 invoked by alias); 23 Jul 2009 10:29:42 -0000 Received: (qmail 32108 invoked by alias); 23 Jul 2009 10:29:41 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: RHEL5 - fencing: #501586 - fence agents fails with pexpect exception To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/RHEL5 X-Git-Reftype: branch X-Git-Oldrev: f106b915e18e2323f549fbbf0e956c0ee884fb2e X-Git-Newrev: 4d1e5e8187632e150588d5515635b6468f726f83 From: =?utf-8?q?Marek_Gr=C3=A1c?= Message-Id: <20090723102912.276FC120337@lists.fedorahosted.org> Date: Thu, 23 Jul 2009 10:29:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 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: 2009-q3/txt/msg00084.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=4d1e5e8187632e150588d5515635b6468f726f83 Commit: 4d1e5e8187632e150588d5515635b6468f726f83 Parent: f106b915e18e2323f549fbbf0e956c0ee884fb2e Author: Marek Grac AuthorDate: Thu Jul 23 11:32:41 2009 +0200 Committer: Marek Grac CommitterDate: Thu Jul 23 11:32:41 2009 +0200 fencing: #501586 - fence agents fails with pexpect exception Added import exceptions. Fence agent for VMWare was not checked for these exceptions. --- fence/agents/bladecenter/fence_bladecenter.py | 2 +- fence/agents/drac/fence_drac5.py | 2 +- fence/agents/lpar/fence_lpar.py | 2 +- fence/agents/rsa/fence_rsa.py | 2 +- fence/agents/virsh/fence_virsh.py | 2 +- fence/agents/vmware/fence_vmware.py | 11 ++++++++--- fence/agents/wti/fence_wti.py | 2 +- 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py index 5272df3..92b5d06 100755 --- a/fence/agents/bladecenter/fence_bladecenter.py +++ b/fence/agents/bladecenter/fence_bladecenter.py @@ -13,7 +13,7 @@ ## ##### -import sys, re, pexpect +import sys, re, pexpect, exceptions sys.path.append("/usr/lib/fence") from fencing import * diff --git a/fence/agents/drac/fence_drac5.py b/fence/agents/drac/fence_drac5.py index 3b951c0..e50f59a 100755 --- a/fence/agents/drac/fence_drac5.py +++ b/fence/agents/drac/fence_drac5.py @@ -12,7 +12,7 @@ ## @note: drac_version was removed ##### -import sys, re, pexpect +import sys, re, pexpect, exceptions sys.path.append("/usr/lib/fence") from fencing import * diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py index 353ca06..0f76c22 100755 --- a/fence/agents/lpar/fence_lpar.py +++ b/fence/agents/lpar/fence_lpar.py @@ -11,7 +11,7 @@ ## ##### -import sys, re, pexpect +import sys, re, pexpect, exceptions sys.path.append("/usr/lib/fence") from fencing import * diff --git a/fence/agents/rsa/fence_rsa.py b/fence/agents/rsa/fence_rsa.py index dd2f579..399e3c0 100755 --- a/fence/agents/rsa/fence_rsa.py +++ b/fence/agents/rsa/fence_rsa.py @@ -7,7 +7,7 @@ ## ##### -import sys, re, pexpect +import sys, re, pexpect, exceptions sys.path.append("@FENCEAGENTSLIBDIR@") from fencing import * diff --git a/fence/agents/virsh/fence_virsh.py b/fence/agents/virsh/fence_virsh.py index ae8cd23..2f8a250 100644 --- a/fence/agents/virsh/fence_virsh.py +++ b/fence/agents/virsh/fence_virsh.py @@ -6,7 +6,7 @@ ## ##### -import sys, re, pexpect +import sys, re, pexpect, exceptions sys.path.append("/usr/lib/fence") from fencing import * diff --git a/fence/agents/vmware/fence_vmware.py b/fence/agents/vmware/fence_vmware.py index 3cbb900..1aa0a1e 100755 --- a/fence/agents/vmware/fence_vmware.py +++ b/fence/agents/vmware/fence_vmware.py @@ -7,7 +7,7 @@ ## ##### -import sys, re, pexpect +import sys, re, pexpect, exceptions sys.path.append("/usr/lib/fence") from fencing import * @@ -104,8 +104,13 @@ def main(): ## ## Logout from system ###### - conn.sendline("logout") - conn.close() + try: + conn.sendline("logout") + conn.close() + except exceptions.OSError: + pass + except pexpect.ExceptionPexpect: + pass if __name__ == "__main__": main() diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py index 4d9f6b2..132c8af 100755 --- a/fence/agents/wti/fence_wti.py +++ b/fence/agents/wti/fence_wti.py @@ -12,7 +12,7 @@ ## WTI IPS-800-CE v1.40h (no username) ##### -import sys, re, pexpect +import sys, re, pexpect, exceptions sys.path.append("/usr/lib/fence") from fencing import *