From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marek 'marx' Grac Date: Sun, 25 Nov 2012 14:18:07 +0100 Subject: [Cluster-devel] [PATCH 4/7] COMPATIBILITY BREAK: fence_rsb replace -n / telnet_port with standard --ipport / ipport In-Reply-To: <1353849490-15635-1-git-send-email-mgrac@redhat.com> References: <1353849490-15635-1-git-send-email-mgrac@redhat.com> Message-ID: <1353849490-15635-4-git-send-email-mgrac@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit telnet_port has same functionality as ipport and -n is usually used for port number/UUID --- fence/agents/rsb/fence_rsb.py | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff --git a/fence/agents/rsb/fence_rsb.py b/fence/agents/rsb/fence_rsb.py index a701156..61066ee 100755 --- a/fence/agents/rsb/fence_rsb.py +++ b/fence/agents/rsb/fence_rsb.py @@ -37,27 +37,18 @@ def set_power_status(conn, options): conn.log_expect(options, options["--command-prompt"], int(options["--shell-timeout"])) def main(): - device_opt = [ "ipaddr", "ipport", "telnet_port", "login", "passwd", "secure", "cmd_prompt" ] + device_opt = [ "ipaddr", "ipport", "login", "passwd", "secure", "cmd_prompt" ] atexit.register(atexit_handler) - all_opt["telnet_port"] = { - "getopt" : "n:", - "longopt" : "telnet_port", - "help" : "-n TCP port to use (deprecated, use -u)", - "required" : "0", - "shortdesc" : "TCP port to use for connection with device (default is 3172 for telnet)", - "order" : 1 - } + all_opt["cmd_prompt"]["default"] = "to quit:" opt = process_input(device_opt) - # option -n for backward compatibility (-n is normally port no) - if 1 == opt.has_key("--telnet_port"): - opt["--port"] = opt["--telnet_port"] # set default port for telnet only if 0 == opt.has_key("--ssh") and 0 == opt.has_key("--ipport"): opt["--ipport"] = "3172" + options = check_input(device_opt, opt) docs = { } -- 1.7.7.6