fence-agents: master - fencing_snmp: Fix exception caused by older commit
Jan Friesse
honzaf at fedoraproject.org
Fri Oct 9 09:11:38 UTC 2009
Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commitdiff;h=f534acd99ad0bacdb85a1580d5c3c25997927957
Commit: f534acd99ad0bacdb85a1580d5c3c25997927957
Parent: 5ef5470a890f2768a819f6dd387199983b60c839
Author: Jan Friesse <jfriesse at redhat.com>
AuthorDate: Fri Oct 9 10:41:52 2009 +0200
Committer: Jan Friesse <jfriesse at redhat.com>
CommitterDate: Fri Oct 9 11:09:29 2009 +0200
fencing_snmp: Fix exception caused by older commit
This patch fixes exception in FA caused by change in fencing library:
"fence agents: Option for setting port for telnet/ssh/ssl used
by fence agent"
RHBZ#527844
---
fence/agents/apc_snmp/fence_apc_snmp.py | 1 +
fence/agents/cisco_mds/fence_cisco_mds.py | 1 +
fence/agents/ibmblade/fence_ibmblade.py | 1 +
fence/agents/ifmib/fence_ifmib.py | 2 ++
fence/agents/intelmodular/fence_intelmodular.py | 2 ++
fence/agents/lib/fencing_snmp.py.py | 7 ++++++-
6 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py b/fence/agents/apc_snmp/fence_apc_snmp.py
index 91331b5..e66a6b0 100644
--- a/fence/agents/apc_snmp/fence_apc_snmp.py
+++ b/fence/agents/apc_snmp/fence_apc_snmp.py
@@ -173,6 +173,7 @@ def main():
atexit.register(atexit_handler)
+ snmp_define_defaults ()
apc_snmp_define_defaults()
options=check_input(device_opt,process_input(device_opt))
diff --git a/fence/agents/cisco_mds/fence_cisco_mds.py b/fence/agents/cisco_mds/fence_cisco_mds.py
index 67948e6..944e593 100644
--- a/fence/agents/cisco_mds/fence_cisco_mds.py
+++ b/fence/agents/cisco_mds/fence_cisco_mds.py
@@ -90,6 +90,7 @@ def main():
atexit.register(atexit_handler)
+ snmp_define_defaults ()
options=process_input(device_opt)
# Emulate enable/disable functionality
diff --git a/fence/agents/ibmblade/fence_ibmblade.py b/fence/agents/ibmblade/fence_ibmblade.py
index 7532221..700437d 100644
--- a/fence/agents/ibmblade/fence_ibmblade.py
+++ b/fence/agents/ibmblade/fence_ibmblade.py
@@ -65,6 +65,7 @@ def main():
atexit.register(atexit_handler)
+ snmp_define_defaults ()
ibmblade_define_defaults()
options=check_input(device_opt,process_input(device_opt))
diff --git a/fence/agents/ifmib/fence_ifmib.py b/fence/agents/ifmib/fence_ifmib.py
index a6c452d..544d236 100644
--- a/fence/agents/ifmib/fence_ifmib.py
+++ b/fence/agents/ifmib/fence_ifmib.py
@@ -110,6 +110,8 @@ def main():
atexit.register(atexit_handler)
+ snmp_define_defaults ()
+
options=process_input(device_opt)
# Emulate enable/disable functionality
diff --git a/fence/agents/intelmodular/fence_intelmodular.py b/fence/agents/intelmodular/fence_intelmodular.py
index 492bbc5..4969772 100644
--- a/fence/agents/intelmodular/fence_intelmodular.py
+++ b/fence/agents/intelmodular/fence_intelmodular.py
@@ -72,6 +72,8 @@ def main():
atexit.register(atexit_handler)
+ snmp_define_defaults ()
+
options=check_input(device_opt,process_input(device_opt))
show_docs(options)
diff --git a/fence/agents/lib/fencing_snmp.py.py b/fence/agents/lib/fencing_snmp.py.py
index 146f304..1292b5b 100644
--- a/fence/agents/lib/fencing_snmp.py.py
+++ b/fence/agents/lib/fencing_snmp.py.py
@@ -12,6 +12,11 @@ REDHAT_COPYRIGHT = ""
BUILD_DATE = ""
#END_VERSION_GENERATION
+# Fix for RHBZ#527844
+def snmp_define_defaults ():
+ all_opt["udpport"]["default"]="161"
+ all_opt["ipport"]["default"]="161"
+
class FencingSnmp:
def __init__(self,options):
self.options=options
@@ -68,7 +73,7 @@ class FencingSnmp:
force_ipvx="udp:"
cmd+=" '%s%s%s'"%(force_ipvx, self.quote_for_run(self.options["-a"]),
- self.options.has_key("-u") and self.quote_for_run(":"+self.options["-u"]) or "")
+ self.options.has_key("-u") and self.quote_for_run(":" + str (self.options["-u"])) or "")
return cmd
def run_command(self,command,additional_timemout=0):
More information about the cluster-commits
mailing list