Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=0d4892a43... Commit: 0d4892a43337bacc8edb9276600464bd42b5bb18 Parent: d2b7fb001fc50a8e14da8f2b6b974a5b5ade50fc Author: Marek 'marx' Grac mgrac@redhat.com AuthorDate: Mon Feb 18 11:06:08 2013 +0100 Committer: Marek 'marx' Grac mgrac@redhat.com CommitterDate: Mon Feb 18 11:06:08 2013 +0100
fencing: present default values for --ipport in --help
Resolves: rhbz#895717 --- fence/agents/lib/fencing.py.py | 35 +++++++++++++++++++++--- fence/agents/vmware_soap/fence_vmware_soap.py | 2 +- 2 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 907d654..35f5764 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -601,11 +601,6 @@ def check_input(device_opt, opt): else: all_opt["login"]["required"] = "0"
- ## In special cases (show help, metadata or version) we don't need to check anything - ##### - if options.has_key("--help") or options.has_key("--version") or (options.has_key("--action") and options["--action"].lower() == "metadata"): - return options - ## Set default values ##### for opt in device_opt: @@ -614,6 +609,36 @@ def check_input(device_opt, opt): if 0 == options.has_key(getopt_long): options[getopt_long] = all_opt[opt]["default"]
+ if device_opt.count("ipport"): + if options.has_key("--ipport"): + all_opt["ipport"]["help"] = "-u, --ipport=[port] TCP/UDP port to use (default "+ options["--ipport"] +")" + elif options.has_key("--ssh"): + all_opt["ipport"]["default"] = 22 + all_opt["ipport"]["help"] = "-u, --ipport=[port] TCP/UDP port to use (default 22)" + elif options.has_key("--ssl"): + all_opt["ipport"]["default"] = 443 + all_opt["ipport"]["help"] = "-u, --ipport=[port] TCP/UDP port to use (default 443)" + elif device_opt.count("web"): + all_opt["ipport"]["default"] = 80 + if device_opt.count("ssl") == 0: + all_opt["ipport"]["help"] = "-u, --ipport=[port] TCP/UDP port to use (default 80)" + else: + all_opt["ipport"]["help"] = "-u, --ipport=[port] TCP/UDP port to use\n\ + (default 80, 443 if --ssl option is used)" + else: + all_opt["ipport"]["default"] = 23 + if device_opt.count("secure") == 0: + all_opt["ipport"]["help"] = "-u, --ipport=[port] TCP/UDP port to use (default 23)" + else: + all_opt["ipport"]["help"] = "-u, --ipport=[port] TCP/UDP port to use\n\ + (default 23, 22 if --ssh option is used)" + + + ## In special cases (show help, metadata or version) we don't need to check anything + ##### + if options.has_key("--help") or options.has_key("--version") or (options.has_key("--action") and options["--action"].lower() == "metadata"): + return options + options["--action"] = options["--action"].lower()
if options.has_key("--verbose"): diff --git a/fence/agents/vmware_soap/fence_vmware_soap.py b/fence/agents/vmware_soap/fence_vmware_soap.py index aeafa26..365f8cc 100644 --- a/fence/agents/vmware_soap/fence_vmware_soap.py +++ b/fence/agents/vmware_soap/fence_vmware_soap.py @@ -156,7 +156,7 @@ def set_power_status(conn, options): conn.service.PowerOffVM_Task(mo_machine)
def main(): - device_opt = [ "ipaddr", "login", "passwd", "ssl", "port" ] + device_opt = [ "ipaddr", "login", "passwd", "web", "ssl", "port" ]
atexit.register(atexit_handler)
cluster-commits@lists.fedorahosted.org