Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=62004c338... Commit: 62004c338202dfadfa4b8f2cefd959867c9afa74 Parent: 8bb87b1704ddb923228d3306380250a0908a8877 Author: Marek 'marx' Grac mgrac@redhat.com AuthorDate: Mon Oct 22 15:35:57 2012 +0200 Committer: Marek 'marx' Grac mgrac@redhat.com CommitterDate: Mon Oct 29 12:23:39 2012 +0100

fence-agents: Extend set of default device options

There are device options which are common for every fence agent. This feature was introduced before but only new features were added. This patch removes common features from individual fence agents and adds it to the common set in fencing library. --- fence/agents/alom/fence_alom.py | 6 ++---- fence/agents/apc/fence_apc.py | 6 ++---- fence/agents/apc_snmp/fence_apc_snmp.py | 6 ++---- fence/agents/bladecenter/fence_bladecenter.py | 6 ++---- fence/agents/cisco_mds/fence_cisco_mds.py | 6 ++---- fence/agents/cisco_ucs/fence_cisco_ucs.py | 6 ++---- fence/agents/drac5/fence_drac5.py | 6 ++---- fence/agents/eaton_snmp/fence_eaton_snmp.py | 6 ++---- fence/agents/eps/fence_eps.py | 6 ++---- fence/agents/hpblade/fence_hpblade.py | 6 ++---- fence/agents/ibmblade/fence_ibmblade.py | 6 ++---- fence/agents/ifmib/fence_ifmib.py | 6 ++---- fence/agents/ilo/fence_ilo.py | 6 ++---- fence/agents/ilo_mp/fence_ilo_mp.py | 6 ++---- fence/agents/intelmodular/fence_intelmodular.py | 6 ++---- fence/agents/ipdu/fence_ipdu.py | 6 ++---- fence/agents/ldom/fence_ldom.py | 6 ++---- fence/agents/lib/fencing.py.py | 3 ++- fence/agents/lpar/fence_lpar.py | 8 +++----- fence/agents/rhevm/fence_rhevm.py | 7 ++----- fence/agents/rsa/fence_rsa.py | 6 ++---- fence/agents/rsb/fence_rsb.py | 6 ++---- fence/agents/sanbox2/fence_sanbox2.py | 6 ++---- fence/agents/virsh/fence_virsh.py | 6 ++---- fence/agents/vmware/fence_vmware.py | 6 ++---- fence/agents/vmware_soap/fence_vmware_soap.py | 6 ++---- fence/agents/wti/fence_wti.py | 6 ++---- fence/agents/xenapi/fence_xenapi.py | 6 ++---- 28 files changed, 57 insertions(+), 111 deletions(-)

diff --git a/fence/agents/alom/fence_alom.py b/fence/agents/alom/fence_alom.py index a964be5..6d62d73 100644 --- a/fence/agents/alom/fence_alom.py +++ b/fence/agents/alom/fence_alom.py @@ -43,10 +43,8 @@ def set_power_status(conn, options): fail(EC_TIMED_OUT) def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", - "secure", "identity_file", "test", "inet4_only", "inet6_only", "ipport", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "secure", + "identity_file", "test", "inet4_only", "inet6_only", "ipport" ]

atexit.register(atexit_handler) diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py index 61463d0..46f8b84 100644 --- a/fence/agents/apc/fence_apc.py +++ b/fence/agents/apc/fence_apc.py @@ -182,11 +182,9 @@ def set_power_status(conn, options): fail(EC_TIMED_OUT)

def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "secure", "port", "identity_file", "switch", "test", "separator", - "inet4_only", "inet6_only", "ipport", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "inet4_only", "inet6_only", "ipport" ]

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 71e978e..660eaf7 100644 --- a/fence/agents/apc_snmp/fence_apc_snmp.py +++ b/fence/agents/apc_snmp/fence_apc_snmp.py @@ -164,13 +164,11 @@ def apc_snmp_define_defaults():

# Main agent method def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "test", "port", "separator", "no_login", "no_password", "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", - "udpport","inet4_only","inet6_only", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "udpport","inet4_only","inet6_only" ]

atexit.register(atexit_handler)

diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py index 958ceb0..ab06b27 100644 --- a/fence/agents/bladecenter/fence_bladecenter.py +++ b/fence/agents/bladecenter/fence_bladecenter.py @@ -98,11 +98,9 @@ def get_blades_list(conn, options): return outlets

def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "cmd_prompt", "secure", "port", "identity_file", "separator", - "inet4_only", "inet6_only", "ipport", - "power_timeout", "shell_timeout", "login_timeout", "power_wait", "missing_as_off" ] + "inet4_only", "inet6_only", "ipport", "missing_as_off" ]

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 d20efe4..a007fde 100644 --- a/fence/agents/cisco_mds/fence_cisco_mds.py +++ b/fence/agents/cisco_mds/fence_cisco_mds.py @@ -81,13 +81,11 @@ def get_outlets_status(conn, options): def main(): global port_oid

