fence-agents: master - [cleanup] Fixing small issues created during cleaning phase

Marek GrĂ¡c marx at fedoraproject.org
Wed Apr 9 14:50:12 UTC 2014


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

[cleanup] Fixing small issues created during cleaning phase

---
 fence/agents/amt/fence_amt.py               |    2 +-
 fence/agents/apc_snmp/fence_apc_snmp.py     |    1 +
 fence/agents/cisco_ucs/fence_cisco_ucs.py   |    2 +-
 fence/agents/eaton_snmp/fence_eaton_snmp.py |    1 +
 fence/agents/ipdu/fence_ipdu.py             |    1 +
 fence/agents/lib/fencing.py.py              |    2 +-
 fence/agents/raritan/fence_raritan.py       |    3 +++
 7 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/fence/agents/amt/fence_amt.py b/fence/agents/amt/fence_amt.py
index b461831..0eb6caf 100644
--- a/fence/agents/amt/fence_amt.py
+++ b/fence/agents/amt/fence_amt.py
@@ -30,7 +30,7 @@ def get_power_status(_, options):
 	process.stderr.close()
 	logging.debug("%s\n" % str(out))
 
-	match = re.search('Powerstate:[\\s]*(..)', str(output))
+	match = re.search('Powerstate:[\\s]*(..)', str(out))
 	status = match.group(1) if match else None
 
 	if (status == None):
diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py b/fence/agents/apc_snmp/fence_apc_snmp.py
index d91e9e9..1810247 100644
--- a/fence/agents/apc_snmp/fence_apc_snmp.py
+++ b/fence/agents/apc_snmp/fence_apc_snmp.py
@@ -16,6 +16,7 @@ import sys
 import atexit
 sys.path.append("@FENCEAGENTSLIBDIR@")
 from fencing import *
+from fencing import fail_usage
 from fencing_snmp import FencingSnmp
 
 #BEGIN_VERSION_GENERATION
diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py b/fence/agents/cisco_ucs/fence_cisco_ucs.py
index 3ef7c7b..de0f681 100644
--- a/fence/agents/cisco_ucs/fence_cisco_ucs.py
+++ b/fence/agents/cisco_ucs/fence_cisco_ucs.py
@@ -97,7 +97,7 @@ def send_command(opt, command, timeout):
 	result = web_buffer.getvalue()
 
 	logging.debug("%s\n" % command)
-	logging.debug("%s\n" % results)
+	logging.debug("%s\n" % result)
 
 	return result
 
diff --git a/fence/agents/eaton_snmp/fence_eaton_snmp.py b/fence/agents/eaton_snmp/fence_eaton_snmp.py
index 9688516..b14eef4 100644
--- a/fence/agents/eaton_snmp/fence_eaton_snmp.py
+++ b/fence/agents/eaton_snmp/fence_eaton_snmp.py
@@ -10,6 +10,7 @@ import sys
 import atexit
 sys.path.append("@FENCEAGENTSLIBDIR@")
 from fencing import *
+from fencing import fail_usage
 from fencing_snmp import FencingSnmp
 
 #BEGIN_VERSION_GENERATION
diff --git a/fence/agents/ipdu/fence_ipdu.py b/fence/agents/ipdu/fence_ipdu.py
index 83f1dd4..479e9b8 100644
--- a/fence/agents/ipdu/fence_ipdu.py
+++ b/fence/agents/ipdu/fence_ipdu.py
@@ -9,6 +9,7 @@ import sys
 import atexit
 sys.path.append("/usr/share/fence")
 from fencing import *
+from fencing import fail_usage
 from fencing_snmp import FencingSnmp
 
 #BEGIN_VERSION_GENERATION
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 11985d2..73c2c4a 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -866,7 +866,7 @@ def fence_action(tn, options, set_power_fn, get_power_fn, get_outlet_list = None
 			for outlet_id in outlets.keys():
 				(alias, status) = outlets[outlet_id]
 				if options["--action"] != "monitor":
-					print outled_id + options["--separator"] + alias
+					print outlet_id + options["--separator"] + alias
 			return
 
 		status = get_multi_power_fn(tn, options, get_power_fn)
diff --git a/fence/agents/raritan/fence_raritan.py b/fence/agents/raritan/fence_raritan.py
index c8137b0..01059ce 100644
--- a/fence/agents/raritan/fence_raritan.py
+++ b/fence/agents/raritan/fence_raritan.py
@@ -1,8 +1,11 @@
 #!/usr/bin/python
 
 import sys, re, pexpect, exceptions
+import atexit
+import time
 sys.path.append("@FENCEAGENTSLIBDIR@")
 from fencing import *
+from fencing import fspawn, fail, fail_usage, TELNET_PATH, EC_LOGIN_DENIED
 
 #BEGIN_VERSION_GENERATION
 RELEASE_VERSION=""


More information about the cluster-commits mailing list