cluster: STABLE3 - fence_lpar: Fix 'list' operation for HMC v3

[Fabio M. Di Nitto]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=faf1dd523b4ddda012b57b2e2ddc5ab739ff2c24
Commit:        faf1dd523b4ddda012b57b2e2ddc5ab739ff2c24
Parent:        8423bf935ce8c271dd0eb00341f81282ac1f5616
Author:        Marek 'marx' Grac <mgrac@redhat.com>
AuthorDate:    Mon Feb 16 15:26:28 2009 +0100
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Fri Feb 20 19:20:54 2009 +0100

fence_lpar: Fix 'list' operation for HMC v3

---
 fence/agents/lpar/fence_lpar.py |   57 ++++++++++++++++++++++++++------------
 1 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py
index d74397c..c6e4ba9 100644
--- a/fence/agents/lpar/fence_lpar.py
+++ b/fence/agents/lpar/fence_lpar.py
@@ -80,33 +80,54 @@ def set_power_status(conn, options):
 
 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)
+	if options["-H"] == "3":
+		try:
+			conn.send("query_partition_names -m " + options["-s"] + "\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)
+			## We have to remove first 3 lines (command + header) and last line (part of new prompt)
+			####
+			res = re.search("^.+?\n(.+?\n){2}(.*)\n.*$", conn.before, re.S)
 
-		if res == None:
-			fail_usage("Unable to parse output of list command")
+			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)
+			lines = res.group(2).split("\n")
+			for x in lines:
+				outlets[x.rstrip()] = ("", "")
+		except pexpect.EOF:
+			fail(EC_CONNECTION_LOST)
+		except pexpect.TIMEOUT:
+			fail(EC_TIMED_OUT)		
+	elif options["-H"] == "4":
+		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",
-			"secure", "partition", "managed", "hmc_version", "cmd_prompt" ]
+			"secure", "partition", "managed", "hmc_version", "cmd_prompt",
+			"separator" ]
 
 	options = check_input(device_opt, process_input(device_opt))