Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Maintenance:9831
fence-agents.openSUSE_Leap_42.3_Update
0015-fencing-Add-consistency-between-command-li...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0015-fencing-Add-consistency-between-command-line-and-STD.patch of Package fence-agents.openSUSE_Leap_42.3_Update
From de490e0590dabc8b30619092f9197ab0d4c47458 Mon Sep 17 00:00:00 2001 From: Marek 'marx' Grac <mgrac@redhat.com> Date: Wed, 22 Mar 2017 20:27:57 +0100 Subject: [PATCH] fencing: Add consistency between command-line and STDIN arguments --- fence/agents/lib/fence2man.xsl | 6 ++ fence/agents/lib/fencing.py.py | 49 +++++++++++----- fence/agents/lib/metadata.rng | 3 +- tests/data/metadata/fence_alom.xml | 56 ++++++++++++++++--- tests/data/metadata/fence_amt.xml | 42 ++++++++++++-- tests/data/metadata/fence_amt_ws.xml | 35 ++++++++++-- tests/data/metadata/fence_apc.xml | 56 ++++++++++++++++--- tests/data/metadata/fence_apc_snmp.xml | 42 ++++++++++++-- tests/data/metadata/fence_azure_arm.xml | 35 ++++++++++-- tests/data/metadata/fence_bladecenter.xml | 56 ++++++++++++++++--- tests/data/metadata/fence_brocade.xml | 56 ++++++++++++++++--- tests/data/metadata/fence_cisco_mds.xml | 42 ++++++++++++-- tests/data/metadata/fence_cisco_ucs.xml | 42 ++++++++++++-- tests/data/metadata/fence_compute.xml | 84 ++++++++++++++++++++++++---- tests/data/metadata/fence_docker.xml | 21 ++++++- tests/data/metadata/fence_drac.xml | 49 +++++++++++++--- tests/data/metadata/fence_drac5.xml | 56 ++++++++++++++++--- tests/data/metadata/fence_dummy.xml | 7 ++- tests/data/metadata/fence_eaton_snmp.xml | 42 ++++++++++++-- tests/data/metadata/fence_emerson.xml | 42 ++++++++++++-- tests/data/metadata/fence_eps.xml | 49 +++++++++++++--- tests/data/metadata/fence_hds_cb.xml | 56 ++++++++++++++++--- tests/data/metadata/fence_hpblade.xml | 56 ++++++++++++++++--- tests/data/metadata/fence_ibmblade.xml | 42 ++++++++++++-- tests/data/metadata/fence_idrac.xml | 49 +++++++++++++--- tests/data/metadata/fence_ifmib.xml | 42 ++++++++++++-- tests/data/metadata/fence_ilo.xml | 49 +++++++++++++--- tests/data/metadata/fence_ilo2.xml | 49 +++++++++++++--- tests/data/metadata/fence_ilo3.xml | 49 +++++++++++++--- tests/data/metadata/fence_ilo3_ssh.xml | 56 ++++++++++++++++--- tests/data/metadata/fence_ilo4.xml | 49 +++++++++++++--- tests/data/metadata/fence_ilo4_ssh.xml | 56 ++++++++++++++++--- tests/data/metadata/fence_ilo_moonshot.xml | 56 ++++++++++++++++--- tests/data/metadata/fence_ilo_mp.xml | 56 ++++++++++++++++--- tests/data/metadata/fence_ilo_ssh.xml | 56 ++++++++++++++++--- tests/data/metadata/fence_imm.xml | 49 +++++++++++++--- tests/data/metadata/fence_intelmodular.xml | 42 ++++++++++++-- tests/data/metadata/fence_ipdu.xml | 42 ++++++++++++-- tests/data/metadata/fence_ipmilan.xml | 49 +++++++++++++--- tests/data/metadata/fence_ironic.xml | 55 +++++++++++++++--- tests/data/metadata/fence_ldom.xml | 56 ++++++++++++++++--- tests/data/metadata/fence_lpar.xml | 56 ++++++++++++++++--- tests/data/metadata/fence_mpath.xml | 14 ++++- tests/data/metadata/fence_netio.xml | 42 ++++++++++++-- tests/data/metadata/fence_ovh.xml | 35 ++++++++++-- tests/data/metadata/fence_powerman.xml | 21 ++++++- tests/data/metadata/fence_pve.xml | 49 +++++++++++++--- tests/data/metadata/fence_raritan.xml | 42 ++++++++++++-- tests/data/metadata/fence_rcd_serial.xml | 7 ++- tests/data/metadata/fence_rhevm.xml | 42 ++++++++++++-- tests/data/metadata/fence_rsa.xml | 56 ++++++++++++++++--- tests/data/metadata/fence_rsb.xml | 56 ++++++++++++++++--- tests/data/metadata/fence_sanbox2.xml | 49 +++++++++++++--- tests/data/metadata/fence_sbd.xml | 14 ++++- tests/data/metadata/fence_scsi.xml | 13 ++++- tests/data/metadata/fence_tripplite_snmp.xml | 42 ++++++++++++-- tests/data/metadata/fence_vbox.xml | 63 ++++++++++++++++++--- tests/data/metadata/fence_virsh.xml | 63 ++++++++++++++++++--- tests/data/metadata/fence_vmware.xml | 49 +++++++++++++--- tests/data/metadata/fence_vmware_soap.xml | 42 ++++++++++++-- tests/data/metadata/fence_wti.xml | 56 ++++++++++++++++--- tests/data/metadata/fence_xenapi.xml | 35 ++++++++++-- tests/data/metadata/fence_zvmip.xml | 42 ++++++++++++-- 63 files changed, 2369 insertions(+), 403 deletions(-) Index: fence-agents-4.0.25+git.1485179354.eb43835/fence/agents/lib/fence2man.xsl =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/fence/agents/lib/fence2man.xsl +++ fence-agents-4.0.25+git.1485179354.eb43835/fence/agents/lib/fence2man.xsl @@ -2,6 +2,7 @@ <xsl:output method="text" indent="no"/> <xsl:template match="parameter"> <xsl:param name="show" /> +<xsl:if test="not(@deprecated)"> .TP <xsl:if test="$show = 'getopt'">.B <xsl:value-of select="getopt/@mixed" /></xsl:if> <xsl:if test="$show = 'stdin'">.B <xsl:value-of select="@name"/></xsl:if> @@ -19,6 +20,11 @@ </xsl:if> <xsl:if test="not(content/@default)"><xsl:if test="@required = 1"> This parameter is always required.</xsl:if></xsl:if> <xsl:if test="content/@default"> (Default Value: <xsl:value-of select="content/@default"/>)</xsl:if> +<xsl:if test="$show = 'stdin'"> +<xsl:if test="@obsoletes"> Obsoletes: <xsl:value-of select="@obsoletes" /></xsl:if> +</xsl:if> + +</xsl:if> </xsl:template> <xsl:template match="action"> Index: fence-agents-4.0.25+git.1485179354.eb43835/fence/agents/lib/fencing.py.py =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/fence/agents/lib/fencing.py.py +++ fence-agents-4.0.25+git.1485179354.eb43835/fence/agents/lib/fencing.py.py @@ -551,7 +551,12 @@ def usage(avail_opt): def metadata(avail_opt, docs): # avail_opt has to be unique, if there are duplicities then they should be removed - sorted_list = [(key, all_opt[key]) for key in list(set(avail_opt))] + sorted_list = [(key, all_opt[key]) for key in list(set(avail_opt)) if "longopt" in all_opt[key]] + # Find keys that are going to replace inconsistent names + mapping = dict([(opt["longopt"].replace("-", "_"), key) for (key, opt) in sorted_list if (key != opt["longopt"].replace("-", "_"))]) + new_options = [(key, all_opt[mapping[key]]) for key in mapping] + sorted_list.extend(new_options) + sorted_list.sort(key=lambda x: (x[1]["order"], x[0])) print("<?xml version=\"1.0\" ?>") @@ -562,34 +567,43 @@ def metadata(avail_opt, docs): print("<longdesc>" + docs["longdesc"] + "</longdesc>") print("<vendor-url>" + docs["vendorurl"] + "</vendor-url>") print("<parameters>") - for option, _ in sorted_list: - if "help" in all_opt[option] and len(all_opt[option]["help"]) > 0: - print("\t<parameter name=\"" + option + "\" unique=\"0\" required=\"" + all_opt[option]["required"] + "\">") + for (key, opt) in sorted_list: + info = "" + if key in all_opt: + if key != all_opt[key].get('longopt', key).replace("-", "_"): + info = "deprecated=\"1\"" + else: + info = "obsoletes=\"%s\"" % (mapping.get(key)) + + if "help" in opt and len(opt["help"]) > 0: + if info != "": + info = " " + info + print("\t<parameter name=\"" + key + "\" unique=\"0\" required=\"" + opt["required"] + "\"" + info + ">") default = "" - if "default" in all_opt[option]: - default = "default=\"" + _encode_html_entities(str(all_opt[option]["default"])) + "\" " + if "default" in opt: + default = "default=\"" + _encode_html_entities(str(opt["default"])) + "\" " - mixed = all_opt[option]["help"] + mixed = opt["help"] ## split it between option and help text res = re.compile(r"^(.*?--\S+)\s+", re.IGNORECASE | re.S).search(mixed) if None != res: mixed = res.group(1) mixed = _encode_html_entities(mixed) - if not "shortdesc" in all_opt[option]: - shortdesc = re.sub("\s\s+", " ", all_opt[option]["help"][31:]) + if not "shortdesc" in opt: + shortdesc = re.sub("\s\s+", " ", opt["help"][31:]) else: - shortdesc = all_opt[option]["shortdesc"] + shortdesc = opt["shortdesc"] print("\t\t<getopt mixed=\"" + mixed + "\" />") - if "choices" in all_opt[option]: + if "choices" in opt: print("\t\t<content type=\"select\" "+default+" >") - for choice in all_opt[option]["choices"]: + for choice in opt["choices"]: print("\t\t\t<option value=\"%s\" />" % (choice)) print("\t\t</content>") - elif all_opt[option]["getopt"].count(":") > 0: - t = all_opt[option].get("type", "string") + elif opt["getopt"].count(":") > 0: + t = opt.get("type", "string") print("\t\t<content type=\"%s\" " % (t) +default+" />") else: print("\t\t<content type=\"boolean\" "+default+" />") @@ -1297,14 +1311,21 @@ def _prepare_getopt_args(options): def _parse_input_stdin(avail_opt): opt = {} name = "" + + mapping_longopt_names = dict([(all_opt[o].get("longopt"), o) for o in avail_opt]) + for line in sys.stdin.readlines(): line = line.strip() if (line.startswith("#")) or (len(line) == 0): continue (name, value) = (line + "=").split("=", 1) + name = name.replace("-", "_"); value = value[:-1] + if name in mapping_longopt_names: + name = mapping_longopt_names[name] + if avail_opt.count(name) == 0 and name in ["nodename"]: continue elif avail_opt.count(name) == 0: Index: fence-agents-4.0.25+git.1485179354.eb43835/fence/agents/lib/metadata.rng =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/fence/agents/lib/metadata.rng +++ fence-agents-4.0.25+git.1485179354.eb43835/fence/agents/lib/metadata.rng @@ -19,7 +19,8 @@ <attribute name="name" /> <attribute name="unique"> <ref name="boolean-values" /> </attribute> <attribute name="required"> <ref name="boolean-values" /> </attribute> - + <optional><attribute name="deprecated"> <ref name="boolean-values" /></attribute></optional> + <optional><attribute name="obsoletes" /> </optional> <element name="getopt"> <attribute name="mixed" /> </element> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_alom.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_alom.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_alom.xml @@ -8,7 +8,12 @@ <content type="string" default="reboot" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="cmd_prompt" unique="0" required="0"> + <parameter name="cmd_prompt" unique="0" required="0" deprecated="1"> + <getopt mixed="-c, --command-prompt=[prompt]" /> + <content type="string" default="['sc\\>\\ ']" /> + <shortdesc lang="en">Force Python regex for command prompt</shortdesc> + </parameter> + <parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt"> <getopt mixed="-c, --command-prompt=[prompt]" /> <content type="string" default="['sc\\>\\ ']" /> <shortdesc lang="en">Force Python regex for command prompt</shortdesc> @@ -28,7 +33,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="0"> + <parameter name="ip" unique="0" required="0" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="0" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -38,27 +48,47 @@ <content type="integer" default="22" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="0"> + <parameter name="plug" unique="0" required="0" obsoletes="port"> <getopt mixed="-n, --plug=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> </parameter> - <parameter name="secure" unique="0" required="0"> + <parameter name="port" unique="0" required="0" deprecated="1"> + <getopt mixed="-n, --plug=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> + </parameter> + <parameter name="secure" unique="0" required="0" deprecated="1"> + <getopt mixed="-x, --ssh" /> + <content type="boolean" default="1" /> + <shortdesc lang="en">Use SSH connection</shortdesc> + </parameter> + <parameter name="ssh" unique="0" required="0" obsoletes="secure"> <getopt mixed="-x, --ssh" /> <content type="boolean" default="1" /> <shortdesc lang="en">Use SSH connection</shortdesc> @@ -68,6 +98,11 @@ <content type="string" /> <shortdesc lang="en">SSH options to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -78,7 +113,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_amt.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_amt.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_amt.xml @@ -29,7 +29,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="0"> + <parameter name="ip" unique="0" required="0" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="0" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -47,17 +52,32 @@ </content> <shortdesc lang="en">Method to fence</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="0"> + <parameter name="plug" unique="0" required="0" obsoletes="port"> + <getopt mixed="-n, --plug=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> + </parameter> + <parameter name="port" unique="0" required="0" deprecated="1"> <getopt mixed="-n, --plug=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> @@ -72,7 +92,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> @@ -126,7 +151,12 @@ <content type="integer" default="1" /> <shortdesc lang="en">Count of attempts to retry power on</shortdesc> </parameter> - <parameter name="sudo" unique="0" required="0"> + <parameter name="sudo" unique="0" required="0" deprecated="1"> + <getopt mixed="--use-sudo" /> + <content type="boolean" /> + <shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc> + </parameter> + <parameter name="use_sudo" unique="0" required="0" obsoletes="sudo"> <getopt mixed="--use-sudo" /> <content type="boolean" /> <shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_amt_ws.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_amt_ws.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_amt_ws.xml @@ -29,7 +29,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="0"> + <parameter name="ip" unique="0" required="0" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="0" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -47,17 +52,32 @@ </content> <shortdesc lang="en">Method to fence</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="0"> + <parameter name="plug" unique="0" required="0" obsoletes="port"> + <getopt mixed="-n, --plug=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> + </parameter> + <parameter name="port" unique="0" required="0" deprecated="1"> <getopt mixed="-n, --plug=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> @@ -72,7 +92,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_apc.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_apc.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_apc.xml @@ -8,7 +8,12 @@ <content type="string" default="reboot" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="cmd_prompt" unique="0" required="0"> + <parameter name="cmd_prompt" unique="0" required="0" deprecated="1"> + <getopt mixed="-c, --command-prompt=[prompt]" /> + <content type="string" default="['\n>', '\napc>']" /> + <shortdesc lang="en">Force Python regex for command prompt</shortdesc> + </parameter> + <parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt"> <getopt mixed="-c, --command-prompt=[prompt]" /> <content type="string" default="['\n>', '\napc>']" /> <shortdesc lang="en">Force Python regex for command prompt</shortdesc> @@ -28,7 +33,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -38,27 +48,47 @@ <content type="integer" default="23" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> </parameter> - <parameter name="secure" unique="0" required="0"> + <parameter name="port" unique="0" required="1" deprecated="1"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="secure" unique="0" required="0" deprecated="1"> + <getopt mixed="-x, --ssh" /> + <content type="boolean" /> + <shortdesc lang="en">Use SSH connection</shortdesc> + </parameter> + <parameter name="ssh" unique="0" required="0" obsoletes="secure"> <getopt mixed="-x, --ssh" /> <content type="boolean" /> <shortdesc lang="en">Use SSH connection</shortdesc> @@ -73,6 +103,11 @@ <content type="string" /> <shortdesc lang="en">Physical switch number on device</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -83,7 +118,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_apc_snmp.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_apc_snmp.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_apc_snmp.xml @@ -24,7 +24,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -34,22 +39,37 @@ <content type="integer" default="161" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="0"> + <parameter name="login" unique="0" required="0" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> @@ -98,6 +118,11 @@ </content> <shortdesc lang="en">Specifies SNMP version to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="0" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -108,7 +133,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_azure_arm.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_azure_arm.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_azure_arm.xml @@ -8,26 +8,46 @@ <content type="string" default="reboot" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="plug" unique="0" required="1" obsoletes="port"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="resourceGroup" unique="0" required="1"> <getopt mixed="--resourceGroup=[name]" /> <content type="string" /> @@ -53,7 +73,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_bladecenter.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_bladecenter.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_bladecenter.xml @@ -8,7 +8,12 @@ <content type="string" default="reboot" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="cmd_prompt" unique="0" required="0"> + <parameter name="cmd_prompt" unique="0" required="0" deprecated="1"> + <getopt mixed="-c, --command-prompt=[prompt]" /> + <content type="string" default="['system>']" /> + <shortdesc lang="en">Force Python regex for command prompt</shortdesc> + </parameter> + <parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt"> <getopt mixed="-c, --command-prompt=[prompt]" /> <content type="string" default="['system>']" /> <shortdesc lang="en">Force Python regex for command prompt</shortdesc> @@ -28,7 +33,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -38,27 +48,47 @@ <content type="integer" default="23" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> </parameter> - <parameter name="secure" unique="0" required="0"> + <parameter name="port" unique="0" required="1" deprecated="1"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="secure" unique="0" required="0" deprecated="1"> + <getopt mixed="-x, --ssh" /> + <content type="boolean" /> + <shortdesc lang="en">Use SSH connection</shortdesc> + </parameter> + <parameter name="ssh" unique="0" required="0" obsoletes="secure"> <getopt mixed="-x, --ssh" /> <content type="boolean" /> <shortdesc lang="en">Use SSH connection</shortdesc> @@ -68,6 +98,11 @@ <content type="string" /> <shortdesc lang="en">SSH options to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -78,7 +113,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_brocade.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_brocade.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_brocade.xml @@ -8,7 +8,12 @@ <content type="string" default="off" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="cmd_prompt" unique="0" required="0"> + <parameter name="cmd_prompt" unique="0" required="0" deprecated="1"> + <getopt mixed="-c, --command-prompt=[prompt]" /> + <content type="string" default="['> ']" /> + <shortdesc lang="en">Force Python regex for command prompt</shortdesc> + </parameter> + <parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt"> <getopt mixed="-c, --command-prompt=[prompt]" /> <content type="string" default="['> ']" /> <shortdesc lang="en">Force Python regex for command prompt</shortdesc> @@ -28,7 +33,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -38,27 +48,47 @@ <content type="integer" default="23" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> </parameter> - <parameter name="secure" unique="0" required="0"> + <parameter name="port" unique="0" required="1" deprecated="1"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="secure" unique="0" required="0" deprecated="1"> + <getopt mixed="-x, --ssh" /> + <content type="boolean" /> + <shortdesc lang="en">Use SSH connection</shortdesc> + </parameter> + <parameter name="ssh" unique="0" required="0" obsoletes="secure"> <getopt mixed="-x, --ssh" /> <content type="boolean" /> <shortdesc lang="en">Use SSH connection</shortdesc> @@ -68,6 +98,11 @@ <content type="string" /> <shortdesc lang="en">SSH options to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -78,7 +113,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_cisco_mds.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_cisco_mds.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_cisco_mds.xml @@ -23,7 +23,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -33,22 +38,37 @@ <content type="integer" default="161" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="0"> + <parameter name="login" unique="0" required="0" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> @@ -97,6 +117,11 @@ </content> <shortdesc lang="en">Specifies SNMP version to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="0" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -107,7 +132,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_cisco_ucs.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_cisco_ucs.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_cisco_ucs.xml @@ -18,7 +18,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -28,7 +33,7 @@ <content type="integer" default="80" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> @@ -38,17 +43,32 @@ <content type="boolean" /> <shortdesc lang="en">Disable TLS negotiation and force SSL3.0. This should only be used for devices that do not support TLS1.0 and up.</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> @@ -73,6 +93,11 @@ <content type="string" default="" /> <shortdesc lang="en">Additional path needed to access suborganization</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -83,7 +108,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_compute.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_compute.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_compute.xml @@ -8,46 +8,86 @@ <content type="string" default="off" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="auth-url" unique="0" required="0"> + <parameter name="auth-url" unique="0" required="0" deprecated="1"> <getopt mixed="-k, --auth-url=[url]" /> <content type="string" default="" /> <shortdesc lang="en">Keystone Admin Auth URL</shortdesc> </parameter> - <parameter name="endpoint-type" unique="0" required="0"> + <parameter name="auth_url" unique="0" required="0" obsoletes="auth-url"> + <getopt mixed="-k, --auth-url=[url]" /> + <content type="string" default="" /> + <shortdesc lang="en">Keystone Admin Auth URL</shortdesc> + </parameter> + <parameter name="endpoint-type" unique="0" required="0" deprecated="1"> + <getopt mixed="-e, --endpoint-type=[endpoint]" /> + <content type="string" default="internalURL" /> + <shortdesc lang="en">Nova Endpoint type</shortdesc> + </parameter> + <parameter name="endpoint_type" unique="0" required="0" obsoletes="endpoint-type"> <getopt mixed="-e, --endpoint-type=[endpoint]" /> <content type="string" default="internalURL" /> <shortdesc lang="en">Nova Endpoint type</shortdesc> </parameter> - <parameter name="login" unique="0" required="0"> + <parameter name="login" unique="0" required="0" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> </parameter> - <parameter name="region-name" unique="0" required="0"> + <parameter name="region-name" unique="0" required="0" deprecated="1"> + <getopt mixed="--region-name=[region]" /> + <content type="boolean" default="" /> + <shortdesc lang="en">Region Name</shortdesc> + </parameter> + <parameter name="region_name" unique="0" required="0" obsoletes="region-name"> <getopt mixed="--region-name=[region]" /> <content type="boolean" default="" /> <shortdesc lang="en">Region Name</shortdesc> </parameter> - <parameter name="tenant-name" unique="0" required="0"> + <parameter name="tenant-name" unique="0" required="0" deprecated="1"> <getopt mixed="-t, --tenant-name=[tenant]" /> <content type="string" default="" /> <shortdesc lang="en">Keystone Admin Tenant</shortdesc> </parameter> + <parameter name="tenant_name" unique="0" required="0" obsoletes="tenant-name"> + <getopt mixed="-t, --tenant-name=[tenant]" /> + <content type="string" default="" /> + <shortdesc lang="en">Keystone Admin Tenant</shortdesc> + </parameter> + <parameter name="username" unique="0" required="0" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="insecure" unique="0" required="0"> <getopt mixed="--insecure" /> <content type="boolean" default="False" /> @@ -58,17 +98,32 @@ <content type="string" /> <shortdesc lang="en">DNS domain in which hosts live</shortdesc> </parameter> - <parameter name="instance-filtering" unique="0" required="0"> + <parameter name="instance-filtering" unique="0" required="0" deprecated="1"> + <getopt mixed="--instance-filtering" /> + <content type="boolean" default="True" /> + <shortdesc lang="en">Allow instances to be evacuated</shortdesc> + </parameter> + <parameter name="instance_filtering" unique="0" required="0" obsoletes="instance-filtering"> <getopt mixed="--instance-filtering" /> <content type="boolean" default="True" /> <shortdesc lang="en">Allow instances to be evacuated</shortdesc> </parameter> - <parameter name="no-shared-storage" unique="0" required="0"> + <parameter name="no-shared-storage" unique="0" required="0" deprecated="1"> <getopt mixed="--no-shared-storage" /> <content type="boolean" default="False" /> <shortdesc lang="en">Disable functionality for dealing with shared storage</shortdesc> </parameter> - <parameter name="record-only" unique="0" required="0"> + <parameter name="no_shared_storage" unique="0" required="0" obsoletes="no-shared-storage"> + <getopt mixed="--no-shared-storage" /> + <content type="boolean" default="False" /> + <shortdesc lang="en">Disable functionality for dealing with shared storage</shortdesc> + </parameter> + <parameter name="record-only" unique="0" required="0" deprecated="1"> + <getopt mixed="--record-only" /> + <content type="string" default="False" /> + <shortdesc lang="en">Only record the target as needing evacuation</shortdesc> + </parameter> + <parameter name="record_only" unique="0" required="0" obsoletes="record-only"> <getopt mixed="--record-only" /> <content type="string" default="False" /> <shortdesc lang="en">Only record the target as needing evacuation</shortdesc> @@ -83,7 +138,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_docker.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_docker.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_docker.xml @@ -18,7 +18,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -36,7 +41,12 @@ </content> <shortdesc lang="en">Method to fence</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> @@ -86,7 +96,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_drac.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_drac.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_drac.xml @@ -8,7 +8,12 @@ <content type="string" default="reboot" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="cmd_prompt" unique="0" required="0"> + <parameter name="cmd_prompt" unique="0" required="0" deprecated="1"> + <getopt mixed="-c, --command-prompt=[prompt]" /> + <content type="string" default="['\\[username\\]# ']" /> + <shortdesc lang="en">Force Python regex for command prompt</shortdesc> + </parameter> + <parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt"> <getopt mixed="-c, --command-prompt=[prompt]" /> <content type="string" default="['\\[username\\]# ']" /> <shortdesc lang="en">Force Python regex for command prompt</shortdesc> @@ -23,7 +28,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="0"> + <parameter name="ip" unique="0" required="0" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="0" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -33,26 +43,46 @@ <content type="integer" default="23" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="0"> + <parameter name="plug" unique="0" required="0" obsoletes="port"> <getopt mixed="-n, --plug=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> </parameter> + <parameter name="port" unique="0" required="0" deprecated="1"> + <getopt mixed="-n, --plug=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> + </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -63,7 +93,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_drac5.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_drac5.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_drac5.xml @@ -8,7 +8,12 @@ <content type="string" default="reboot" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="cmd_prompt" unique="0" required="0"> + <parameter name="cmd_prompt" unique="0" required="0" deprecated="1"> + <getopt mixed="-c, --command-prompt=[prompt]" /> + <content type="string" default="['\\$', 'DRAC\\/MC:']" /> + <shortdesc lang="en">Force Python regex for command prompt</shortdesc> + </parameter> + <parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt"> <getopt mixed="-c, --command-prompt=[prompt]" /> <content type="string" default="['\\$', 'DRAC\\/MC:']" /> <shortdesc lang="en">Force Python regex for command prompt</shortdesc> @@ -37,7 +42,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -47,27 +57,47 @@ <content type="integer" default="23" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> </parameter> - <parameter name="secure" unique="0" required="0"> + <parameter name="port" unique="0" required="1" deprecated="1"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="secure" unique="0" required="0" deprecated="1"> + <getopt mixed="-x, --ssh" /> + <content type="boolean" /> + <shortdesc lang="en">Use SSH connection</shortdesc> + </parameter> + <parameter name="ssh" unique="0" required="0" obsoletes="secure"> <getopt mixed="-x, --ssh" /> <content type="boolean" /> <shortdesc lang="en">Use SSH connection</shortdesc> @@ -77,6 +107,11 @@ <content type="string" /> <shortdesc lang="en">SSH options to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -87,7 +122,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_dummy.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_dummy.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_dummy.xml @@ -33,7 +33,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_eaton_snmp.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_eaton_snmp.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_eaton_snmp.xml @@ -23,7 +23,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -33,22 +38,37 @@ <content type="integer" default="161" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="0"> + <parameter name="login" unique="0" required="0" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> @@ -97,6 +117,11 @@ </content> <shortdesc lang="en">Specifies SNMP version to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="0" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -107,7 +132,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_emerson.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_emerson.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_emerson.xml @@ -23,7 +23,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -33,22 +38,37 @@ <content type="integer" default="161" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="0"> + <parameter name="login" unique="0" required="0" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> @@ -97,6 +117,11 @@ </content> <shortdesc lang="en">Specifies SNMP version to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="0" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -107,7 +132,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_eps.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_eps.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_eps.xml @@ -10,7 +10,7 @@ Agent basically works by connecting to h <content type="string" default="reboot" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="hidden_page" unique="0" required="0"> + <parameter name="hidden_page" unique="0" required="0" deprecated="1"> <getopt mixed="-c, --page=[page]" /> <content type="string" default="hidden.htm" /> <shortdesc lang="en">Name of hidden page</shortdesc> @@ -25,7 +25,12 @@ Agent basically works by connecting to h <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -35,26 +40,51 @@ Agent basically works by connecting to h <content type="integer" default="80" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="0"> + <parameter name="login" unique="0" required="0" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="page" unique="0" required="0" obsoletes="hidden_page"> + <getopt mixed="-c, --page=[page]" /> + <content type="string" default="hidden.htm" /> + <shortdesc lang="en">Name of hidden page</shortdesc> + </parameter> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="username" unique="0" required="0" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -65,7 +95,12 @@ Agent basically works by connecting to h <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_hds_cb.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_hds_cb.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_hds_cb.xml @@ -8,7 +8,12 @@ <content type="string" default="reboot" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="cmd_prompt" unique="0" required="0"> + <parameter name="cmd_prompt" unique="0" required="0" deprecated="1"> + <getopt mixed="-c, --command-prompt=[prompt]" /> + <content type="string" default="['\\) :']" /> + <shortdesc lang="en">Force Python regex for command prompt</shortdesc> + </parameter> + <parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt"> <getopt mixed="-c, --command-prompt=[prompt]" /> <content type="string" default="['\\) :']" /> <shortdesc lang="en">Force Python regex for command prompt</shortdesc> @@ -28,7 +33,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -38,27 +48,47 @@ <content type="integer" default="23" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> </parameter> - <parameter name="secure" unique="0" required="0"> + <parameter name="port" unique="0" required="1" deprecated="1"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="secure" unique="0" required="0" deprecated="1"> + <getopt mixed="-x, --ssh" /> + <content type="boolean" /> + <shortdesc lang="en">Use SSH connection</shortdesc> + </parameter> + <parameter name="ssh" unique="0" required="0" obsoletes="secure"> <getopt mixed="-x, --ssh" /> <content type="boolean" /> <shortdesc lang="en">Use SSH connection</shortdesc> @@ -68,6 +98,11 @@ <content type="string" /> <shortdesc lang="en">SSH options to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -78,7 +113,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_hpblade.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_hpblade.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_hpblade.xml @@ -8,7 +8,12 @@ <content type="string" default="reboot" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="cmd_prompt" unique="0" required="0"> + <parameter name="cmd_prompt" unique="0" required="0" deprecated="1"> + <getopt mixed="-c, --command-prompt=[prompt]" /> + <content type="string" default="['c7000oa>']" /> + <shortdesc lang="en">Force Python regex for command prompt</shortdesc> + </parameter> + <parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt"> <getopt mixed="-c, --command-prompt=[prompt]" /> <content type="string" default="['c7000oa>']" /> <shortdesc lang="en">Force Python regex for command prompt</shortdesc> @@ -28,7 +33,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -38,27 +48,47 @@ <content type="integer" default="23" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> </parameter> - <parameter name="secure" unique="0" required="0"> + <parameter name="port" unique="0" required="1" deprecated="1"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="secure" unique="0" required="0" deprecated="1"> + <getopt mixed="-x, --ssh" /> + <content type="boolean" /> + <shortdesc lang="en">Use SSH connection</shortdesc> + </parameter> + <parameter name="ssh" unique="0" required="0" obsoletes="secure"> <getopt mixed="-x, --ssh" /> <content type="boolean" /> <shortdesc lang="en">Use SSH connection</shortdesc> @@ -68,6 +98,11 @@ <content type="string" /> <shortdesc lang="en">SSH options to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -78,7 +113,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ibmblade.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ibmblade.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ibmblade.xml @@ -23,7 +23,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -33,22 +38,37 @@ <content type="integer" default="161" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="0"> + <parameter name="login" unique="0" required="0" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> @@ -97,6 +117,11 @@ </content> <shortdesc lang="en">Specifies SNMP version to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="0" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -107,7 +132,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_idrac.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_idrac.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_idrac.xml @@ -36,7 +36,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="0"> + <parameter name="ip" unique="0" required="0" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="0" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -51,7 +56,7 @@ <content type="boolean" default="0" /> <shortdesc lang="en">Use Lanplus to improve security of connection</shortdesc> </parameter> - <parameter name="login" unique="0" required="0"> + <parameter name="login" unique="0" required="0" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> @@ -64,17 +69,32 @@ </content> <shortdesc lang="en">Method to fence</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="0"> + <parameter name="plug" unique="0" required="0" obsoletes="port"> + <getopt mixed="-n, --plug=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> + </parameter> + <parameter name="port" unique="0" required="0" deprecated="1"> <getopt mixed="-n, --plug=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> @@ -89,6 +109,11 @@ </content> <shortdesc lang="en">Privilege level on IPMI device</shortdesc> </parameter> + <parameter name="username" unique="0" required="0" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -99,7 +124,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> @@ -153,7 +183,12 @@ <content type="integer" default="1" /> <shortdesc lang="en">Count of attempts to retry power on</shortdesc> </parameter> - <parameter name="sudo" unique="0" required="0"> + <parameter name="sudo" unique="0" required="0" deprecated="1"> + <getopt mixed="--use-sudo" /> + <content type="boolean" /> + <shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc> + </parameter> + <parameter name="use_sudo" unique="0" required="0" obsoletes="sudo"> <getopt mixed="--use-sudo" /> <content type="boolean" /> <shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ifmib.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ifmib.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ifmib.xml @@ -25,7 +25,12 @@ It was written with managed ethernet swi <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -35,22 +40,37 @@ It was written with managed ethernet swi <content type="integer" default="161" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="0"> + <parameter name="login" unique="0" required="0" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> @@ -99,6 +119,11 @@ It was written with managed ethernet swi </content> <shortdesc lang="en">Specifies SNMP version to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="0" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -109,7 +134,12 @@ It was written with managed ethernet swi <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ilo.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo.xml @@ -19,7 +19,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="0"> + <parameter name="ip" unique="0" required="0" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="0" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -29,7 +34,7 @@ <content type="integer" default="443" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> @@ -39,22 +44,42 @@ <content type="boolean" /> <shortdesc lang="en">Disable TLS negotiation and force SSL3.0. This should only be used for devices that do not support TLS1.0 and up.</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="0"> + <parameter name="plug" unique="0" required="0" obsoletes="port"> + <getopt mixed="-n, --plug=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> + </parameter> + <parameter name="port" unique="0" required="0" deprecated="1"> <getopt mixed="-n, --plug=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> </parameter> - <parameter name="ribcl" unique="0" required="0"> + <parameter name="ribcl" unique="0" required="0" deprecated="1"> + <getopt mixed="-r, --ribcl-version=[version]" /> + <content type="string" /> + <shortdesc lang="en">Force ribcl version to use</shortdesc> + </parameter> + <parameter name="ribcl_version" unique="0" required="0" obsoletes="ribcl"> <getopt mixed="-r, --ribcl-version=[version]" /> <content type="string" /> <shortdesc lang="en">Force ribcl version to use</shortdesc> @@ -79,6 +104,11 @@ <content type="boolean" /> <shortdesc lang="en">Disable TLS negotiation and force TLS1.0. This should only be used for devices that do not support TLS1.1 and up.</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -89,7 +119,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo2.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ilo2.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo2.xml @@ -19,7 +19,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="0"> + <parameter name="ip" unique="0" required="0" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="0" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -29,7 +34,7 @@ <content type="integer" default="443" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> @@ -39,22 +44,42 @@ <content type="boolean" /> <shortdesc lang="en">Disable TLS negotiation and force SSL3.0. This should only be used for devices that do not support TLS1.0 and up.</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="0"> + <parameter name="plug" unique="0" required="0" obsoletes="port"> + <getopt mixed="-n, --plug=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> + </parameter> + <parameter name="port" unique="0" required="0" deprecated="1"> <getopt mixed="-n, --plug=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> </parameter> - <parameter name="ribcl" unique="0" required="0"> + <parameter name="ribcl" unique="0" required="0" deprecated="1"> + <getopt mixed="-r, --ribcl-version=[version]" /> + <content type="string" /> + <shortdesc lang="en">Force ribcl version to use</shortdesc> + </parameter> + <parameter name="ribcl_version" unique="0" required="0" obsoletes="ribcl"> <getopt mixed="-r, --ribcl-version=[version]" /> <content type="string" /> <shortdesc lang="en">Force ribcl version to use</shortdesc> @@ -79,6 +104,11 @@ <content type="boolean" /> <shortdesc lang="en">Disable TLS negotiation and force TLS1.0. This should only be used for devices that do not support TLS1.1 and up.</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -89,7 +119,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo3.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ilo3.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo3.xml @@ -36,7 +36,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="0"> + <parameter name="ip" unique="0" required="0" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="0" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -51,7 +56,7 @@ <content type="boolean" default="1" /> <shortdesc lang="en">Use Lanplus to improve security of connection</shortdesc> </parameter> - <parameter name="login" unique="0" required="0"> + <parameter name="login" unique="0" required="0" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> @@ -64,17 +69,32 @@ </content> <shortdesc lang="en">Method to fence</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="0"> + <parameter name="plug" unique="0" required="0" obsoletes="port"> + <getopt mixed="-n, --plug=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> + </parameter> + <parameter name="port" unique="0" required="0" deprecated="1"> <getopt mixed="-n, --plug=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> @@ -89,6 +109,11 @@ </content> <shortdesc lang="en">Privilege level on IPMI device</shortdesc> </parameter> + <parameter name="username" unique="0" required="0" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -99,7 +124,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> @@ -153,7 +183,12 @@ <content type="integer" default="1" /> <shortdesc lang="en">Count of attempts to retry power on</shortdesc> </parameter> - <parameter name="sudo" unique="0" required="0"> + <parameter name="sudo" unique="0" required="0" deprecated="1"> + <getopt mixed="--use-sudo" /> + <content type="boolean" /> + <shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc> + </parameter> + <parameter name="use_sudo" unique="0" required="0" obsoletes="sudo"> <getopt mixed="--use-sudo" /> <content type="boolean" /> <shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo3_ssh.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ilo3_ssh.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo3_ssh.xml @@ -10,7 +10,12 @@ <content type="string" default="reboot" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="cmd_prompt" unique="0" required="0"> + <parameter name="cmd_prompt" unique="0" required="0" deprecated="1"> + <getopt mixed="-c, --command-prompt=[prompt]" /> + <content type="string" default="['MP>', 'hpiLO->']" /> + <shortdesc lang="en">Force Python regex for command prompt</shortdesc> + </parameter> + <parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt"> <getopt mixed="-c, --command-prompt=[prompt]" /> <content type="string" default="['MP>', 'hpiLO->']" /> <shortdesc lang="en">Force Python regex for command prompt</shortdesc> @@ -30,7 +35,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="0"> + <parameter name="ip" unique="0" required="0" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="0" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -40,7 +50,7 @@ <content type="integer" default="23" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> @@ -53,22 +63,42 @@ </content> <shortdesc lang="en">Method to fence</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="0"> + <parameter name="plug" unique="0" required="0" obsoletes="port"> <getopt mixed="-n, --plug=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> </parameter> - <parameter name="secure" unique="0" required="0"> + <parameter name="port" unique="0" required="0" deprecated="1"> + <getopt mixed="-n, --plug=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> + </parameter> + <parameter name="secure" unique="0" required="0" deprecated="1"> + <getopt mixed="-x, --ssh" /> + <content type="boolean" /> + <shortdesc lang="en">Use SSH connection</shortdesc> + </parameter> + <parameter name="ssh" unique="0" required="0" obsoletes="secure"> <getopt mixed="-x, --ssh" /> <content type="boolean" /> <shortdesc lang="en">Use SSH connection</shortdesc> @@ -78,6 +108,11 @@ <content type="string" /> <shortdesc lang="en">SSH options to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -88,7 +123,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo4.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ilo4.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo4.xml @@ -36,7 +36,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="0"> + <parameter name="ip" unique="0" required="0" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="0" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -51,7 +56,7 @@ <content type="boolean" default="1" /> <shortdesc lang="en">Use Lanplus to improve security of connection</shortdesc> </parameter> - <parameter name="login" unique="0" required="0"> + <parameter name="login" unique="0" required="0" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> @@ -64,17 +69,32 @@ </content> <shortdesc lang="en">Method to fence</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="0"> + <parameter name="plug" unique="0" required="0" obsoletes="port"> + <getopt mixed="-n, --plug=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> + </parameter> + <parameter name="port" unique="0" required="0" deprecated="1"> <getopt mixed="-n, --plug=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> @@ -89,6 +109,11 @@ </content> <shortdesc lang="en">Privilege level on IPMI device</shortdesc> </parameter> + <parameter name="username" unique="0" required="0" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -99,7 +124,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> @@ -153,7 +183,12 @@ <content type="integer" default="1" /> <shortdesc lang="en">Count of attempts to retry power on</shortdesc> </parameter> - <parameter name="sudo" unique="0" required="0"> + <parameter name="sudo" unique="0" required="0" deprecated="1"> + <getopt mixed="--use-sudo" /> + <content type="boolean" /> + <shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc> + </parameter> + <parameter name="use_sudo" unique="0" required="0" obsoletes="sudo"> <getopt mixed="--use-sudo" /> <content type="boolean" /> <shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo4_ssh.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ilo4_ssh.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo4_ssh.xml @@ -10,7 +10,12 @@ <content type="string" default="reboot" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="cmd_prompt" unique="0" required="0"> + <parameter name="cmd_prompt" unique="0" required="0" deprecated="1"> + <getopt mixed="-c, --command-prompt=[prompt]" /> + <content type="string" default="['MP>', 'hpiLO->']" /> + <shortdesc lang="en">Force Python regex for command prompt</shortdesc> + </parameter> + <parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt"> <getopt mixed="-c, --command-prompt=[prompt]" /> <content type="string" default="['MP>', 'hpiLO->']" /> <shortdesc lang="en">Force Python regex for command prompt</shortdesc> @@ -30,7 +35,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="0"> + <parameter name="ip" unique="0" required="0" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="0" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -40,7 +50,7 @@ <content type="integer" default="23" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> @@ -53,22 +63,42 @@ </content> <shortdesc lang="en">Method to fence</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="0"> + <parameter name="plug" unique="0" required="0" obsoletes="port"> <getopt mixed="-n, --plug=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> </parameter> - <parameter name="secure" unique="0" required="0"> + <parameter name="port" unique="0" required="0" deprecated="1"> + <getopt mixed="-n, --plug=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> + </parameter> + <parameter name="secure" unique="0" required="0" deprecated="1"> + <getopt mixed="-x, --ssh" /> + <content type="boolean" /> + <shortdesc lang="en">Use SSH connection</shortdesc> + </parameter> + <parameter name="ssh" unique="0" required="0" obsoletes="secure"> <getopt mixed="-x, --ssh" /> <content type="boolean" /> <shortdesc lang="en">Use SSH connection</shortdesc> @@ -78,6 +108,11 @@ <content type="string" /> <shortdesc lang="en">SSH options to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -88,7 +123,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo_moonshot.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ilo_moonshot.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo_moonshot.xml @@ -8,7 +8,12 @@ <content type="string" default="reboot" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="cmd_prompt" unique="0" required="0"> + <parameter name="cmd_prompt" unique="0" required="0" deprecated="1"> + <getopt mixed="-c, --command-prompt=[prompt]" /> + <content type="string" default="['MP>', 'hpiLO->']" /> + <shortdesc lang="en">Force Python regex for command prompt</shortdesc> + </parameter> + <parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt"> <getopt mixed="-c, --command-prompt=[prompt]" /> <content type="string" default="['MP>', 'hpiLO->']" /> <shortdesc lang="en">Force Python regex for command prompt</shortdesc> @@ -28,7 +33,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -38,27 +48,47 @@ <content type="integer" default="22" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> </parameter> - <parameter name="secure" unique="0" required="0"> + <parameter name="port" unique="0" required="1" deprecated="1"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="secure" unique="0" required="0" deprecated="1"> + <getopt mixed="-x, --ssh" /> + <content type="boolean" default="1" /> + <shortdesc lang="en">Use SSH connection</shortdesc> + </parameter> + <parameter name="ssh" unique="0" required="0" obsoletes="secure"> <getopt mixed="-x, --ssh" /> <content type="boolean" default="1" /> <shortdesc lang="en">Use SSH connection</shortdesc> @@ -68,6 +98,11 @@ <content type="string" /> <shortdesc lang="en">SSH options to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -78,7 +113,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo_mp.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ilo_mp.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo_mp.xml @@ -8,7 +8,12 @@ <content type="string" default="reboot" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="cmd_prompt" unique="0" required="0"> + <parameter name="cmd_prompt" unique="0" required="0" deprecated="1"> + <getopt mixed="-c, --command-prompt=[prompt]" /> + <content type="string" default="['MP>', 'hpiLO->']" /> + <shortdesc lang="en">Force Python regex for command prompt</shortdesc> + </parameter> + <parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt"> <getopt mixed="-c, --command-prompt=[prompt]" /> <content type="string" default="['MP>', 'hpiLO->']" /> <shortdesc lang="en">Force Python regex for command prompt</shortdesc> @@ -28,7 +33,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="0"> + <parameter name="ip" unique="0" required="0" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="0" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -38,27 +48,47 @@ <content type="integer" default="23" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="0"> + <parameter name="plug" unique="0" required="0" obsoletes="port"> <getopt mixed="-n, --plug=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> </parameter> - <parameter name="secure" unique="0" required="0"> + <parameter name="port" unique="0" required="0" deprecated="1"> + <getopt mixed="-n, --plug=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> + </parameter> + <parameter name="secure" unique="0" required="0" deprecated="1"> + <getopt mixed="-x, --ssh" /> + <content type="boolean" /> + <shortdesc lang="en">Use SSH connection</shortdesc> + </parameter> + <parameter name="ssh" unique="0" required="0" obsoletes="secure"> <getopt mixed="-x, --ssh" /> <content type="boolean" /> <shortdesc lang="en">Use SSH connection</shortdesc> @@ -68,6 +98,11 @@ <content type="string" /> <shortdesc lang="en">SSH options to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -78,7 +113,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo_ssh.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ilo_ssh.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ilo_ssh.xml @@ -10,7 +10,12 @@ <content type="string" default="reboot" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="cmd_prompt" unique="0" required="0"> + <parameter name="cmd_prompt" unique="0" required="0" deprecated="1"> + <getopt mixed="-c, --command-prompt=[prompt]" /> + <content type="string" default="['MP>', 'hpiLO->']" /> + <shortdesc lang="en">Force Python regex for command prompt</shortdesc> + </parameter> + <parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt"> <getopt mixed="-c, --command-prompt=[prompt]" /> <content type="string" default="['MP>', 'hpiLO->']" /> <shortdesc lang="en">Force Python regex for command prompt</shortdesc> @@ -30,7 +35,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="0"> + <parameter name="ip" unique="0" required="0" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="0" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -40,7 +50,7 @@ <content type="integer" default="23" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> @@ -53,22 +63,42 @@ </content> <shortdesc lang="en">Method to fence</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="0"> + <parameter name="plug" unique="0" required="0" obsoletes="port"> <getopt mixed="-n, --plug=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> </parameter> - <parameter name="secure" unique="0" required="0"> + <parameter name="port" unique="0" required="0" deprecated="1"> + <getopt mixed="-n, --plug=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> + </parameter> + <parameter name="secure" unique="0" required="0" deprecated="1"> + <getopt mixed="-x, --ssh" /> + <content type="boolean" /> + <shortdesc lang="en">Use SSH connection</shortdesc> + </parameter> + <parameter name="ssh" unique="0" required="0" obsoletes="secure"> <getopt mixed="-x, --ssh" /> <content type="boolean" /> <shortdesc lang="en">Use SSH connection</shortdesc> @@ -78,6 +108,11 @@ <content type="string" /> <shortdesc lang="en">SSH options to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -88,7 +123,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_imm.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_imm.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_imm.xml @@ -36,7 +36,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="0"> + <parameter name="ip" unique="0" required="0" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="0" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -51,7 +56,7 @@ <content type="boolean" default="0" /> <shortdesc lang="en">Use Lanplus to improve security of connection</shortdesc> </parameter> - <parameter name="login" unique="0" required="0"> + <parameter name="login" unique="0" required="0" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> @@ -64,17 +69,32 @@ </content> <shortdesc lang="en">Method to fence</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="0"> + <parameter name="plug" unique="0" required="0" obsoletes="port"> + <getopt mixed="-n, --plug=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> + </parameter> + <parameter name="port" unique="0" required="0" deprecated="1"> <getopt mixed="-n, --plug=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> @@ -89,6 +109,11 @@ </content> <shortdesc lang="en">Privilege level on IPMI device</shortdesc> </parameter> + <parameter name="username" unique="0" required="0" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -99,7 +124,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> @@ -153,7 +183,12 @@ <content type="integer" default="1" /> <shortdesc lang="en">Count of attempts to retry power on</shortdesc> </parameter> - <parameter name="sudo" unique="0" required="0"> + <parameter name="sudo" unique="0" required="0" deprecated="1"> + <getopt mixed="--use-sudo" /> + <content type="boolean" /> + <shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc> + </parameter> + <parameter name="use_sudo" unique="0" required="0" obsoletes="sudo"> <getopt mixed="--use-sudo" /> <content type="boolean" /> <shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_intelmodular.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_intelmodular.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_intelmodular.xml @@ -25,7 +25,12 @@ Note: Since firmware update version 2.7, <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -35,22 +40,37 @@ Note: Since firmware update version 2.7, <content type="integer" default="161" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="0"> + <parameter name="login" unique="0" required="0" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> @@ -99,6 +119,11 @@ Note: Since firmware update version 2.7, </content> <shortdesc lang="en">Specifies SNMP version to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="0" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -109,7 +134,12 @@ Note: Since firmware update version 2.7, <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ipdu.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ipdu.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ipdu.xml @@ -23,7 +23,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -33,22 +38,37 @@ <content type="integer" default="161" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="0"> + <parameter name="login" unique="0" required="0" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> @@ -97,6 +117,11 @@ </content> <shortdesc lang="en">Specifies SNMP version to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="0" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -107,7 +132,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ipmilan.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ipmilan.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ipmilan.xml @@ -36,7 +36,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="0"> + <parameter name="ip" unique="0" required="0" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="0" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -51,7 +56,7 @@ <content type="boolean" default="0" /> <shortdesc lang="en">Use Lanplus to improve security of connection</shortdesc> </parameter> - <parameter name="login" unique="0" required="0"> + <parameter name="login" unique="0" required="0" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> @@ -64,17 +69,32 @@ </content> <shortdesc lang="en">Method to fence</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="0"> + <parameter name="plug" unique="0" required="0" obsoletes="port"> + <getopt mixed="-n, --plug=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> + </parameter> + <parameter name="port" unique="0" required="0" deprecated="1"> <getopt mixed="-n, --plug=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> @@ -89,6 +109,11 @@ </content> <shortdesc lang="en">Privilege level on IPMI device</shortdesc> </parameter> + <parameter name="username" unique="0" required="0" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -99,7 +124,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> @@ -153,7 +183,12 @@ <content type="integer" default="1" /> <shortdesc lang="en">Count of attempts to retry power on</shortdesc> </parameter> - <parameter name="sudo" unique="0" required="0"> + <parameter name="sudo" unique="0" required="0" deprecated="1"> + <getopt mixed="--use-sudo" /> + <content type="boolean" /> + <shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc> + </parameter> + <parameter name="use_sudo" unique="0" required="0" obsoletes="sudo"> <getopt mixed="--use-sudo" /> <content type="boolean" /> <shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ironic.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ironic.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ironic.xml @@ -8,36 +8,66 @@ <content type="string" default="reboot" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="auth-url" unique="0" required="1"> + <parameter name="auth-url" unique="0" required="1" deprecated="1"> <getopt mixed="--auth-url=[authurl]" /> <content type="string" /> <shortdesc lang="en">Keystone Admin Auth URL</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="auth_url" unique="0" required="1" obsoletes="auth-url"> + <getopt mixed="--auth-url=[authurl]" /> + <content type="string" /> + <shortdesc lang="en">Keystone Admin Auth URL</shortdesc> + </parameter> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> </parameter> - <parameter name="tenant-name" unique="0" required="0"> + <parameter name="tenant-name" unique="0" required="0" deprecated="1"> <getopt mixed="-t, --tenant-name=[tenant]" /> <content type="string" default="admin" /> <shortdesc lang="en">Keystone Admin Tenant</shortdesc> </parameter> + <parameter name="tenant_name" unique="0" required="0" obsoletes="tenant-name"> + <getopt mixed="-t, --tenant-name=[tenant]" /> + <content type="string" default="admin" /> + <shortdesc lang="en">Keystone Admin Tenant</shortdesc> + </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -48,7 +78,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> @@ -78,11 +113,15 @@ <content type="second" default="5" /> <shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc> </parameter> - <parameter name="openstack-path" unique="0" required="0"> + <parameter name="openstack-path" unique="0" required="0" deprecated="1"> <getopt mixed="--openstack-path=[path]" /> <content type="string" default="/usr/bin/openstack" /> <shortdesc lang="en">Path to the OpenStack binary</shortdesc> </parameter> + <parameter name="openstack_path" unique="0" required="0" obsoletes="openstack-path"> + <getopt mixed="--openstack-path=[path]" /> + <shortdesc lang="en">Path to the OpenStack binary</shortdesc> + </parameter> <parameter name="power_timeout" unique="0" required="0"> <getopt mixed="--power-timeout=[seconds]" /> <content type="second" default="20" /> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ldom.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ldom.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ldom.xml @@ -10,7 +10,12 @@ Very useful parameter is -c (or cmd_prom <content type="string" default="reboot" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="cmd_prompt" unique="0" required="0"> + <parameter name="cmd_prompt" unique="0" required="0" deprecated="1"> + <getopt mixed="-c, --command-prompt=[prompt]" /> + <content type="string" default="['\\ $']" /> + <shortdesc lang="en">Force Python regex for command prompt</shortdesc> + </parameter> + <parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt"> <getopt mixed="-c, --command-prompt=[prompt]" /> <content type="string" default="['\\ $']" /> <shortdesc lang="en">Force Python regex for command prompt</shortdesc> @@ -30,7 +35,12 @@ Very useful parameter is -c (or cmd_prom <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -40,27 +50,47 @@ Very useful parameter is -c (or cmd_prom <content type="integer" default="22" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> </parameter> - <parameter name="secure" unique="0" required="0"> + <parameter name="port" unique="0" required="1" deprecated="1"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="secure" unique="0" required="0" deprecated="1"> + <getopt mixed="-x, --ssh" /> + <content type="boolean" default="1" /> + <shortdesc lang="en">Use SSH connection</shortdesc> + </parameter> + <parameter name="ssh" unique="0" required="0" obsoletes="secure"> <getopt mixed="-x, --ssh" /> <content type="boolean" default="1" /> <shortdesc lang="en">Use SSH connection</shortdesc> @@ -70,6 +100,11 @@ Very useful parameter is -c (or cmd_prom <content type="string" /> <shortdesc lang="en">SSH options to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -80,7 +115,12 @@ Very useful parameter is -c (or cmd_prom <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_lpar.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_lpar.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_lpar.xml @@ -8,7 +8,12 @@ <content type="string" default="reboot" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="cmd_prompt" unique="0" required="0"> + <parameter name="cmd_prompt" unique="0" required="0" deprecated="1"> + <getopt mixed="-c, --command-prompt=[prompt]" /> + <content type="string" default="[':~>', ']\\$', '\\$ ']" /> + <shortdesc lang="en">Force Python regex for command prompt</shortdesc> + </parameter> + <parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt"> <getopt mixed="-c, --command-prompt=[prompt]" /> <content type="string" default="[':~>', ']\\$', '\\$ ']" /> <shortdesc lang="en">Force Python regex for command prompt</shortdesc> @@ -37,7 +42,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -47,7 +57,7 @@ <content type="integer" default="22" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> @@ -57,22 +67,42 @@ <content type="string" /> <shortdesc lang="en">Managed system name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> </parameter> - <parameter name="secure" unique="0" required="0"> + <parameter name="port" unique="0" required="1" deprecated="1"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="secure" unique="0" required="0" deprecated="1"> + <getopt mixed="-x, --ssh" /> + <content type="boolean" default="1" /> + <shortdesc lang="en">Use SSH connection</shortdesc> + </parameter> + <parameter name="ssh" unique="0" required="0" obsoletes="secure"> <getopt mixed="-x, --ssh" /> <content type="boolean" default="1" /> <shortdesc lang="en">Use SSH connection</shortdesc> @@ -82,6 +112,11 @@ <content type="string" /> <shortdesc lang="en">SSH options to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -92,7 +127,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_mpath.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_mpath.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_mpath.xml @@ -29,7 +29,12 @@ The fence_mpath agent works by having a <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> @@ -82,7 +87,12 @@ The fence_mpath agent works by having a <content type="integer" default="1" /> <shortdesc lang="en">Count of attempts to retry power on</shortdesc> </parameter> - <parameter name="sudo" unique="0" required="0"> + <parameter name="sudo" unique="0" required="0" deprecated="1"> + <getopt mixed="--use-sudo" /> + <content type="boolean" /> + <shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc> + </parameter> + <parameter name="use_sudo" unique="0" required="0" obsoletes="sudo"> <getopt mixed="--use-sudo" /> <content type="boolean" /> <shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_netio.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_netio.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_netio.xml @@ -18,7 +18,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -28,26 +33,46 @@ <content type="integer" default="1234" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -58,7 +83,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ovh.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_ovh.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_ovh.xml @@ -13,26 +13,46 @@ <content type="string" /> <shortdesc lang="en">Reboot email</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="plug" unique="0" required="1" obsoletes="port"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -43,7 +63,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_powerman.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_powerman.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_powerman.xml @@ -18,7 +18,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="0"> + <parameter name="ip" unique="0" required="0" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="0" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -28,7 +33,12 @@ <content type="integer" default="10101" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="port" unique="0" required="0"> + <parameter name="plug" unique="0" required="0" obsoletes="port"> + <getopt mixed="-n, --plug=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> + </parameter> + <parameter name="port" unique="0" required="0" deprecated="1"> <getopt mixed="-n, --plug=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> @@ -43,7 +53,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_pve.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_pve.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_pve.xml @@ -18,7 +18,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP Address or Hostname of a node within the Proxmox cluster.</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP Address or Hostname of a node within the Proxmox cluster.</shortdesc> @@ -28,27 +33,52 @@ <content type="integer" default="8006" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" default="root@pam" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Id of the virtual machine.</shortdesc> + </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Id of the virtual machine.</shortdesc> </parameter> - <parameter name="node_name" unique="0" required="0"> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" default="root@pam" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> + <parameter name="node_name" unique="0" required="0" deprecated="1"> + <getopt mixed="-N, --nodename" /> + <content type="string" /> + <shortdesc lang="en">Node on which machine is located. (Optional, will be automatically determined)</shortdesc> + </parameter> + <parameter name="nodename" unique="0" required="0" obsoletes="node_name"> <getopt mixed="-N, --nodename" /> <content type="string" /> <shortdesc lang="en">Node on which machine is located. (Optional, will be automatically determined)</shortdesc> @@ -63,7 +93,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_raritan.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_raritan.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_raritan.xml @@ -18,7 +18,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -28,26 +33,46 @@ <content type="integer" default="23" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -58,7 +83,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_rcd_serial.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_rcd_serial.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_rcd_serial.xml @@ -31,7 +31,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_rhevm.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_rhevm.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_rhevm.xml @@ -18,7 +18,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -28,7 +33,7 @@ <content type="integer" default="80" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> @@ -38,17 +43,32 @@ <content type="boolean" /> <shortdesc lang="en">Disable TLS negotiation and force SSL3.0. This should only be used for devices that do not support TLS1.0 and up.</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> @@ -73,6 +93,11 @@ <content type="boolean" /> <shortdesc lang="en">Reuse cookies for authentication</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -83,7 +108,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_rsa.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_rsa.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_rsa.xml @@ -8,7 +8,12 @@ <content type="string" default="reboot" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="cmd_prompt" unique="0" required="0"> + <parameter name="cmd_prompt" unique="0" required="0" deprecated="1"> + <getopt mixed="-c, --command-prompt=[prompt]" /> + <content type="string" default="['>']" /> + <shortdesc lang="en">Force Python regex for command prompt</shortdesc> + </parameter> + <parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt"> <getopt mixed="-c, --command-prompt=[prompt]" /> <content type="string" default="['>']" /> <shortdesc lang="en">Force Python regex for command prompt</shortdesc> @@ -28,7 +33,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="0"> + <parameter name="ip" unique="0" required="0" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="0" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -38,27 +48,47 @@ <content type="integer" default="23" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="0"> + <parameter name="plug" unique="0" required="0" obsoletes="port"> <getopt mixed="-n, --plug=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> </parameter> - <parameter name="secure" unique="0" required="0"> + <parameter name="port" unique="0" required="0" deprecated="1"> + <getopt mixed="-n, --plug=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> + </parameter> + <parameter name="secure" unique="0" required="0" deprecated="1"> + <getopt mixed="-x, --ssh" /> + <content type="boolean" /> + <shortdesc lang="en">Use SSH connection</shortdesc> + </parameter> + <parameter name="ssh" unique="0" required="0" obsoletes="secure"> <getopt mixed="-x, --ssh" /> <content type="boolean" /> <shortdesc lang="en">Use SSH connection</shortdesc> @@ -68,6 +98,11 @@ <content type="string" default="-F /dev/null" /> <shortdesc lang="en">SSH options to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -78,7 +113,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_rsb.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_rsb.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_rsb.xml @@ -8,7 +8,12 @@ <content type="string" default="reboot" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="cmd_prompt" unique="0" required="0"> + <parameter name="cmd_prompt" unique="0" required="0" deprecated="1"> + <getopt mixed="-c, --command-prompt=[prompt]" /> + <content type="string" default="['to quit:']" /> + <shortdesc lang="en">Force Python regex for command prompt</shortdesc> + </parameter> + <parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt"> <getopt mixed="-c, --command-prompt=[prompt]" /> <content type="string" default="['to quit:']" /> <shortdesc lang="en">Force Python regex for command prompt</shortdesc> @@ -28,7 +33,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="0"> + <parameter name="ip" unique="0" required="0" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="0" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -38,27 +48,47 @@ <content type="integer" default="3172" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="0"> + <parameter name="plug" unique="0" required="0" obsoletes="port"> <getopt mixed="-n, --plug=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> </parameter> - <parameter name="secure" unique="0" required="0"> + <parameter name="port" unique="0" required="0" deprecated="1"> + <getopt mixed="-n, --plug=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> + </parameter> + <parameter name="secure" unique="0" required="0" deprecated="1"> + <getopt mixed="-x, --ssh" /> + <content type="boolean" /> + <shortdesc lang="en">Use SSH connection</shortdesc> + </parameter> + <parameter name="ssh" unique="0" required="0" obsoletes="secure"> <getopt mixed="-x, --ssh" /> <content type="boolean" /> <shortdesc lang="en">Use SSH connection</shortdesc> @@ -68,6 +98,11 @@ <content type="string" /> <shortdesc lang="en">SSH options to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -78,7 +113,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_sanbox2.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_sanbox2.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_sanbox2.xml @@ -8,7 +8,12 @@ <content type="string" default="off" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="cmd_prompt" unique="0" required="0"> + <parameter name="cmd_prompt" unique="0" required="0" deprecated="1"> + <getopt mixed="-c, --command-prompt=[prompt]" /> + <content type="string" default="[' #> ']" /> + <shortdesc lang="en">Force Python regex for command prompt</shortdesc> + </parameter> + <parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt"> <getopt mixed="-c, --command-prompt=[prompt]" /> <content type="string" default="[' #> ']" /> <shortdesc lang="en">Force Python regex for command prompt</shortdesc> @@ -23,7 +28,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -33,26 +43,46 @@ <content type="integer" default="23" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -63,7 +93,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_sbd.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_sbd.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_sbd.xml @@ -21,7 +21,12 @@ </content> <shortdesc lang="en">Method to fence</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> @@ -36,7 +41,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_scsi.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_scsi.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_scsi.xml @@ -44,7 +44,12 @@ The fence_scsi agent works by having eac <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> @@ -89,7 +94,11 @@ The fence_scsi agent works by having eac <content type="integer" default="1" /> <shortdesc lang="en">Count of attempts to retry power on</shortdesc> </parameter> - <parameter name="corosync-cmap_path" unique="0" required="0"> + <parameter name="corosync-cmap_path" unique="0" required="0" deprecated="1"> + <getopt mixed="--corosync-cmap-path=[path]" /> + <shortdesc lang="en">Path to corosync-cmapctl binary</shortdesc> + </parameter> + <parameter name="corosync_cmap_path" unique="0" required="0" obsoletes="corosync-cmap_path"> <getopt mixed="--corosync-cmap-path=[path]" /> <shortdesc lang="en">Path to corosync-cmapctl binary</shortdesc> </parameter> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_tripplite_snmp.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_tripplite_snmp.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_tripplite_snmp.xml @@ -24,7 +24,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -34,22 +39,37 @@ <content type="integer" default="161" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="0"> + <parameter name="login" unique="0" required="0" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> @@ -98,6 +118,11 @@ </content> <shortdesc lang="en">Specifies SNMP version to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="0" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -108,7 +133,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_vbox.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_vbox.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_vbox.xml @@ -10,7 +10,12 @@ By default, vbox needs to log in as a us <content type="string" default="reboot" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="cmd_prompt" unique="0" required="0"> + <parameter name="cmd_prompt" unique="0" required="0" deprecated="1"> + <getopt mixed="-c, --command-prompt=[prompt]" /> + <content type="string" default="['\\[EXPECT\\]#\\ ']" /> + <shortdesc lang="en">Force Python regex for command prompt</shortdesc> + </parameter> + <parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt"> <getopt mixed="-c, --command-prompt=[prompt]" /> <content type="string" default="['\\[EXPECT\\]#\\ ']" /> <shortdesc lang="en">Force Python regex for command prompt</shortdesc> @@ -30,7 +35,12 @@ By default, vbox needs to log in as a us <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -40,27 +50,47 @@ By default, vbox needs to log in as a us <content type="integer" default="22" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> </parameter> - <parameter name="secure" unique="0" required="0"> + <parameter name="secure" unique="0" required="0" deprecated="1"> + <getopt mixed="-x, --ssh" /> + <content type="boolean" default="1" /> + <shortdesc lang="en">Use SSH connection</shortdesc> + </parameter> + <parameter name="ssh" unique="0" required="0" obsoletes="secure"> <getopt mixed="-x, --ssh" /> <content type="boolean" default="1" /> <shortdesc lang="en">Use SSH connection</shortdesc> @@ -70,6 +100,11 @@ By default, vbox needs to log in as a us <content type="string" default="-t '/bin/bash -c "PS1=\\[EXPECT\\]#\ /bin/bash --noprofile --norc"'" /> <shortdesc lang="en">SSH options to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -80,7 +115,12 @@ By default, vbox needs to log in as a us <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> @@ -135,7 +175,12 @@ By default, vbox needs to log in as a us <content type="integer" default="1" /> <shortdesc lang="en">Count of attempts to retry power on</shortdesc> </parameter> - <parameter name="sudo" unique="0" required="0"> + <parameter name="sudo" unique="0" required="0" deprecated="1"> + <getopt mixed="--use-sudo" /> + <content type="boolean" /> + <shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc> + </parameter> + <parameter name="use_sudo" unique="0" required="0" obsoletes="sudo"> <getopt mixed="--use-sudo" /> <content type="boolean" /> <shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_virsh.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_virsh.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_virsh.xml @@ -10,7 +10,12 @@ By default, virsh needs root account to <content type="string" default="reboot" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="cmd_prompt" unique="0" required="0"> + <parameter name="cmd_prompt" unique="0" required="0" deprecated="1"> + <getopt mixed="-c, --command-prompt=[prompt]" /> + <content type="string" default="['\\[EXPECT\\]#\\ ']" /> + <shortdesc lang="en">Force Python regex for command prompt</shortdesc> + </parameter> + <parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt"> <getopt mixed="-c, --command-prompt=[prompt]" /> <content type="string" default="['\\[EXPECT\\]#\\ ']" /> <shortdesc lang="en">Force Python regex for command prompt</shortdesc> @@ -30,7 +35,12 @@ By default, virsh needs root account to <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -40,27 +50,47 @@ By default, virsh needs root account to <content type="integer" default="22" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> </parameter> - <parameter name="secure" unique="0" required="0"> + <parameter name="secure" unique="0" required="0" deprecated="1"> + <getopt mixed="-x, --ssh" /> + <content type="boolean" default="1" /> + <shortdesc lang="en">Use SSH connection</shortdesc> + </parameter> + <parameter name="ssh" unique="0" required="0" obsoletes="secure"> <getopt mixed="-x, --ssh" /> <content type="boolean" default="1" /> <shortdesc lang="en">Use SSH connection</shortdesc> @@ -70,6 +100,11 @@ By default, virsh needs root account to <content type="string" default="-t '/bin/bash -c "PS1=\\[EXPECT\\]#\ /bin/bash --noprofile --norc"'" /> <shortdesc lang="en">SSH options to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -80,7 +115,12 @@ By default, virsh needs root account to <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> @@ -135,7 +175,12 @@ By default, virsh needs root account to <content type="integer" default="1" /> <shortdesc lang="en">Count of attempts to retry power on</shortdesc> </parameter> - <parameter name="sudo" unique="0" required="0"> + <parameter name="sudo" unique="0" required="0" deprecated="1"> + <getopt mixed="--use-sudo" /> + <content type="boolean" /> + <shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc> + </parameter> + <parameter name="use_sudo" unique="0" required="0" obsoletes="sudo"> <getopt mixed="--use-sudo" /> <content type="boolean" /> <shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_vmware.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_vmware.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_vmware.xml @@ -36,7 +36,12 @@ After you have successfully installed VI <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="0"> + <parameter name="ip" unique="0" required="0" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="0" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -46,27 +51,47 @@ After you have successfully installed VI <content type="integer" default="22" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="0"> + <parameter name="plug" unique="0" required="0" obsoletes="port"> + <getopt mixed="-n, --plug=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> + </parameter> + <parameter name="port" unique="0" required="0" deprecated="1"> <getopt mixed="-n, --plug=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> </parameter> - <parameter name="secure" unique="0" required="0"> + <parameter name="secure" unique="0" required="0" deprecated="1"> + <getopt mixed="-x, --ssh" /> + <content type="boolean" default="1" /> + <shortdesc lang="en">Use SSH connection</shortdesc> + </parameter> + <parameter name="ssh" unique="0" required="0" obsoletes="secure"> <getopt mixed="-x, --ssh" /> <content type="boolean" default="1" /> <shortdesc lang="en">Use SSH connection</shortdesc> @@ -76,6 +101,11 @@ After you have successfully installed VI <content type="string" /> <shortdesc lang="en">SSH options to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="vmware_type" unique="0" required="0"> <getopt mixed="-d, --vmware_type=[type]" /> <content type="string" default="esx" /> @@ -96,7 +126,12 @@ After you have successfully installed VI <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_vmware_soap.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_vmware_soap.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_vmware_soap.xml @@ -20,7 +20,12 @@ Name of virtual machine (-n / port) has <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -30,7 +35,7 @@ Name of virtual machine (-n / port) has <content type="integer" default="80" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> @@ -40,17 +45,32 @@ Name of virtual machine (-n / port) has <content type="boolean" /> <shortdesc lang="en">Disable TLS negotiation and force SSL3.0. This should only be used for devices that do not support TLS1.0 and up.</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> @@ -70,6 +90,11 @@ Name of virtual machine (-n / port) has <content type="boolean" /> <shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc> </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -80,7 +105,12 @@ Name of virtual machine (-n / port) has <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_wti.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_wti.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_wti.xml @@ -8,7 +8,12 @@ <content type="string" default="reboot" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="cmd_prompt" unique="0" required="0"> + <parameter name="cmd_prompt" unique="0" required="0" deprecated="1"> + <getopt mixed="-c, --command-prompt=[prompt]" /> + <content type="string" default="['RSM>', 'MPC>', 'IPS>', 'TPS>', 'NBB>', 'NPS>', 'VMR>']" /> + <shortdesc lang="en">Force Python regex for command prompt</shortdesc> + </parameter> + <parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt"> <getopt mixed="-c, --command-prompt=[prompt]" /> <content type="string" default="['RSM>', 'MPC>', 'IPS>', 'TPS>', 'NBB>', 'NPS>', 'VMR>']" /> <shortdesc lang="en">Force Python regex for command prompt</shortdesc> @@ -28,7 +33,12 @@ <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -38,27 +48,47 @@ <content type="integer" default="23" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="0"> + <parameter name="login" unique="0" required="0" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> </parameter> - <parameter name="secure" unique="0" required="0"> + <parameter name="port" unique="0" required="1" deprecated="1"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="secure" unique="0" required="0" deprecated="1"> + <getopt mixed="-x, --ssh" /> + <content type="boolean" /> + <shortdesc lang="en">Use SSH connection</shortdesc> + </parameter> + <parameter name="ssh" unique="0" required="0" obsoletes="secure"> <getopt mixed="-x, --ssh" /> <content type="boolean" /> <shortdesc lang="en">Use SSH connection</shortdesc> @@ -68,6 +98,11 @@ <content type="string" /> <shortdesc lang="en">SSH options to use</shortdesc> </parameter> + <parameter name="username" unique="0" required="0" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -78,7 +113,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_xenapi.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_xenapi.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_xenapi.xml @@ -8,22 +8,37 @@ <content type="string" default="reboot" /> <shortdesc lang="en">Fencing action</shortdesc> </parameter> - <parameter name="login" unique="0" required="0"> + <parameter name="login" unique="0" required="0" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="plug" unique="0" required="1" obsoletes="port"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> @@ -33,6 +48,11 @@ <content type="string" /> <shortdesc lang="en">URL to connect to XenServer on</shortdesc> </parameter> + <parameter name="username" unique="0" required="0" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -43,7 +63,12 @@ <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc> Index: fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_zvmip.xml =================================================================== --- fence-agents-4.0.25+git.1485179354.eb43835.orig/tests/data/metadata/fence_zvmip.xml +++ fence-agents-4.0.25+git.1485179354.eb43835/tests/data/metadata/fence_zvmip.xml @@ -32,7 +32,12 @@ Where XXXXXXX is the name of the virtual <content type="boolean" /> <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> </parameter> - <parameter name="ipaddr" unique="0" required="1"> + <parameter name="ip" unique="0" required="1" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="1" deprecated="1"> <getopt mixed="-a, --ip=[ip]" /> <content type="string" /> <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> @@ -42,7 +47,7 @@ Where XXXXXXX is the name of the virtual <content type="integer" default="44444" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> - <parameter name="login" unique="0" required="1"> + <parameter name="login" unique="0" required="1" deprecated="1"> <getopt mixed="-l, --username=[name]" /> <content type="string" /> <shortdesc lang="en">Login name</shortdesc> @@ -55,21 +60,41 @@ Where XXXXXXX is the name of the virtual </content> <shortdesc lang="en">Method to fence</shortdesc> </parameter> - <parameter name="passwd" unique="0" required="0"> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> <getopt mixed="-p, --password=[password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> - <parameter name="passwd_script" unique="0" required="0"> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> <getopt mixed="-S, --password-script=[script]" /> <content type="string" /> <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> - <parameter name="port" unique="0" required="1"> + <parameter name="plug" unique="0" required="1" obsoletes="port"> <getopt mixed="-n, --plug=[id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> </parameter> + <parameter name="port" unique="0" required="1" deprecated="1"> + <getopt mixed="-n, --plug=[id]" /> + <content type="string" /> + <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> <parameter name="quiet" unique="0" required="0"> <getopt mixed="-q, --quiet" /> <content type="boolean" /> @@ -80,7 +105,12 @@ Where XXXXXXX is the name of the virtual <content type="boolean" /> <shortdesc lang="en">Verbose mode</shortdesc> </parameter> - <parameter name="debug" unique="0" required="0"> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> <getopt mixed="-D, --debug-file=[debugfile]" /> <content type="string" /> <shortdesc lang="en">Write debug information to given file</shortdesc>
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