- device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "test", "port", "separator", "no_login", "no_password", "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", - "udpport","inet4_only","inet6_only", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "udpport", "inet4_only", "inet6_only" ]

atexit.register(atexit_handler)

diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py b/fence/agents/cisco_ucs/fence_cisco_ucs.py index eda6aed..8020d96 100644 --- a/fence/agents/cisco_ucs/fence_cisco_ucs.py +++ b/fence/agents/cisco_ucs/fence_cisco_ucs.py @@ -99,11 +99,9 @@ def send_command(opt, command): return result

def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "ssl", "inet4_only", "inet6_only", "ipport", "port", - "web", "separator", "power_wait", "power_timeout", - "shell_timeout", "suborg" ] + "web", "separator", "suborg" ]

atexit.register(atexit_handler) diff --git a/fence/agents/drac5/fence_drac5.py b/fence/agents/drac5/fence_drac5.py index 3e9a8d2..755f2b4 100644 --- a/fence/agents/drac5/fence_drac5.py +++ b/fence/agents/drac5/fence_drac5.py @@ -85,11 +85,9 @@ def get_list_devices(conn, options): return outlets def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "cmd_prompt", "secure", "identity_file", "drac_version", "module_name", - "separator", "inet4_only", "inet6_only", "ipport", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "separator", "inet4_only", "inet6_only", "ipport" ]

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 5b54b79..2c0b54e 100644 --- a/fence/agents/eaton_snmp/fence_eaton_snmp.py +++ b/fence/agents/eaton_snmp/fence_eaton_snmp.py @@ -204,13 +204,11 @@ def eaton_snmp_define_defaults():

# Main agent method def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "test", "port", "separator", "no_login", "no_password", "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", - "udpport","inet4_only","inet6_only", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "udpport", "inet4_only", "inet6_only" ]

atexit.register(atexit_handler)

diff --git a/fence/agents/eps/fence_eps.py b/fence/agents/eps/fence_eps.py index 21530e6..106fd1c 100644 --- a/fence/agents/eps/fence_eps.py +++ b/fence/agents/eps/fence_eps.py @@ -98,10 +98,8 @@ def eps_define_new_opts():

# Starting point of fence agent def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", - "test", "port", "hidden_page", "no_login", "no_password", - "separator" ] + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "test", + "port", "hidden_page", "no_login", "no_password", "separator" ]

atexit.register(atexit_handler)

diff --git a/fence/agents/hpblade/fence_hpblade.py b/fence/agents/hpblade/fence_hpblade.py index b4e9f1b..4e125c1 100644 --- a/fence/agents/hpblade/fence_hpblade.py +++ b/fence/agents/hpblade/fence_hpblade.py @@ -71,11 +71,9 @@ def get_blades_list(conn, options): return outlets

def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "cmd_prompt", "secure", "port", "identity_file", "separator", - "inet4_only", "inet6_only", "ipport", "missing_as_off", - "power_timeout", "shell_timeout", "login_timeout", "power_wait"] + "inet4_only", "inet6_only", "ipport", "missing_as_off" ]

atexit.register(atexit_handler)

diff --git a/fence/agents/ibmblade/fence_ibmblade.py b/fence/agents/ibmblade/fence_ibmblade.py index 323a4ad..96d2a76 100644 --- a/fence/agents/ibmblade/fence_ibmblade.py +++ b/fence/agents/ibmblade/fence_ibmblade.py @@ -56,13 +56,11 @@ def ibmblade_define_defaults(): def main(): global port_oid

- device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "test", "port", "separator", "no_login", "no_password", "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", - "udpport","inet4_only","inet6_only", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "udpport", "inet4_only", "inet6_only" ]

atexit.register(atexit_handler)

diff --git a/fence/agents/ifmib/fence_ifmib.py b/fence/agents/ifmib/fence_ifmib.py index 2914301..bbbec22 100644 --- a/fence/agents/ifmib/fence_ifmib.py +++ b/fence/agents/ifmib/fence_ifmib.py @@ -101,13 +101,11 @@ def ifmib_define_defaults(): def main(): global port_oid

- device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "test", "port", "separator", "no_login", "no_password", "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", - "udpport","inet4_only","inet6_only", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "udpport", "inet4_only", "inet6_only" ]

atexit.register(atexit_handler)

diff --git a/fence/agents/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py index d4e34df..4c8f7ca 100644 --- a/fence/agents/ilo/fence_ilo.py +++ b/fence/agents/ilo/fence_ilo.py @@ -58,10 +58,8 @@ def set_power_status(conn, options): return

