From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13734 invoked by alias); 12 Nov 2008 20:42:07 -0000 Received: (qmail 13701 invoked by alias); 12 Nov 2008 20:42:06 -0000 X-Spam-Status: No, hits=-0.8 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_46,KAM_MX,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com X-Spam-Level: Subject: The tag: cmirror_1_1_34 has been created To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/tags/cmirror_1_1_34 X-Git-Reftype: tag X-Git-Oldrev: 3993b5e73a08031ec88a25c5cfa5146d4ab3787c X-Git-Newrev: c8e1dff26b5fd3d9cb5c72a6787871fc92686a39 From: Chris Feist Message-Id: <20081112202209.8FA02C07C9@lists.fedorahosted.org> Date: Wed, 12 Nov 2008 20:42: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: 2008-q4/txt/msg00296.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=c8e1dff26b5fd3d9cb5c72a6787871fc92686a39 Commit: c8e1dff26b5fd3d9cb5c72a6787871fc92686a39 Parent: 3993b5e73a08031ec88a25c5cfa5146d4ab3787c Author: Marek 'marx' Grac AuthorDate: Wed Nov 12 14:57:03 2008 +0100 Committer: Marek 'marx' Grac CommitterDate: Wed Nov 12 15:02:24 2008 +0100 [fence] Extension to fence agent for LPAR/HMC with 'list'/'monitor' operation --- fence/agents/lib/fencing.py.py | 2 +- fence/agents/lpar/fence_lpar.py | 29 +++++++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index f661af8..124f8c2 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -403,7 +403,7 @@ def wait_power_status(tn, options, get_power_fn): return 0 def fence_action(tn, options, set_power_fn, get_power_fn, get_outlet_list = None): - if (options["-o"] == "list" and 0 == options["device_opt"].count("port")): + if (options["-o"] == "list") and (0 == options["device_opt"].count("port")) and (0 == options["device_opt"].count("partition")): print "N/A" return elif (options["-o"] == "list" and get_outlet_list == None): diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py index a8a4fe9..56c3153 100644 --- a/fence/agents/lpar/fence_lpar.py +++ b/fence/agents/lpar/fence_lpar.py @@ -57,6 +57,31 @@ def set_power_status(conn, options): except pexpect.TIMEOUT: fail(EC_TIMED_OUT) +def get_lpar_list(conn, options): + outlets = { } + try: + conn.send("lssyscfg -r lpar -m " + options["-s"] + + " -F name:state\n") + conn.log_expect(options, options["-c"], POWER_TIMEOUT) + + ## We have to remove first line (command) and last line (part of new prompt) + #### + res = re.search("^.+?\n(.*)\n.*$", conn.before, re.S) + + if res == None: + fail_usage("Unable to parse output of list command") + + lines = res.group(1).split("\n") + for x in lines: + s = x.split(":") + outlets[s[0]] = ("", s[1]) + except pexpect.EOF: + fail(EC_CONNECTION_LOST) + except pexpect.TIMEOUT: + fail(EC_TIMED_OUT) + + return outlets + def main(): device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", "action", "ipaddr", "login", "passwd", "passwd_script", @@ -76,14 +101,14 @@ def main(): if 0 == options.has_key("-s"): fail_usage("Failed: You have to enter name of managed system") - if 0 == options.has_key("-n"): + if (0 == ["list", "monitor"].count(options["-o"].lower())) and (0 == options.has_key("-n")): fail_usage("Failed: You have to enter name of the partition") ## ## Operate the fencing device #### conn = fence_login(options) - fence_action(conn, options, set_power_status, get_power_status) + fence_action(conn, options, set_power_status, get_power_status, get_lpar_list) ## ## Logout from system