fence-agents: master - fence_wti: Action 'list' prints also named groups

Marek GrĂ¡c marx at fedoraproject.org
Wed Apr 9 15:09:09 UTC 2014


Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=24226ad4008ec1c0aceaa8f3612b1114516d6847
Commit:        24226ad4008ec1c0aceaa8f3612b1114516d6847
Parent:        5e02c4f2fde20f4530efc69a340baf22a965f6e4
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Wed Apr 9 17:08:21 2014 +0200
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Wed Apr 9 17:08:21 2014 +0200

fence_wti: Action 'list' prints also named groups

Resolves: rhbz#1085887
---
 fence/agents/wti/fence_wti.py |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py
index 01667fc..34d85a1 100644
--- a/fence/agents/wti/fence_wti.py
+++ b/fence/agents/wti/fence_wti.py
@@ -144,18 +144,23 @@ def get_plug_group_status(conn, options):
 
 
 	if ["list", "monitor"].count(options["--action"]) == 1:
-		for group, status in outlet_groups:
-			outlets[group] = (group, status[0])
+		results = {}
+		for group, status in outlets.items():
+			results[group] = (group, status[0])
 
-		return outlets
+		return results
 	else:
 		return "PROBLEM"
 
 def get_power_status(conn, options):
-	ret = get_plug_status(conn, options)
+	if ["list"].count(options["--action"]) == 0:
+		ret = get_plug_status(conn, options)
 
-	if ret == "PROBLEM":
-		ret = get_plug_group_status(conn, options)
+		if ret == "PROBLEM":
+			ret = get_plug_group_status(conn, options)
+	else:
+		ret = dict(get_plug_status(conn, options).items() + \
+			get_plug_group_status(conn, options).items())
 
 	return ret
 


More information about the cluster-commits mailing list