def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", - "ssl", "ribcl", "inet4_only", "inet6_only", "ipport", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", + "ssl", "ribcl", "inet4_only", "inet6_only", "ipport" ]

atexit.register(atexit_handler)

diff --git a/fence/agents/ilo_mp/fence_ilo_mp.py b/fence/agents/ilo_mp/fence_ilo_mp.py index 3af3048..9ac8701 100644 --- a/fence/agents/ilo_mp/fence_ilo_mp.py +++ b/fence/agents/ilo_mp/fence_ilo_mp.py @@ -44,11 +44,9 @@ def set_power_status(conn, options): fail(EC_TIMED_OUT)

def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "secure", "identity_file", "cmd_prompt", "ipport", - "separator", "inet4_only", "inet6_only", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "separator", "inet4_only", "inet6_only" ]

atexit.register(atexit_handler) diff --git a/fence/agents/intelmodular/fence_intelmodular.py b/fence/agents/intelmodular/fence_intelmodular.py index 11ff9bc..52dd27f 100644 --- a/fence/agents/intelmodular/fence_intelmodular.py +++ b/fence/agents/intelmodular/fence_intelmodular.py @@ -63,13 +63,11 @@ def get_outlets_status(conn, options): def main(): global port_oid

- device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "test", "port", "separator", "no_login", "no_password", "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", - "udpport","inet4_only","inet6_only", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "udpport", "inet4_only", "inet6_only" ]

atexit.register(atexit_handler)

diff --git a/fence/agents/ipdu/fence_ipdu.py b/fence/agents/ipdu/fence_ipdu.py index aac0b7d..2749e44 100644 --- a/fence/agents/ipdu/fence_ipdu.py +++ b/fence/agents/ipdu/fence_ipdu.py @@ -138,13 +138,11 @@ def ipdu_snmp_define_defaults():

# Main agent method def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "test", "port", "separator", "no_login", "no_password", "snmp_version", "community", "snmp_auth_prot", "snmp_sec_level", "snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script", - "udpport","inet4_only","inet6_only", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "udpport", "inet4_only", "inet6_only" ]

atexit.register(atexit_handler)

diff --git a/fence/agents/ldom/fence_ldom.py b/fence/agents/ldom/fence_ldom.py index c971c04..d106255 100644 --- a/fence/agents/ldom/fence_ldom.py +++ b/fence/agents/ldom/fence_ldom.py @@ -81,11 +81,9 @@ def set_power_status(conn, options): fail(EC_TIMED_OUT) def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "secure", "identity_file", "test" , "port", "cmd_prompt", - "separator", "inet4_only", "inet6_only", "ipport", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "separator", "inet4_only", "inet6_only", "ipport" ]

atexit.register(atexit_handler)

diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 2cc6e7b..e26f9b3 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -407,7 +407,8 @@ all_opt = { "order" : 205} }

-common_opt = [ "retry_on", "delay" ] +common_opt = [ "help", "debug", "verbose", "quiet", "version", "action", "agent", + "power_timeout", "shell_timeout", "login_timeout", "power_wait", "retry_on", "delay" ]

class fspawn(pexpect.spawn): def __init__(self, options, command): diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py index 00ea66c..b9121e4 100644 --- a/fence/agents/lpar/fence_lpar.py +++ b/fence/agents/lpar/fence_lpar.py @@ -130,11 +130,9 @@ def get_lpar_list(conn, options): return outlets

def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", - "secure", "identity_file", "partition", "managed", "hmc_version", "cmd_prompt", - "separator", "inet4_only", "inet6_only", "ipport", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "secure", + "identity_file", "partition", "managed", "hmc_version", "cmd_prompt", + "separator", "inet4_only", "inet6_only", "ipport" ]

atexit.register(atexit_handler)

diff --git a/fence/agents/rhevm/fence_rhevm.py b/fence/agents/rhevm/fence_rhevm.py index 4310dd0..9bb9581 100644 --- a/fence/agents/rhevm/fence_rhevm.py +++ b/fence/agents/rhevm/fence_rhevm.py @@ -116,11 +116,8 @@ def send_command(opt, command, method = "GET"): return result

def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", - "ssl", "inet4_only", "inet6_only", "ipport", "port", - "web", "separator", "power_wait", "power_timeout", - "shell_timeout" ] + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "ssl", + "inet4_only", "inet6_only", "ipport", "port", "web", "separator" ]

atexit.register(atexit_handler)

diff --git a/fence/agents/rsa/fence_rsa.py b/fence/agents/rsa/fence_rsa.py index e9f87cd..3ba2c80 100644 --- a/fence/agents/rsa/fence_rsa.py +++ b/fence/agents/rsa/fence_rsa.py @@ -44,10 +44,8 @@ def set_power_status(conn, options): fail(EC_TIMED_OUT)

def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", - "cmd_prompt", "secure", "identity_file", "ipport", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", + "cmd_prompt", "secure", "identity_file", "ipport" ]

