[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] [PATCH 1/7] COMPATIBILITY BREAK: remove option -T / --test / test



Option -T was not used in all fence agents and its functionality differs. If you want to know if
your fence device is working correctly use '-o monitor / --action monitor / STDIN: action=monitor'.
---
 fence/agents/alom/fence_alom.py                 |    2 +-
 fence/agents/apc/fence_apc.py                   |    2 +-
 fence/agents/apc_snmp/fence_apc_snmp.py         |    2 +-
 fence/agents/cisco_mds/fence_cisco_mds.py       |    2 +-
 fence/agents/eaton_snmp/fence_eaton_snmp.py     |    2 +-
 fence/agents/eps/fence_eps.py                   |    2 +-
 fence/agents/ibmblade/fence_ibmblade.py         |    2 +-
 fence/agents/ifmib/fence_ifmib.py               |    2 +-
 fence/agents/intelmodular/fence_intelmodular.py |    2 +-
 fence/agents/ipdu/fence_ipdu.py                 |    2 +-
 fence/agents/ldom/fence_ldom.py                 |    2 +-
 fence/agents/lib/fencing.py.py                  |    7 -------
 fence/agents/virsh/fence_virsh.py               |    2 +-
 fence/agents/vmware/fence_vmware.py             |    2 +-
 fence/agents/wti/fence_wti.py                   |    2 +-
 fence/agents/xenapi/fence_xenapi.py             |    2 +-
 16 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/fence/agents/alom/fence_alom.py b/fence/agents/alom/fence_alom.py
index a256da4..d5e08e7 100644
--- a/fence/agents/alom/fence_alom.py
+++ b/fence/agents/alom/fence_alom.py
@@ -31,7 +31,7 @@ def set_power_status(conn, options):
 	time.sleep(int(options["--power-timeout"]))
 		
 def main():
-	device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", "test" ]
+	device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure" ]
 
 	atexit.register(atexit_handler)
 
diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py
index ed80c64..46fa0af 100644
--- a/fence/agents/apc/fence_apc.py
+++ b/fence/agents/apc/fence_apc.py
@@ -175,7 +175,7 @@ def set_power_status(conn, options):
 
 def main():
 	device_opt = [  "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", \
-			"port", "switch", "test" ]
+			"port", "switch" ]
 
 	atexit.register(atexit_handler)
 
diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py b/fence/agents/apc_snmp/fence_apc_snmp.py
index 2ca7c1c..859b882 100644
--- a/fence/agents/apc_snmp/fence_apc_snmp.py
+++ b/fence/agents/apc_snmp/fence_apc_snmp.py
@@ -159,7 +159,7 @@ def apc_snmp_define_defaults():
 # Main agent method
 def main():
 	device_opt = [ "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \
-		       "test", "port", "snmp_version", "community" ]
+		       "port", "snmp_version", "community" ]
 
 	atexit.register(atexit_handler)
 
diff --git a/fence/agents/cisco_mds/fence_cisco_mds.py b/fence/agents/cisco_mds/fence_cisco_mds.py
index 650f450..0683539 100644
--- a/fence/agents/cisco_mds/fence_cisco_mds.py
+++ b/fence/agents/cisco_mds/fence_cisco_mds.py
@@ -78,7 +78,7 @@ def main():
 	global PORT_OID
 
 	device_opt = [ "fabric_fencing", "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \
-		       "test", "port", "snmp_version", "community" ]
+		       "port", "snmp_version", "community" ]
 
 	atexit.register(atexit_handler)
 
diff --git a/fence/agents/eaton_snmp/fence_eaton_snmp.py b/fence/agents/eaton_snmp/fence_eaton_snmp.py
index bf6aa9e..0d42224 100644
--- a/fence/agents/eaton_snmp/fence_eaton_snmp.py
+++ b/fence/agents/eaton_snmp/fence_eaton_snmp.py
@@ -198,7 +198,7 @@ def get_outlets_status(conn, options):
 # Main agent method
 def main():
 	device_opt = [ "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \
-		       "test", "port", "snmp_version", "community" ]
+		       "port", "snmp_version", "community" ]
 
 	atexit.register(atexit_handler)
 
diff --git a/fence/agents/eps/fence_eps.py b/fence/agents/eps/fence_eps.py
index 94f862a..245c1a2 100644
--- a/fence/agents/eps/fence_eps.py
+++ b/fence/agents/eps/fence_eps.py
@@ -99,7 +99,7 @@ def eps_define_new_opts():
 # Starting point of fence agent
 def main():
 	device_opt = [  "ipaddr", "login", "passwd", "no_login", "no_password", \
-			"port", "hidden_page", "test" ]
+			"port", "hidden_page" ]
 
 	atexit.register(atexit_handler)
 
diff --git a/fence/agents/ibmblade/fence_ibmblade.py b/fence/agents/ibmblade/fence_ibmblade.py
index 720c691..3516617 100644
--- a/fence/agents/ibmblade/fence_ibmblade.py
+++ b/fence/agents/ibmblade/fence_ibmblade.py
@@ -51,7 +51,7 @@ def get_outlets_status(conn, _):
 # Main agent method
 def main():
 	device_opt = [ "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \
-		       "test", "port", "snmp_version", "community" ]
+		       "port", "snmp_version", "community" ]
 
 	atexit.register(atexit_handler)
 
