cluster: STABLE3 - fencing: Fencing fails when using implicit connection method other then telnet

cluster: STABLE3 - fencing: Fencing fails when using implicit connection method other then telnet

[Marek Grác]

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d91b912aedfe0b44a8fba970d4a670fba3607fec
Commit:        d91b912aedfe0b44a8fba970d4a670fba3607fec
Parent:        9c8bb17e28ed82886ee837549e4c84196fb7957c
Author:        Marek 'marx' Grac <mgrac@redhat.com>
AuthorDate:    Fri Aug 21 13:10:50 2009 +0200
Committer:     Marek 'marx' Grac <mgrac@redhat.com>
CommitterDate: Fri Aug 21 13:10:50 2009 +0200

fencing: Fencing fails when using implicit connection method other then telnet

Bug was introduced with ipport option where port number was set before
-x/-z was set. It did not affect those who use -x / -z
---
 fence/agents/alom/fence_alom.py   |    8 ++++----
 fence/agents/ilo/fence_ilo.py     |    7 ++++---
 fence/agents/ldom/fence_ldom.py   |    6 +++---
 fence/agents/lpar/fence_lpar.py   |    5 +++--
 fence/agents/virsh/fence_virsh.py |    6 +++---
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/fence/agents/alom/fence_alom.py b/fence/agents/alom/fence_alom.py
index 5fe72aa..d88f718 100644
--- a/fence/agents/alom/fence_alom.py
+++ b/fence/agents/alom/fence_alom.py
@@ -48,15 +48,15 @@ def main():
 			"secure",  "test", "inet4_only", "inet6_only", "ipport" ]
 
 	atexit.register(atexit_handler)
-
-	options = check_input(device_opt, process_input(device_opt))
+	
+	pinput = process_input(device_opt)
+	pinput["-x"] = 1
+	options = check_input(device_opt, pinput)
 
 	# Default command is sc>
 	if (not options.has_key("-c")):
 		options["-c"] = "sc\>\ "
 
-	# Default to ssh
-	options["-x"] = 1
 	options["telnet_over_ssh"] = 1
 	
 	show_docs(options)
diff --git a/fence/agents/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py
index e15052d..7483780 100755
--- a/fence/agents/ilo/fence_ilo.py
+++ b/fence/agents/ilo/fence_ilo.py
@@ -60,9 +60,10 @@ def main():
 
 	atexit.register(atexit_handler)
 
-	options = check_input(device_opt, process_input(device_opt))
-
-	options["-z"] = 1
+	pinput = process_input(device_opt)
+	pinput["-z"] = 1
+	options = check_input(device_opt, pinput)
+	
 	LOGIN_TIMEOUT = 10
 
 	show_docs(options)
diff --git a/fence/agents/ldom/fence_ldom.py b/fence/agents/ldom/fence_ldom.py
index e6bf656..d5e7285 100644
--- a/fence/agents/ldom/fence_ldom.py
+++ b/fence/agents/ldom/fence_ldom.py
@@ -88,7 +88,9 @@ def main():
 
 	atexit.register(atexit_handler)
 
-	options = check_input(device_opt, process_input(device_opt))
+	pinput = process_input(device_opt)
+	pinput["-x"] = 1
+	options = check_input(device_opt, pinput)
 
 	## 
 	## Fence agent specific defaults
@@ -96,8 +98,6 @@ def main():
 	if (not options.has_key("-c")):
 		options["-c"] = "\ $"
 	
-
-	options["-x"] = 1
 	show_docs(options)
 
 	##
diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py
index 760dd74..751ba7a 100644
--- a/fence/agents/lpar/fence_lpar.py
+++ b/fence/agents/lpar/fence_lpar.py
@@ -137,8 +137,9 @@ def main():
 
 	atexit.register(atexit_handler)
 
-	options = check_input(device_opt, process_input(device_opt))
-	options["-x"] = 1
+	pinput = process_input(device_opt)
+	pinput["-x"] = 1
+	options = check_input(device_opt, pinput)
 
 	## 
 	## Fence agent specific settings and default values
diff --git a/fence/agents/virsh/fence_virsh.py b/fence/agents/virsh/fence_virsh.py
index 432bdb9..eae7405 100644
--- a/fence/agents/virsh/fence_virsh.py
+++ b/fence/agents/virsh/fence_virsh.py
@@ -67,14 +67,14 @@ def main():
 
 	atexit.register(atexit_handler)
 
-	options = check_input(device_opt, process_input(device_opt))
+	pinput = process_input(device_opt)
+	pinput["-x"] = 1
+	options = check_input(device_opt, pinput)
 
 	## Defaults for fence agent
 	if 0 == options.has_key("-c"):
 		options["-c"] = "\[EXPECT\]#\ "
 
-	options["-x"]=1
-
 	options["ssh_options"]="-t '/bin/bash -c \"PS1=\[EXPECT\]#\  /bin/bash --noprofile --norc\"'"
 
 	show_docs(options)