atexit.register(atexit_handler)

diff --git a/fence/agents/rsb/fence_rsb.py b/fence/agents/rsb/fence_rsb.py index 7ce1906..bc3df9a 100755 --- a/fence/agents/rsb/fence_rsb.py +++ b/fence/agents/rsb/fence_rsb.py @@ -47,11 +47,9 @@ def set_power_status(conn, options): fail(EC_TIMED_OUT)

def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "secure", "identity_file", "separator", "cmd_prompt", - "inet4_only", "inet6_only", "ipport", "telnet_port", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "inet4_only", "inet6_only", "ipport", "telnet_port" ]

atexit.register(atexit_handler) all_opt["telnet_port"] = { diff --git a/fence/agents/sanbox2/fence_sanbox2.py b/fence/agents/sanbox2/fence_sanbox2.py index 92c5d4a..8c67ac2 100644 --- a/fence/agents/sanbox2/fence_sanbox2.py +++ b/fence/agents/sanbox2/fence_sanbox2.py @@ -108,10 +108,8 @@ def get_list_devices(conn, options): return outlets

def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "io_fencing", "ipaddr", "login", "passwd", "passwd_script", - "cmd_prompt", "port", "ipport", "separator", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + device_opt = [ "io_fencing", "ipaddr", "login", "passwd", "passwd_script", + "cmd_prompt", "port", "ipport", "separator" ]

atexit.register(atexit_handler)

diff --git a/fence/agents/virsh/fence_virsh.py b/fence/agents/virsh/fence_virsh.py index 4859d7d..6e6a43d 100644 --- a/fence/agents/virsh/fence_virsh.py +++ b/fence/agents/virsh/fence_virsh.py @@ -71,11 +71,9 @@ def set_power_status(conn, options): fail(EC_TIMED_OUT)

def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "secure", "identity_file", "test", "port", "separator", - "inet4_only", "inet6_only", "ipport", "sudo", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "inet4_only", "inet6_only", "ipport", "sudo" ]

atexit.register(atexit_handler)

diff --git a/fence/agents/vmware/fence_vmware.py b/fence/agents/vmware/fence_vmware.py index 99e5ca9..0b81d1d 100644 --- a/fence/agents/vmware/fence_vmware.py +++ b/fence/agents/vmware/fence_vmware.py @@ -284,11 +284,9 @@ def vmware_check_vmware_type(options):

# Main agent method def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "test", "port", "separator", "exec", "vmware_type", - "vmware_datacenter", "secure", "identity_file", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "vmware_datacenter", "secure", "identity_file" ]

atexit.register(atexit_handler)

diff --git a/fence/agents/vmware_soap/fence_vmware_soap.py b/fence/agents/vmware_soap/fence_vmware_soap.py index 0da7f0d..21dad66 100644 --- a/fence/agents/vmware_soap/fence_vmware_soap.py +++ b/fence/agents/vmware_soap/fence_vmware_soap.py @@ -158,10 +158,8 @@ def set_power_status(conn, options): conn.service.PowerOffVM_Task(mo_machine)

def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", - "ssl", "port", "uuid", "separator", "ipport", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", + "ssl", "port", "uuid", "separator", "ipport" ]

atexit.register(atexit_handler)

diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py index b7c41f3..f013953 100644 --- a/fence/agents/wti/fence_wti.py +++ b/fence/agents/wti/fence_wti.py @@ -90,11 +90,9 @@ def set_power_status(conn, options): fail(EC_TIMED_OUT)

def main(): - device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", - "action", "ipaddr", "login", "passwd", "passwd_script", + device_opt = [ "ipaddr", "login", "passwd", "passwd_script", "cmd_prompt", "secure", "identity_file", "port", "no_login", "no_password", - "test", "separator", "inet4_only", "inet6_only", "ipport", - "power_timeout", "shell_timeout", "login_timeout", "power_wait" ] + "test", "separator", "inet4_only", "inet6_only", "ipport" ]

atexit.register(atexit_handler)

diff --git a/fence/agents/xenapi/fence_xenapi.py b/fence/agents/xenapi/fence_xenapi.py index cae53e6..0b07ed6 100644 --- a/fence/agents/xenapi/fence_xenapi.py +++ b/fence/agents/xenapi/fence_xenapi.py @@ -199,10 +199,8 @@ def return_vm_reference(session, options):

def main():

- device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug", "action", - "login", "passwd", "passwd_script", "port", "test", "separator", - "no_login", "no_password", "power_timeout", "shell_timeout", - "login_timeout", "power_wait", "session_url", "uuid" ] + device_opt = [ "login", "passwd", "passwd_script", "port", "test", "separator", + "no_login", "no_password", "session_url", "uuid" ]

atexit.register(atexit_handler)