diff --git a/fence/agents/ifmib/fence_ifmib.py b/fence/agents/ifmib/fence_ifmib.py
index ac3ccd3..055d6d6 100644
--- a/fence/agents/ifmib/fence_ifmib.py
+++ b/fence/agents/ifmib/fence_ifmib.py
@@ -96,7 +96,7 @@ def get_outlets_status(conn, options):
 # Main agent method
 def main():
 	device_opt = [ "fabric_fencing", "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \
-		       "test", "port", "snmp_version", "community" ]
+		       "port", "snmp_version", "community" ]
 
 	atexit.register(atexit_handler)
 
diff --git a/fence/agents/intelmodular/fence_intelmodular.py b/fence/agents/intelmodular/fence_intelmodular.py
index 99bf6c2..4a0f6f4 100644
--- a/fence/agents/intelmodular/fence_intelmodular.py
+++ b/fence/agents/intelmodular/fence_intelmodular.py
@@ -62,7 +62,7 @@ def get_outlets_status(conn, options):
 # Main agent method
 def main():
 	device_opt = [ "ipaddr", "udpport", "login", "passwd", "no_login", "no_password",
-		       "test", "port", "snmp_version", "community" ]
+		       "port", "snmp_version", "community" ]
 
 	atexit.register(atexit_handler)
 
diff --git a/fence/agents/ipdu/fence_ipdu.py b/fence/agents/ipdu/fence_ipdu.py
index 8b722e9..edf4775 100644
--- a/fence/agents/ipdu/fence_ipdu.py
+++ b/fence/agents/ipdu/fence_ipdu.py
@@ -126,7 +126,7 @@ def get_outlets_status(conn, options):
 # Main agent method
 def main():
 	device_opt = [ "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \
-		       "test", "port", "snmp_version", "community" ]
+		       "port", "snmp_version", "community" ]
 
 	atexit.register(atexit_handler)
 
diff --git a/fence/agents/ldom/fence_ldom.py b/fence/agents/ldom/fence_ldom.py
index eabdaf4..08a1508 100644
--- a/fence/agents/ldom/fence_ldom.py
+++ b/fence/agents/ldom/fence_ldom.py
@@ -70,7 +70,7 @@ def set_power_status(conn, options):
 		
 def main():
 	device_opt = [  "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", \
-			"port", "test" ]
+			"port" ]
 
 	atexit.register(atexit_handler)
 
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 6a5fd0b..0736f91 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -198,11 +198,6 @@ all_opt = {
 		"required" : "0",
 		"shortdesc" : "Physical switch number on device",
 		"order" : 1 },
-	"test" : {
-		"getopt" : "T",
-		"help" : "",
-		"order" : 1,
-		"obsolete" : "use -o status instead" },
 	"exec" : {
 		"getopt" : "e:",
 		"longopt" : "exec",
@@ -583,8 +578,6 @@ def process_input(avail_opt):
 		## Compatibility Layer
 		#####
 		z = dict(opt)
-		if z.has_key("-T") == 1:
-			z["--action"] = "status"
 		if z.has_key("--plug") == 1:
 			z["-m"] = z["--plug"]
 
diff --git a/fence/agents/virsh/fence_virsh.py b/fence/agents/virsh/fence_virsh.py
index d012710..a2577f4 100644
--- a/fence/agents/virsh/fence_virsh.py
+++ b/fence/agents/virsh/fence_virsh.py
@@ -60,7 +60,7 @@ def set_power_status(conn, options):
 
 def main():
 	device_opt = [  "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", \
-			"test", "port", "sudo" ]
+			"port", "sudo" ]
 
 	atexit.register(atexit_handler)
 
diff --git a/fence/agents/vmware/fence_vmware.py b/fence/agents/vmware/fence_vmware.py
index b92b409..87d0958 100644
--- a/fence/agents/vmware/fence_vmware.py
+++ b/fence/agents/vmware/fence_vmware.py
@@ -281,7 +281,7 @@ def vmware_check_vmware_type(options):
 # Main agent method
 def main():
 	device_opt = [ "ipaddr", "login", "passwd", "secure",
-		       "test", "exec", "vmware_type", "vmware_datacenter"]
+		       "exec", "vmware_type", "vmware_datacenter"]
 
 	atexit.register(atexit_handler)
 
diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py
index b12648d..b3d022f 100644
--- a/fence/agents/wti/fence_wti.py
+++ b/fence/agents/wti/fence_wti.py
@@ -83,7 +83,7 @@ def set_power_status(conn, options):
 
 def main():
 	device_opt = [  "ipaddr", "ipport", "login", "passwd", "no_login", "no_password", \
-			"cmd_prompt", "secure", "port", "test" ]
+			"cmd_prompt", "secure", "port" ]
 
 	atexit.register(atexit_handler)
 
diff --git a/fence/agents/xenapi/fence_xenapi.py b/fence/agents/xenapi/fence_xenapi.py
index adec13e..25e6056 100644
--- a/fence/agents/xenapi/fence_xenapi.py
+++ b/fence/agents/xenapi/fence_xenapi.py
@@ -201,7 +201,7 @@ def return_vm_reference(session, options):
 def main():
 
 	device_opt = [	"login", "passwd", "port", "no_login", "no_password", "session_url",
-			"test", "uuid" ]
+			"uuid" ]
 
 	atexit.register(atexit_handler)
 
-- 
1.7.7.6


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]