No OneTemporary
Actions

Size

671 KB

Referenced Files

None

Subscribers

None

View Options

This file is larger than 256 KB, so syntax highlighting was skipped.

	diff --git a/lib/fencing.py.py b/lib/fencing.py.py
	index 4b54aa7c..63b13036 100644
	--- a/lib/fencing.py.py
	+++ b/lib/fencing.py.py
	@@ -1,1521 +1,1563 @@
	#!@PYTHON@ -tt

	import sys, getopt, time, os, uuid, pycurl, stat
	import pexpect, re, syslog
	import logging
	import subprocess
	import threading
	import shlex
	import socket
	import textwrap
	import __main__

	RELEASE_VERSION = "@RELEASE_VERSION@"

	__all__ = ['atexit_handler', 'check_input', 'process_input', 'all_opt', 'show_docs',
	'fence_login', 'fence_action', 'fence_logout']

	EC_OK = 0
	EC_GENERIC_ERROR = 1
	EC_BAD_ARGS = 2
	EC_LOGIN_DENIED = 3
	EC_CONNECTION_LOST = 4
	EC_TIMED_OUT = 5
	EC_WAITING_ON = 6
	EC_WAITING_OFF = 7
	EC_STATUS = 8
	EC_STATUS_HMC = 9
	EC_PASSWORD_MISSING = 10
	EC_INVALID_PRIVILEGES = 11
	EC_FETCH_VM_UUID = 12

	LOG_FORMAT = "%(asctime)-15s %(levelname)s: %(message)s"

	all_opt = {
	"help" : {
	"getopt" : "h",
	"longopt" : "help",
	"help" : "-h, --help Display this help and exit",
	"required" : "0",
	"shortdesc" : "Display help and exit",
	- "order" : 54},
	+ "order" : 55},
	"version" : {
	"getopt" : "V",
	"longopt" : "version",
	"help" : "-V, --version Display version information and exit",
	"required" : "0",
	"shortdesc" : "Display version information and exit",
	- "order" : 53},
	+ "order" : 54},
	"verbose" : {
	"getopt" : "v",
	"longopt" : "verbose",
	- "help" : "-v, --verbose Verbose mode",
	+ "help" : "-v, --verbose Verbose mode. "
	+ "Multiple -v flags can be stacked on the command line "
	+ "(e.g., -vvv) to increase verbosity.",
	"required" : "0",
	"order" : 51},
	+ "verbose_level" : {
	+ "getopt" : ":",
	+ "longopt" : "verbose-level",
	+ "type" : "integer",
	+ "help" : "--verbose-level "
	+ "Level of debugging detail in output. Defaults to the "
	+ "number of --verbose flags specified on the command "
	+ "line, or to 1 if verbose=1 in a stonith device "
	+ "configuration (i.e., on stdin).",
	+ "required" : "0",
	+ "order" : 52},
	"debug" : {
	"getopt" : "D:",
	"longopt" : "debug-file",
	"help" : "-D, --debug-file=[debugfile] Debugging to output file",
	"required" : "0",
	"shortdesc" : "Write debug information to given file",
	- "order" : 52},
	+ "order" : 53},
	"delay" : {
	"getopt" : ":",
	"longopt" : "delay",
	"type" : "second",
	"help" : "--delay=[seconds] Wait X seconds before fencing is started",
	"required" : "0",
	"default" : "0",
	"order" : 200},
	"agent" : {
	"getopt" : "",
	"help" : "",
	"order" : 1},
	"web" : {
	"getopt" : "",
	"help" : "",
	"order" : 1},
	"force_on" : {
	"getopt" : "",
	"help" : "",
	"order" : 1},
	"action" : {
	"getopt" : "o:",
	"longopt" : "action",
	"help" : "-o, --action=[action] Action: status, reboot (default), off or on",
	"required" : "1",
	"shortdesc" : "Fencing action",
	"default" : "reboot",
	"order" : 1},
	"fabric_fencing" : {
	"getopt" : "",
	"help" : "",
	"order" : 1},
	"ipaddr" : {
	"getopt" : "a:",
	"longopt" : "ip",
	"help" : "-a, --ip=[ip] IP address or hostname of fencing device",
	"required" : "1",
	"order" : 1},
	"ipport" : {
	"getopt" : "u:",
	"longopt" : "ipport",
	"type" : "integer",
	"help" : "-u, --ipport=[port] TCP/UDP port to use for connection",
	"required" : "0",
	"shortdesc" : "TCP/UDP port to use for connection with device",
	"order" : 1},
	"login" : {
	"getopt" : "l:",
	"longopt" : "username",
	"help" : "-l, --username=[name] Login name",
	"required" : "?",
	"order" : 1},
	"no_login" : {
	"getopt" : "",
	"help" : "",
	"order" : 1},
	"no_password" : {
	"getopt" : "",
	"help" : "",
	"order" : 1},
	"no_port" : {
	"getopt" : "",
	"help" : "",
	"order" : 1},
	"no_status" : {
	"getopt" : "",
	"help" : "",
	"order" : 1},
	"no_on" : {
	"getopt" : "",
	"help" : "",
	"order" : 1},
	"no_off" : {
	"getopt" : "",
	"help" : "",
	"order" : 1},
	"telnet" : {
	"getopt" : "",
	"help" : "",
	"order" : 1},
	"diag" : {
	"getopt" : "",
	"help" : "",
	"order" : 1},
	"passwd" : {
	"getopt" : "p:",
	"longopt" : "password",
	"help" : "-p, --password=[password] Login password or passphrase",
	"required" : "0",
	"order" : 1},
	"passwd_script" : {
	"getopt" : "S:",
	"longopt" : "password-script",
	"help" : "-S, --password-script=[script] Script to run to retrieve password",
	"required" : "0",
	"order" : 1},
	"identity_file" : {
	"getopt" : "k:",
	"longopt" : "identity-file",
	"help" : "-k, --identity-file=[filename] Identity file (private key) for SSH",
	"required" : "0",
	"order" : 1},
	"cmd_prompt" : {
	"getopt" : "c:",
	"longopt" : "command-prompt",
	"help" : "-c, --command-prompt=[prompt] Force Python regex for command prompt",
	"required" : "0",
	"order" : 1},
	"secure" : {
	"getopt" : "x",
	"longopt" : "ssh",
	"help" : "-x, --ssh Use SSH connection",
	"required" : "0",
	"order" : 1},
	"ssh_options" : {
	"getopt" : ":",
	"longopt" : "ssh-options",
	"help" : "--ssh-options=[options] SSH options to use",
	"required" : "0",
	"order" : 1},
	"ssl" : {
	"getopt" : "z",
	"longopt" : "ssl",
	"help" : "-z, --ssl Use SSL connection with verifying certificate",
	"required" : "0",
	"order" : 1},
	"ssl_insecure" : {
	"getopt" : "",
	"longopt" : "ssl-insecure",
	"help" : "--ssl-insecure Use SSL connection without verifying certificate",
	"required" : "0",
	"order" : 1},
	"ssl_secure" : {
	"getopt" : "",
	"longopt" : "ssl-secure",
	"help" : "--ssl-secure Use SSL connection with verifying certificate",
	"required" : "0",
	"order" : 1},
	"notls" : {
	"getopt" : "t",
	"longopt" : "notls",
	"help" : "-t, --notls "
	"Disable TLS negotiation and force SSL3.0. "
	"This should only be used for devices that do not support TLS1.0 and up.",
	"required" : "0",
	"order" : 1},
	"tls1.0" : {
	"getopt" : "",
	"longopt" : "tls1.0",
	"help" : "--tls1.0 "
	"Disable TLS negotiation and force TLS1.0. "
	"This should only be used for devices that do not support TLS1.1 and up.",
	"required" : "0",
	"order" : 1},
	"port" : {
	"getopt" : "n:",
	"longopt" : "plug",
	"help" : "-n, --plug=[id] "
	"Physical plug number on device, UUID or identification of machine",
	"required" : "1",
	"order" : 1},
	"switch" : {
	"getopt" : "s:",
	"longopt" : "switch",
	"help" : "-s, --switch=[id] Physical switch number on device",
	"required" : "0",
	"order" : 1},
	"exec" : {
	"getopt" : "e:",
	"longopt" : "exec",
	"help" : "-e, --exec=[command] Command to execute",
	"required" : "0",
	"order" : 1},
	"vmware_type" : {
	"getopt" : "d:",
	"longopt" : "vmware_type",
	"help" : "-d, --vmware_type=[type] Type of VMware to connect",
	"required" : "0",
	"order" : 1},
	"vmware_datacenter" : {
	"getopt" : "s:",
	"longopt" : "vmware-datacenter",
	"help" : "-s, --vmware-datacenter=[dc] VMWare datacenter filter",
	"required" : "0",
	"order" : 2},
	"snmp_version" : {
	"getopt" : "d:",
	"longopt" : "snmp-version",
	"help" : "-d, --snmp-version=[version] Specifies SNMP version to use (1\|2c\|3)",
	"required" : "0",
	"shortdesc" : "Specifies SNMP version to use",
	"choices" : ["1", "2c", "3"],
	"order" : 1},
	"community" : {
	"getopt" : "c:",
	"longopt" : "community",
	"help" : "-c, --community=[community] Set the community string",
	"required" : "0",
	"order" : 1},
	"snmp_auth_prot" : {
	"getopt" : "b:",
	"longopt" : "snmp-auth-prot",
	"help" : "-b, --snmp-auth-prot=[prot] Set authentication protocol (MD5\|SHA)",
	"required" : "0",
	"shortdesc" : "Set authentication protocol",
	"choices" : ["MD5", "SHA"],
	"order" : 1},
	"snmp_sec_level" : {
	"getopt" : "E:",
	"longopt" : "snmp-sec-level",
	"help" : "-E, --snmp-sec-level=[level] "
	"Set security level (noAuthNoPriv\|authNoPriv\|authPriv)",
	"required" : "0",
	"shortdesc" : "Set security level",
	"choices" : ["noAuthNoPriv", "authNoPriv", "authPriv"],
	"order" : 1},
	"snmp_priv_prot" : {
	"getopt" : "B:",
	"longopt" : "snmp-priv-prot",
	"help" : "-B, --snmp-priv-prot=[prot] Set privacy protocol (DES\|AES)",
	"required" : "0",
	"shortdesc" : "Set privacy protocol",
	"choices" : ["DES", "AES"],
	"order" : 1},
	"snmp_priv_passwd" : {
	"getopt" : "P:",
	"longopt" : "snmp-priv-passwd",
	"help" : "-P, --snmp-priv-passwd=[pass] Set privacy protocol password",
	"required" : "0",
	"order" : 1},
	"snmp_priv_passwd_script" : {
	"getopt" : "R:",
	"longopt" : "snmp-priv-passwd-script",
	"help" : "-R, --snmp-priv-passwd-script Script to run to retrieve privacy password",
	"required" : "0",
	"order" : 1},
	"inet4_only" : {
	"getopt" : "4",
	"longopt" : "inet4-only",
	"help" : "-4, --inet4-only Forces agent to use IPv4 addresses only",
	"required" : "0",
	"order" : 1},
	"inet6_only" : {
	"getopt" : "6",
	"longopt" : "inet6-only",
	"help" : "-6, --inet6-only Forces agent to use IPv6 addresses only",
	"required" : "0",
	"order" : 1},
	"separator" : {
	"getopt" : "C:",
	"longopt" : "separator",
	"help" : "-C, --separator=[char] Separator for CSV created by 'list' operation",
	"default" : ",",
	"required" : "0",
	"order" : 100},
	"login_timeout" : {
	"getopt" : ":",
	"longopt" : "login-timeout",
	"type" : "second",
	"help" : "--login-timeout=[seconds] Wait X seconds for cmd prompt after login",
	"default" : "5",
	"required" : "0",
	"order" : 200},
	"shell_timeout" : {
	"getopt" : ":",
	"longopt" : "shell-timeout",
	"type" : "second",
	"help" : "--shell-timeout=[seconds] Wait X seconds for cmd prompt after issuing command",
	"default" : "3",
	"required" : "0",
	"order" : 200},
	"power_timeout" : {
	"getopt" : ":",
	"longopt" : "power-timeout",
	"type" : "second",
	"help" : "--power-timeout=[seconds] Test X seconds for status change after ON/OFF",
	"default" : "20",
	"required" : "0",
	"order" : 200},
	"power_wait" : {
	"getopt" : ":",
	"longopt" : "power-wait",
	"type" : "second",
	"help" : "--power-wait=[seconds] Wait X seconds after issuing ON/OFF",
	"default" : "0",
	"required" : "0",
	"order" : 200},
	"missing_as_off" : {
	"getopt" : "",
	"longopt" : "missing-as-off",
	"help" : "--missing-as-off Missing port returns OFF instead of failure",
	"required" : "0",
	"order" : 200},
	"retry_on" : {
	"getopt" : ":",
	"longopt" : "retry-on",
	"type" : "integer",
	"help" : "--retry-on=[attempts] Count of attempts to retry power on",
	"default" : "1",
	"required" : "0",
	"order" : 201},
	"session_url" : {
	"getopt" : "s:",
	"longopt" : "session-url",
	"help" : "-s, --session-url URL to connect to XenServer on",
	"required" : "1",
	"order" : 1},
	"sudo" : {
	"getopt" : "",
	"longopt" : "use-sudo",
	"help" : "--use-sudo Use sudo (without password) when calling 3rd party software",
	"required" : "0",
	"order" : 205},
	"method" : {
	"getopt" : "m:",
	"longopt" : "method",
	"help" : "-m, --method=[method] Method to fence (onoff\|cycle) (Default: onoff)",
	"required" : "0",
	"shortdesc" : "Method to fence",
	"default" : "onoff",
	"choices" : ["onoff", "cycle"],
	"order" : 1},
	"telnet_path" : {
	"getopt" : ":",
	"longopt" : "telnet-path",
	"help" : "--telnet-path=[path] Path to telnet binary",
	"required" : "0",
	"default" : "@TELNET_PATH@",
	"order": 300},
	"ssh_path" : {
	"getopt" : ":",
	"longopt" : "ssh-path",
	"help" : "--ssh-path=[path] Path to ssh binary",
	"required" : "0",
	"default" : "@SSH_PATH@",
	"order": 300},
	"gnutlscli_path" : {
	"getopt" : ":",
	"longopt" : "gnutlscli-path",
	"help" : "--gnutlscli-path=[path] Path to gnutls-cli binary",
	"required" : "0",
	"default" : "@GNUTLSCLI_PATH@",
	"order": 300},
	"sudo_path" : {
	"getopt" : ":",
	"longopt" : "sudo-path",
	"help" : "--sudo-path=[path] Path to sudo binary",
	"required" : "0",
	"default" : "@SUDO_PATH@",
	"order": 300},
	"snmpwalk_path" : {
	"getopt" : ":",
	"longopt" : "snmpwalk-path",
	"help" : "--snmpwalk-path=[path] Path to snmpwalk binary",
	"required" : "0",
	"default" : "@SNMPWALK_PATH@",
	"order" : 300},
	"snmpset_path" : {
	"getopt" : ":",
	"longopt" : "snmpset-path",
	"help" : "--snmpset-path=[path] Path to snmpset binary",
	"required" : "0",
	"default" : "@SNMPSET_PATH@",
	"order" : 300},
	"snmpget_path" : {
	"getopt" : ":",
	"longopt" : "snmpget-path",
	"help" : "--snmpget-path=[path] Path to snmpget binary",
	"required" : "0",
	"default" : "@SNMPGET_PATH@",
	"order" : 300},
	"snmp": {
	"getopt" : "",
	"help" : "",
	"order" : 1},
	"port_as_ip": {
	"getopt" : "",
	"longopt" : "port-as-ip",
	"help" : "--port-as-ip Make \"port/plug\" to be an alias to IP address",
	"required" : "0",
	"order" : 200},
	"on_target": {
	"getopt" : "",
	"help" : "",
	"order" : 1},
	"quiet": {
	"getopt" : "q",
	"longopt": "quiet",
	"help" : "-q, --quiet Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.",
	"required" : "0",
	"order" : 50}
	}

	# options which are added automatically if 'key' is encountered ("default" is always added)
	DEPENDENCY_OPT = {
	- "default" : ["help", "debug", "verbose", "version", "action", "agent", \
	- "power_timeout", "shell_timeout", "login_timeout", "power_wait", "retry_on", \
	- "delay", "quiet"],
	+ "default" : ["help", "debug", "verbose", "verbose_level",
	+ "version", "action", "agent", "power_timeout",
	+ "shell_timeout", "login_timeout", "power_wait",
	+ "retry_on", "delay", "quiet"],
	"passwd" : ["passwd_script"],
	"sudo" : ["sudo_path"],
	"secure" : ["identity_file", "ssh_options", "ssh_path", "inet4_only", "inet6_only"],
	"telnet" : ["telnet_path"],
	"ipaddr" : ["ipport"],
	"port" : ["separator"],
	"ssl" : ["ssl_secure", "ssl_insecure", "gnutlscli_path"],
	"snmp" : ["snmp_auth_prot", "snmp_sec_level", "snmp_priv_prot", \
	"snmp_priv_passwd", "snmp_priv_passwd_script", "community", \
	"snmpset_path", "snmpget_path", "snmpwalk_path"]
	}

	class fspawn(pexpect.spawn):
	def __init__(self, options, command, **kwargs):
	if sys.version_info[0] > 2:
	kwargs.setdefault('encoding', 'utf-8')
	logging.info("Running command: %s", command)
	pexpect.spawn.__init__(self, command, **kwargs)
	self.opt = options

	def log_expect(self, pattern, timeout):
	result = self.expect(pattern, timeout)
	logging.debug("Received: %s", self.before + self.after)
	return result

	def send(self, message):
	logging.debug("Sent: %s", message)
	return pexpect.spawn.send(self, message)

	# send EOL according to what was detected in login process (telnet)
	def send_eol(self, message):
	return self.send(message + self.opt["eol"])

	def frun(command, timeout=30, withexitstatus=False, events=None,
	extra_args=None, logfile=None, cwd=None, env=None, **kwargs):
	if sys.version_info[0] > 2:
	kwargs.setdefault('encoding', 'utf-8')
	return pexpect.run(command, timeout=timeout,
	withexitstatus=withexitstatus, events=events,
	extra_args=extra_args, logfile=logfile, cwd=cwd,
	env=env, **kwargs)

	def atexit_handler():
	try:
	sys.stdout.close()
	os.close(1)
	except IOError:
	logging.error("%s failed to close standard output\n", sys.argv[0])
	sys.exit(EC_GENERIC_ERROR)

	def _add_dependency_options(options):
	## Add also options which are available for every fence agent
	added_opt = []
	for opt in options + ["default"]:
	if opt in DEPENDENCY_OPT:
	added_opt.extend([y for y in DEPENDENCY_OPT[opt] if options.count(y) == 0])

	if not "port" in (options + added_opt) and \
	not "nodename" in (options + added_opt) and \
	"ipaddr" in (options + added_opt):
	added_opt.append("port_as_ip")
	all_opt["port"]["help"] = "-n, --plug=[ip] IP address or hostname of fencing device " \
	"(together with --port-as-ip)"

	return added_opt

	def fail_usage(message="", stop=True):
	if len(message) > 0:
	logging.error("%s\n", message)
	if stop:
	logging.error("Please use '-h' for usage\n")
	sys.exit(EC_GENERIC_ERROR)

	def fail(error_code, stop=True):
	message = {
	EC_LOGIN_DENIED : "Unable to connect/login to fencing device",
	EC_CONNECTION_LOST : "Connection lost",
	EC_TIMED_OUT : "Connection timed out",
	EC_WAITING_ON : "Failed: Timed out waiting to power ON",
	EC_WAITING_OFF : "Failed: Timed out waiting to power OFF",
	EC_STATUS : "Failed: Unable to obtain correct plug status or plug is not available",
	EC_STATUS_HMC : "Failed: Either unable to obtain correct plug status, "
	"partition is not available or incorrect HMC version used",
	EC_PASSWORD_MISSING : "Failed: You have to set login password",
	EC_INVALID_PRIVILEGES : "Failed: The user does not have the correct privileges to do the requested action.",
	EC_FETCH_VM_UUID : "Failed: Can not find VM UUID by its VM name given in the <plug> parameter."

	}[error_code] + "\n"
	logging.error("%s\n", message)
	if stop:
	sys.exit(EC_GENERIC_ERROR)

	def usage(avail_opt):
	print("Usage:")
	print("\t" + os.path.basename(sys.argv[0]) + " [options]")
	print("Options:")

	sorted_list = [(key, all_opt[key]) for key in avail_opt]
	sorted_list.sort(key=lambda x: x[1]["order"])

	for key, value in sorted_list:
	if len(value["help"]) != 0:
	print(" " + _join_wrap([value["help"]], first_indent=3))

	def metadata(options, 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)) 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]))

	if options["--action"] == "metadata":
	docs["longdesc"] = re.sub("\\\\f[BPIR]\|\.P\|\.TP\|\.br\n", "", docs["longdesc"])

	print("<?xml version=\"1.0\" ?>")
	print("<resource-agent name=\"" + os.path.basename(sys.argv[0]) + \
	"\" shortdesc=\"" + docs["shortdesc"] + "\" >")
	for (symlink, desc) in docs.get("symlink", []):
	print("<symlink name=\"" + symlink + "\" shortdesc=\"" + desc + "\"/>")
	print("<longdesc>" + docs["longdesc"] + "</longdesc>")
	print("<vendor-url>" + docs["vendorurl"] + "</vendor-url>")
	print("<parameters>")
	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 opt:
	default = "default=\"" + _encode_html_entities(str(opt["default"])) + "\" "

	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 opt:
	shortdesc = re.sub("\s\s+", " ", opt["help"][31:])
	else:
	shortdesc = opt["shortdesc"]

	print("\t\t<getopt mixed=\"" + mixed + "\" />")
	if "choices" in opt:
	print("\t\t<content type=\"select\" "+default+" >")
	for choice in opt["choices"]:
	print("\t\t\t<option value=\"%s\" />" % (choice))
	print("\t\t</content>")
	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+" />")
	print("\t\t<shortdesc lang=\"en\">" + shortdesc + "</shortdesc>")
	print("\t</parameter>")
	print("</parameters>")
	print("<actions>")

	(available_actions, _) = _get_available_actions(avail_opt)

	if "on" in available_actions:
	available_actions.remove("on")
	on_target = ' on_target="1"' if avail_opt.count("on_target") else ''
	print("\t<action name=\"on\"%s automatic=\"%d\"/>" % (on_target, avail_opt.count("fabric_fencing")))

	for action in available_actions:
	print("\t<action name=\"%s\" />" % (action))
	print("</actions>")
	print("</resource-agent>")

	def process_input(avail_opt):
	avail_opt.extend(_add_dependency_options(avail_opt))

	# @todo: this should be put elsewhere?
	os.putenv("LANG", "C")
	os.putenv("LC_ALL", "C")

	if "port_as_ip" in avail_opt:
	avail_opt.append("port")

	if len(sys.argv) > 1:
	opt = _parse_input_cmdline(avail_opt)
	else:
	opt = _parse_input_stdin(avail_opt)

	if "--port-as-ip" in opt and "--plug" in opt:
	opt["--ip"] = opt["--plug"]

	return opt

	##
	## This function checks input and answers if we want to have same answers
	## in each of the fencing agents. It looks for possible errors and run
	## password script to set a correct password
	######
	def check_input(device_opt, opt, other_conditions = False):
	device_opt.extend(_add_dependency_options(device_opt))

	options = dict(opt)
	options["device_opt"] = device_opt

	_update_metadata(options)
	options = _set_default_values(options)
	options["--action"] = options["--action"].lower()

	## In special cases (show help, metadata or version) we don't need to check anything
	#####
	# OCF compatibility
	if options["--action"] == "meta-data":
	options["--action"] = "metadata"

	if options["--action"] in ["metadata", "manpage"] or any(k in options for k in ("--help", "--version")):
	return options

	+ try:
	+ options["--verbose-level"] = int(options["--verbose-level"])
	+ except ValueError:
	+ options["--verbose-level"] = -1
	+
	+ if options["--verbose-level"] < 0:
	+ logging.warning("Parse error: Option 'verbose_level' must "
	+ "be an integer greater than or equal to 0. "
	+ "Setting verbose_level to 0.")
	+ options["--verbose-level"] = 0
	+
	+ if options["--verbose-level"] == 0 and "--verbose" in options:
	+ logging.warning("Parse error: Ignoring option 'verbose' "
	+ "because it conflicts with verbose_level=0")
	+ del options["--verbose"]
	+
	+ if options["--verbose-level"] > 0:
	+ # Ensure verbose key exists
	+ options["--verbose"] = 1
	+
	if "--verbose" in options:
	logging.getLogger().setLevel(logging.DEBUG)

	formatter = logging.Formatter(LOG_FORMAT)

	## add logging to syslog
	logging.getLogger().addHandler(SyslogLibHandler())
	if "--quiet" not in options:
	## add logging to stderr
	stderrHandler = logging.StreamHandler(sys.stderr)
	stderrHandler.setFormatter(formatter)
	logging.getLogger().addHandler(stderrHandler)

	(acceptable_actions, _) = _get_available_actions(device_opt)

	if 1 == device_opt.count("fabric_fencing"):
	acceptable_actions.extend(["enable", "disable"])

	if 0 == acceptable_actions.count(options["--action"]):
	fail_usage("Failed: Unrecognised action '" + options["--action"] + "'")

	## Compatibility layer
	#####
	if options["--action"] == "enable":
	options["--action"] = "on"
	if options["--action"] == "disable":
	options["--action"] = "off"


	if options["--action"] == "validate-all" and not other_conditions:
	if not _validate_input(options, False):
	fail_usage("validate-all failed")
	sys.exit(EC_OK)
	else:
	_validate_input(options, True)

	if "--debug-file" in options:
	try:
	debug_file = logging.FileHandler(options["--debug-file"])
	debug_file.setLevel(logging.DEBUG)
	debug_file.setFormatter(formatter)
	logging.getLogger().addHandler(debug_file)
	except IOError:
	logging.error("Unable to create file %s", options["--debug-file"])
	fail_usage("Failed: Unable to create file " + options["--debug-file"])

	if "--snmp-priv-passwd-script" in options:
	options["--snmp-priv-passwd"] = os.popen(options["--snmp-priv-passwd-script"]).read().rstrip()

	if "--password-script" in options:
	options["--password"] = os.popen(options["--password-script"]).read().rstrip()

	return options

	## Obtain a power status from possibly more than one plug
	## "on" is returned if at least one plug is ON
	######
	def get_multi_power_fn(connection, options, get_power_fn):
	status = "off"
	plugs = options["--plugs"] if "--plugs" in options else [""]

	for plug in plugs:
	try:
	options["--uuid"] = str(uuid.UUID(plug))
	except ValueError:
	pass
	except KeyError:
	pass

	options["--plug"] = plug
	plug_status = get_power_fn(connection, options)
	if plug_status != "off":
	status = plug_status

	return status

	def async_set_multi_power_fn(connection, options, set_power_fn, get_power_fn, retry_attempts):
	plugs = options["--plugs"] if "--plugs" in options else [""]

	for _ in range(retry_attempts):
	for plug in plugs:
	try:
	options["--uuid"] = str(uuid.UUID(plug))
	except ValueError:
	pass
	except KeyError:
	pass

	options["--plug"] = plug
	set_power_fn(connection, options)
	time.sleep(int(options["--power-wait"]))

	for _ in range(int(options["--power-timeout"])):
	if get_multi_power_fn(connection, options, get_power_fn) != options["--action"]:
	time.sleep(1)
	else:
	return True
	return False

	def sync_set_multi_power_fn(connection, options, sync_set_power_fn, retry_attempts):
	success = True
	plugs = options["--plugs"] if "--plugs" in options else [""]

	for plug in plugs:
	try:
	options["--uuid"] = str(uuid.UUID(plug))
	except ValueError:
	pass
	except KeyError:
	pass

	options["--plug"] = plug
	for retry in range(retry_attempts):
	if sync_set_power_fn(connection, options):
	break
	if retry == retry_attempts-1:
	success = False
	time.sleep(int(options["--power-wait"]))

	return success


	def set_multi_power_fn(connection, options, set_power_fn, get_power_fn, sync_set_power_fn, retry_attempts=1):

	if set_power_fn != None:
	if get_power_fn != None:
	return async_set_multi_power_fn(connection, options, set_power_fn, get_power_fn, retry_attempts)
	elif sync_set_power_fn != None:
	return sync_set_multi_power_fn(connection, options, sync_set_power_fn, retry_attempts)

	return False


	def show_docs(options, docs=None):
	device_opt = options["device_opt"]

	if docs == None:
	docs = {}
	docs["shortdesc"] = "Fence agent"
	docs["longdesc"] = ""

	if "--help" in options:
	usage(device_opt)
	sys.exit(0)

	if options.get("--action", "") in ["metadata", "manpage"]:
	if "port_as_ip" in device_opt:
	device_opt.remove("separator")
	metadata(options, device_opt, docs)
	sys.exit(0)

	if "--version" in options:
	print(RELEASE_VERSION)
	sys.exit(0)

	def fence_action(connection, options, set_power_fn, get_power_fn, get_outlet_list=None, reboot_cycle_fn=None, sync_set_power_fn=None):
	result = 0

	try:
	if "--plug" in options:
	options["--plugs"] = options["--plug"].split(",")

	## Process options that manipulate fencing device
	#####
	if (options["--action"] in ["list", "list-status"]) or \
	((options["--action"] == "monitor") and 1 == options["device_opt"].count("port") and \
	0 == options["device_opt"].count("port_as_ip")):

	if 0 == options["device_opt"].count("port"):
	print("N/A")
	elif get_outlet_list == None:
	## @todo: exception?
	## This is just temporal solution, we will remove default value
	## None as soon as all existing agent will support this operation
	print("NOTICE: List option is not working on this device yet")
	else:
	options["--original-action"] = options["--action"]
	options["--action"] = "list"
	outlets = get_outlet_list(connection, options)
	options["--action"] = options["--original-action"]
	del options["--original-action"]

	## keys can be numbers (port numbers) or strings (names of VM, UUID)
	for outlet_id in list(outlets.keys()):
	(alias, status) = outlets[outlet_id]
	if status is None or (not status.upper() in ["ON", "OFF"]):
	status = "UNKNOWN"
	status = status.upper()

	if options["--action"] == "list":
	print(outlet_id + options["--separator"] + alias)
	elif options["--action"] == "list-status":
	print(outlet_id + options["--separator"] + alias + options["--separator"] + status)

	return

	if options["--action"] == "monitor" and not "port" in options["device_opt"] and "no_status" in options["device_opt"]:
	# Unable to do standard monitoring because 'status' action is not available
	return 0

	status = None
	if not "no_status" in options["device_opt"]:
	status = get_multi_power_fn(connection, options, get_power_fn)
	if status != "on" and status != "off":
	fail(EC_STATUS)

	if options["--action"] == status:
	if not (status == "on" and "force_on" in options["device_opt"]):
	print("Success: Already %s" % (status.upper()))
	return 0

	if options["--action"] == "on":
	if set_multi_power_fn(connection, options, set_power_fn, get_power_fn, sync_set_power_fn, 1 + int(options["--retry-on"])):
	print("Success: Powered ON")
	else:
	fail(EC_WAITING_ON)
	elif options["--action"] == "off":
	if set_multi_power_fn(connection, options, set_power_fn, get_power_fn, sync_set_power_fn):
	print("Success: Powered OFF")
	else:
	fail(EC_WAITING_OFF)
	elif options["--action"] == "reboot":
	power_on = False
	if options.get("--method", "").lower() == "cycle" and reboot_cycle_fn is not None:
	for _ in range(1, 1 + int(options["--retry-on"])):
	if reboot_cycle_fn(connection, options):
	power_on = True
	break

	if not power_on:
	fail(EC_TIMED_OUT)

	else:
	if status != "off":
	options["--action"] = "off"
	if not set_multi_power_fn(connection, options, set_power_fn, get_power_fn, sync_set_power_fn):
	fail(EC_WAITING_OFF)

	options["--action"] = "on"

	try:
	power_on = set_multi_power_fn(connection, options, set_power_fn, get_power_fn, sync_set_power_fn, int(options["--retry-on"]))
	except Exception as ex:
	# an error occured during power ON phase in reboot
	# fence action was completed succesfully even in that case
	logging.warning("%s", str(ex))

	# switch back to original action for the case it is used lateron
	options["--action"] = "reboot"

	if power_on == False:
	# this should not fail as node was fenced succesfully
	logging.error('Timed out waiting to power ON\n')

	print("Success: Rebooted")
	elif options["--action"] == "status":
	print("Status: " + status.upper())
	if status.upper() == "OFF":
	result = 2
	elif options["--action"] == "monitor":
	pass
	except pexpect.EOF:
	fail(EC_CONNECTION_LOST)
	except pexpect.TIMEOUT:
	fail(EC_TIMED_OUT)
	except pycurl.error as ex:
	logging.error("%s\n", str(ex))
	fail(EC_TIMED_OUT)
	except socket.timeout as ex:
	logging.error("%s\n", str(ex))
	fail(EC_TIMED_OUT)

	return result

	def fence_login(options, re_login_string=r"(login\s*: )\|((?!Last )Login Name: )\|(username: )\|(User Name :)"):
	run_delay(options)

	if "eol" not in options:
	options["eol"] = "\r\n"

	if "--command-prompt" in options and type(options["--command-prompt"]) is not list:
	options["--command-prompt"] = [options["--command-prompt"]]

	try:
	if "--ssl" in options:
	conn = _open_ssl_connection(options)
	elif "--ssh" in options and "--identity-file" not in options:
	conn = _login_ssh_with_password(options, re_login_string)
	elif "--ssh" in options and "--identity-file" in options:
	conn = _login_ssh_with_identity_file(options)
	else:
	conn = _login_telnet(options, re_login_string)
	except pexpect.EOF as exception:
	logging.debug("%s", str(exception))
	fail(EC_LOGIN_DENIED)
	except pexpect.TIMEOUT as exception:
	logging.debug("%s", str(exception))
	fail(EC_LOGIN_DENIED)
	return conn

	def is_executable(path):
	if os.path.exists(path):
	stats = os.stat(path)
	if stat.S_ISREG(stats.st_mode) and os.access(path, os.X_OK):
	return True
	return False

	def run_command(options, command, timeout=None, env=None, log_command=None):
	if timeout is None and "--power-timeout" in options:
	timeout = options["--power-timeout"]
	if timeout is not None:
	timeout = float(timeout)

	logging.info("Executing: %s\n", log_command or command)

	try:
	process = subprocess.Popen(shlex.split(command), stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env,
	# decodes newlines and in python3 also converts bytes to str
	universal_newlines=(sys.version_info[0] > 2))
	except OSError:
	fail_usage("Unable to run %s\n" % command)

	thread = threading.Thread(target=process.wait)
	thread.start()
	thread.join(timeout)
	if thread.is_alive():
	process.kill()
	fail(EC_TIMED_OUT, stop=(int(options.get("retry", 0)) < 1))

	status = process.wait()

	(pipe_stdout, pipe_stderr) = process.communicate()
	process.stdout.close()
	process.stderr.close()

	logging.debug("%s %s %s\n", str(status), str(pipe_stdout), str(pipe_stderr))

	return (status, pipe_stdout, pipe_stderr)

	def run_delay(options, reserve=0, result=0):
	## Delay is important for two-node clusters fencing
	## but we do not need to delay 'status' operations
	## and get us out quickly if we already know that we are gonna fail
	## still wanna do something right before fencing? - reserve some time
	if options["--action"] in ["off", "reboot"] \
	and options["--delay"] != "0" \
	and result == 0 \
	and reserve >= 0:
	time_left = 1 + int(options["--delay"]) - (time.time() - run_delay.time_start) - reserve
	if time_left > 0:
	logging.info("Delay %d second(s) before logging in to the fence device", time_left)
	time.sleep(time_left)
	# mark time when fence-agent is started
	run_delay.time_start = time.time()

	def fence_logout(conn, logout_string, sleep=0):
	# Logout is not required part of fencing but we should attempt to do it properly
	# In some cases our 'exit' command is faster and we can not close connection as it
	# was already closed by fencing device
	try:
	conn.send_eol(logout_string)
	time.sleep(sleep)
	conn.close()
	except OSError:
	pass
	except pexpect.ExceptionPexpect:
	pass

	# Convert array of format [[key1, value1], [key2, value2], ... [keyN, valueN]] to dict, where key is
	# in format a.b.c.d...z and returned dict has key only z
	def array_to_dict(array):
	return dict([[x[0].split(".")[-1], x[1]] for x in array])

	## Own logger handler that uses old-style syslog handler as otherwise everything is sourced
	## from /dev/syslog
	class SyslogLibHandler(logging.StreamHandler):
	"""
	A handler class that correctly push messages into syslog
	"""
	def emit(self, record):
	syslog_level = {
	logging.CRITICAL:syslog.LOG_CRIT,
	logging.ERROR:syslog.LOG_ERR,
	logging.WARNING:syslog.LOG_WARNING,
	logging.INFO:syslog.LOG_INFO,
	logging.DEBUG:syslog.LOG_DEBUG,
	logging.NOTSET:syslog.LOG_DEBUG,
	}[record.levelno]

	msg = self.format(record)

	# syslos.syslog can not have 0x00 character inside or exception is thrown
	syslog.syslog(syslog_level, msg.replace("\x00", "\n"))
	return

	def _open_ssl_connection(options):
	gnutls_opts = ""
	ssl_opts = ""

	if "--notls" in options:
	gnutls_opts = "--priority \"NORMAL:-VERS-TLS1.2:-VERS-TLS1.1:-VERS-TLS1.0:+VERS-SSL3.0\""
	elif "--tls1.0" in options:
	gnutls_opts = "--priority \"NORMAL:-VERS-TLS1.2:-VERS-TLS1.1:+VERS-TLS1.0:%LATEST_RECORD_VERSION\""

	# --ssl is same as the --ssl-secure; it means we want to verify certificate in these cases
	if "--ssl-insecure" in options:
	ssl_opts = "--insecure"

	command = '%s %s %s --crlf -p %s %s' % \
	(options["--gnutlscli-path"], gnutls_opts, ssl_opts, options["--ipport"], options["--ip"])
	try:
	conn = fspawn(options, command)
	except pexpect.ExceptionPexpect as ex:
	logging.error("%s\n", str(ex))
	sys.exit(EC_GENERIC_ERROR)

	return conn

	def _login_ssh_with_identity_file(options):
	if "--inet6-only" in options:
	force_ipvx = "-6 "
	elif "--inet4-only" in options:
	force_ipvx = "-4 "
	else:
	force_ipvx = ""

	command = '%s %s %s@%s -i %s -p %s' % \
	(options["--ssh-path"], force_ipvx, options["--username"], options["--ip"], \
	options["--identity-file"], options["--ipport"])
	if "--ssh-options" in options:
	command += ' ' + options["--ssh-options"]

	conn = fspawn(options, command)

	result = conn.log_expect(["Enter passphrase for key '" + options["--identity-file"] + "':", \
	"Are you sure you want to continue connecting (yes/no)?"] + \
	options["--command-prompt"], int(options["--login-timeout"]))
	if result == 1:
	conn.sendline("yes")
	result = conn.log_expect(
	["Enter passphrase for key '" + options["--identity-file"]+"':"] + \
	options["--command-prompt"], int(options["--login-timeout"]))
	if result == 0:
	if "--password" in options:
	conn.sendline(options["--password"])
	conn.log_expect(options["--command-prompt"], int(options["--login-timeout"]))
	else:
	fail_usage("Failed: You have to enter passphrase (-p) for identity file")

	return conn

	def _login_telnet(options, re_login_string):
	re_login = re.compile(re_login_string, re.IGNORECASE)
	re_pass = re.compile("(password)\|(pass phrase)", re.IGNORECASE)

	conn = fspawn(options, options["--telnet-path"])
	conn.send("set binary\n")
	conn.send("open %s -%s\n"%(options["--ip"], options["--ipport"]))

	conn.log_expect(re_login, int(options["--login-timeout"]))
	conn.send_eol(options["--username"])

	## automatically change end of line separator
	screen = conn.read_nonblocking(size=100, timeout=int(options["--shell-timeout"]))
	if re_login.search(screen) != None:
	options["eol"] = "\n"
	conn.send_eol(options["--username"])
	conn.log_expect(re_pass, int(options["--login-timeout"]))
	elif re_pass.search(screen) == None:
	conn.log_expect(re_pass, int(options["--shell-timeout"]))

	try:
	conn.send_eol(options["--password"])
	valid_password = conn.log_expect([re_login] + \
	options["--command-prompt"], int(options["--shell-timeout"]))
	if valid_password == 0:
	## password is invalid or we have to change EOL separator
	options["eol"] = "\r"
	conn.send_eol("")
	screen = conn.read_nonblocking(size=100, timeout=int(options["--shell-timeout"]))
	## after sending EOL the fence device can either show 'Login' or 'Password'
	if re_login.search(conn.after + screen) != None:
	conn.send_eol("")
	conn.send_eol(options["--username"])
	conn.log_expect(re_pass, int(options["--login-timeout"]))
	conn.send_eol(options["--password"])
	conn.log_expect(options["--command-prompt"], int(options["--login-timeout"]))
	except KeyError:
	fail(EC_PASSWORD_MISSING)

	return conn

	def _login_ssh_with_password(options, re_login_string):
	re_login = re.compile(re_login_string, re.IGNORECASE)
	re_pass = re.compile("(password)\|(pass phrase)", re.IGNORECASE)

	if "--inet6-only" in options:
	force_ipvx = "-6 "
	elif "--inet4-only" in options:
	force_ipvx = "-4 "
	else:
	force_ipvx = ""

	command = '%s %s %s@%s -p %s -o PubkeyAuthentication=no' % \
	(options["--ssh-path"], force_ipvx, options["--username"], options["--ip"], options["--ipport"])
	if "--ssh-options" in options:
	command += ' ' + options["--ssh-options"]

	conn = fspawn(options, command)

	if "telnet_over_ssh" in options:
	# This is for stupid ssh servers (like ALOM) which behave more like telnet
	# (ignore name and display login prompt)
	result = conn.log_expect( \
	[re_login, "Are you sure you want to continue connecting (yes/no)?"],
	int(options["--login-timeout"]))
	if result == 1:
	conn.sendline("yes") # Host identity confirm
	conn.log_expect(re_login, int(options["--login-timeout"]))

	conn.sendline(options["--username"])
	conn.log_expect(re_pass, int(options["--login-timeout"]))
	else:
	result = conn.log_expect( \
	["ssword:", "Are you sure you want to continue connecting (yes/no)?"],
	int(options["--login-timeout"]))
	if result == 1:
	conn.sendline("yes")
	conn.log_expect("ssword:", int(options["--login-timeout"]))

	conn.sendline(options["--password"])
	conn.log_expect(options["--command-prompt"], int(options["--login-timeout"]))

	return conn

	#
	# To update metadata, we change values in all_opt
	def _update_metadata(options):
	device_opt = options["device_opt"]

	if device_opt.count("login") and device_opt.count("no_login") == 0:
	all_opt["login"]["required"] = "1"
	else:
	all_opt["login"]["required"] = "0"

	if device_opt.count("port_as_ip"):
	all_opt["ipaddr"]["required"] = "0"
	all_opt["port"]["required"] = "0"

	(available_actions, default_value) = _get_available_actions(device_opt)
	all_opt["action"]["default"] = default_value

	actions_with_default = \
	[x if not x == all_opt["action"]["default"] else x + " (default)" for x in available_actions]
	all_opt["action"]["help"] = \
	"-o, --action=[action] Action: %s" % (_join_wrap(actions_with_default, last_separator=" or "))

	if device_opt.count("ipport"):
	default_value = None
	default_string = None

	if "default" in all_opt["ipport"]:
	default_value = all_opt["ipport"]["default"]
	elif device_opt.count("web") and device_opt.count("ssl"):
	default_value = "80"
	default_string = "(default 80, 443 if --ssl option is used)"
	elif device_opt.count("telnet") and device_opt.count("secure"):
	default_value = "23"
	default_string = "(default 23, 22 if --ssh option is used)"
	else:
	tcp_ports = {"community" : "161", "secure" : "22", "telnet" : "23", "web" : "80", "ssl" : "443"}
	# all cases where next command returns multiple results are covered by previous blocks
	protocol = [x for x in ["community", "secure", "ssl", "web", "telnet"] if device_opt.count(x)][0]
	default_value = tcp_ports[protocol]

	if default_string is None:
	all_opt["ipport"]["help"] = "-u, --ipport=[port] TCP/UDP port to use (default %s)" % \
	(default_value)
	else:
	all_opt["ipport"]["help"] = "-u, --ipport=[port] TCP/UDP port to use\n" + " "*40 + default_string

	def _set_default_values(options):
	if "ipport" in options["device_opt"]:
	if not "--ipport" in options:
	if "default" in all_opt["ipport"]:
	options["--ipport"] = all_opt["ipport"]["default"]
	elif "community" in options["device_opt"]:
	options["--ipport"] = "161"
	elif "--ssh" in options or all_opt["secure"].get("default", "0") == "1":
	options["--ipport"] = "22"
	elif "--ssl" in options or all_opt["ssl"].get("default", "0") == "1":
	options["--ipport"] = "443"
	elif "--ssl-secure" in options or all_opt["ssl_secure"].get("default", "0") == "1":
	options["--ipport"] = "443"
	elif "--ssl-insecure" in options or all_opt["ssl_insecure"].get("default", "0") == "1":
	options["--ipport"] = "443"
	elif "web" in options["device_opt"]:
	options["--ipport"] = "80"
	elif "telnet" in options["device_opt"]:
	options["--ipport"] = "23"

	if "--ipport" in options:
	all_opt["ipport"]["default"] = options["--ipport"]

	for opt in options["device_opt"]:
	if "default" in all_opt[opt] and not opt == "ipport":
	getopt_long = "--" + all_opt[opt]["longopt"]
	if getopt_long not in options:
	options[getopt_long] = all_opt[opt]["default"]

	return options

	# stop = True/False : exit fence agent when problem is encountered
	def _validate_input(options, stop = True):
	device_opt = options["device_opt"]
	valid_input = True

	if "--username" not in options and \
	device_opt.count("login") and (device_opt.count("no_login") == 0):
	valid_input = False
	fail_usage("Failed: You have to set login name", stop)

	if device_opt.count("ipaddr") and "--ip" not in options and "--managed" not in options and "--target" not in options:
	valid_input = False
	fail_usage("Failed: You have to enter fence address", stop)

	if device_opt.count("no_password") == 0:
	if 0 == device_opt.count("identity_file"):
	if not ("--password" in options or "--password-script" in options):
	valid_input = False
	fail_usage("Failed: You have to enter password or password script", stop)
	else:
	if not ("--password" in options or \
	"--password-script" in options or "--identity-file" in options):
	valid_input = False
	fail_usage("Failed: You have to enter password, password script or identity file", stop)

	if "--ssh" not in options and "--identity-file" in options:
	valid_input = False
	fail_usage("Failed: You have to use identity file together with ssh connection (-x)", stop)

	if "--identity-file" in options and not os.path.isfile(options["--identity-file"]):
	valid_input = False
	fail_usage("Failed: Identity file " + options["--identity-file"] + " does not exist", stop)

	if (0 == ["list", "list-status", "monitor"].count(options["--action"])) and \
	"--plug" not in options and device_opt.count("port") and \
	device_opt.count("no_port") == 0 and not device_opt.count("port_as_ip"):
	valid_input = False
	fail_usage("Failed: You have to enter plug number or machine identification", stop)

	if "--plug" in options and len(options["--plug"].split(",")) > 1 and \
	"--method" in options and options["--method"] == "cycle":
	valid_input = False
	fail_usage("Failed: Cannot use --method cycle for more than 1 plug", stop)

	for failed_opt in _get_opts_with_invalid_choices(options):
	valid_input = False
	fail_usage("Failed: You have to enter a valid choice for %s from the valid values: %s" % \
	("--" + all_opt[failed_opt]["longopt"], str(all_opt[failed_opt]["choices"])), stop)

	for failed_opt in _get_opts_with_invalid_types(options):
	valid_input = False
	if all_opt[failed_opt]["type"] == "second":
	fail_usage("Failed: The value you have entered for %s is not a valid time in seconds" % \
	("--" + all_opt[failed_opt]["longopt"]), stop)
	else:
	fail_usage("Failed: The value you have entered for %s is not a valid %s" % \
	("--" + all_opt[failed_opt]["longopt"], all_opt[failed_opt]["type"]), stop)

	return valid_input

	def _encode_html_entities(text):
	return text.replace("&", "&").replace('"', """).replace('<', "<"). \
	replace('>', ">").replace("'", "'")

	def _prepare_getopt_args(options):
	getopt_string = ""
	longopt_list = []
	for k in options:
	if k in all_opt and all_opt[k]["getopt"] != ":":
	# getopt == ":" means that opt is without short getopt, but has value
	getopt_string += all_opt[k]["getopt"]
	elif k not in all_opt:
	fail_usage("Parse error: unknown option '"+k+"'")

	if k in all_opt and "longopt" in all_opt[k]:
	if all_opt[k]["getopt"].endswith(":"):
	longopt_list.append(all_opt[k]["longopt"] + "=")
	else:
	longopt_list.append(all_opt[k]["longopt"])

	return (getopt_string, longopt_list)

	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)
	value = value[:-1]
	value = re.sub("^\"(.*)\"$", "\\1", value)

	if name.replace("-", "_") in mapping_longopt_names:
	name = mapping_longopt_names[name.replace("-", "_")]
	elif name.replace("_", "-") in mapping_longopt_names:
	name = mapping_longopt_names[name.replace("_", "-")]

	if avail_opt.count(name) == 0 and name in ["nodename"]:
	continue
	elif avail_opt.count(name) == 0:
	logging.warning("Parse error: Ignoring unknown option '%s'\n", line)
	continue

	if all_opt[name]["getopt"].endswith(":"):
	opt["--"+all_opt[name]["longopt"].rstrip(":")] = value
	elif value.lower() in ["1", "yes", "on", "true"]:
	opt["--"+all_opt[name]["longopt"]] = "1"
	else:
	logging.warning("Parse error: Ignoring option '%s' because it does not have value\n", name)
	+
	+ opt.setdefault("--verbose-level", opt.get("--verbose", 0))
	+
	return opt

	def _parse_input_cmdline(avail_opt):
	filtered_opts = {}
	_verify_unique_getopt(avail_opt)
	(getopt_string, longopt_list) = _prepare_getopt_args(avail_opt)

	try:
	(entered_opt, left_arg) = getopt.gnu_getopt(sys.argv[1:], getopt_string, longopt_list)
	if len(left_arg) > 0:
	logging.warning("Unused arguments on command line: %s" % (str(left_arg)))
	except getopt.GetoptError as error:
	fail_usage("Parse error: " + error.msg)

	for opt in avail_opt:
	filtered_opts.update({opt : all_opt[opt]})

	# Short and long getopt names are changed to consistent "--" + long name (e.g. --username)
	long_opts = {}
	- for arg_name in list(dict(entered_opt).keys()):
	+ verbose_count = 0
	+ for arg_name in [k for (k, v) in entered_opt]:
	all_key = [key for (key, value) in list(filtered_opts.items()) \
	if "--" + value.get("longopt", "") == arg_name or "-" + value.get("getopt", "").rstrip(":") == arg_name][0]
	long_opts["--" + filtered_opts[all_key]["longopt"]] = dict(entered_opt)[arg_name]
	+ if all_key == "verbose":
	+ verbose_count += 1
	+
	+ long_opts.setdefault("--verbose-level", verbose_count)

	# This test is specific because it does not apply to input on stdin
	if "port_as_ip" in avail_opt and not "--port-as-ip" in long_opts and "--plug" in long_opts:
	fail_usage("Parser error: option -n/--plug is not recognized")

	return long_opts

	# for ["John", "Mary", "Eli"] returns "John, Mary and Eli"
	def _join2(words, normal_separator=", ", last_separator=" and "):
	if len(words) <= 1:
	return "".join(words)
	else:
	return last_separator.join([normal_separator.join(words[:-1]), words[-1]])

	def _join_wrap(words, normal_separator=", ", last_separator=" and ", first_indent=42):
	x = _join2(words, normal_separator, last_separator)
	wrapper = textwrap.TextWrapper()
	wrapper.initial_indent = " "*first_indent
	wrapper.subsequent_indent = " "*40
	wrapper.width = 85
	wrapper.break_on_hyphens = False
	wrapper.break_long_words = False
	wrapped_text = ""
	for line in wrapper.wrap(x):
	wrapped_text += line + "\n"
	return wrapped_text.lstrip().rstrip("\n")

	def _get_opts_with_invalid_choices(options):
	options_failed = []
	device_opt = options["device_opt"]

	for opt in device_opt:
	if "choices" in all_opt[opt]:
	longopt = "--" + all_opt[opt]["longopt"]
	possible_values_upper = [y.upper() for y in all_opt[opt]["choices"]]
	if longopt in options:
	options[longopt] = options[longopt].upper()
	if not options["--" + all_opt[opt]["longopt"]] in possible_values_upper:
	options_failed.append(opt)
	return options_failed

	def _get_opts_with_invalid_types(options):
	options_failed = []
	device_opt = options["device_opt"]

	for opt in device_opt:
	if "type" in all_opt[opt]:
	longopt = "--" + all_opt[opt]["longopt"]
	if longopt in options:
	if all_opt[opt]["type"] in ["integer", "second"]:
	try:
	number = int(options["--" + all_opt[opt]["longopt"]])
	except ValueError:
	options_failed.append(opt)
	return options_failed

	def _verify_unique_getopt(avail_opt):
	used_getopt = set()

	for opt in avail_opt:
	getopt_value = all_opt[opt].get("getopt", "").rstrip(":")
	if getopt_value and getopt_value in used_getopt:
	fail_usage("Short getopt for %s (-%s) is not unique" % (opt, getopt_value))
	else:
	used_getopt.add(getopt_value)

	def _get_available_actions(device_opt):
	available_actions = ["on", "off", "reboot", "status", "list", "list-status", \
	"monitor", "metadata", "manpage", "validate-all"]
	default_value = "reboot"

	if device_opt.count("fabric_fencing"):
	available_actions.remove("reboot")
	default_value = "off"
	if device_opt.count("no_status"):
	available_actions.remove("status")
	if device_opt.count("no_on"):
	available_actions.remove("on")
	if device_opt.count("no_off"):
	available_actions.remove("off")
	if not device_opt.count("separator"):
	available_actions.remove("list")
	available_actions.remove("list-status")
	if device_opt.count("diag"):
	available_actions.append("diag")

	return (available_actions, default_value)
	diff --git a/tests/data/metadata/fence_aliyun.xml b/tests/data/metadata/fence_aliyun.xml
	index 2de3a8aa..8f236806 100644
	--- a/tests/data/metadata/fence_aliyun.xml
	+++ b/tests/data/metadata/fence_aliyun.xml
	@@ -1,119 +1,124 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_aliyun" shortdesc="Fence agent for Aliyun (Aliyun Web Services)" >
	<longdesc>fence_aliyun is an I/O Fencing agent for Aliyun</longdesc>
	<vendor-url>http://www.aliyun.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</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="region" unique="0" required="0">
	<getopt mixed="-r, --region=[name]" />
	<content type="string" />
	<shortdesc lang="en">Region.</shortdesc>
	</parameter>
	<parameter name="access_key" unique="0" required="0">
	<getopt mixed="-a, --access-key=[name]" />
	<content type="string" />
	<shortdesc lang="en">Access Key.</shortdesc>
	</parameter>
	<parameter name="secret_key" unique="0" required="0">
	<getopt mixed="-s, --secret-key=[name]" />
	<content type="string" />
	<shortdesc lang="en">Secret Key.</shortdesc>
	</parameter>
	<parameter name="ram_role" unique="0" required="0">
	<getopt mixed="--ram-role=[name]" />
	<content type="string" />
	<shortdesc lang="en">Ram Role.</shortdesc>
	</parameter>
	<parameter name="quiet" unique="0" required="0">
	<getopt mixed="-q, --quiet" />
	<content type="boolean" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="60" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_alom.xml b/tests/data/metadata/fence_alom.xml
	index d6bb3d5b..ef6c06c3 100644
	--- a/tests/data/metadata/fence_alom.xml
	+++ b/tests/data/metadata/fence_alom.xml
	@@ -1,186 +1,191 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_alom" shortdesc="Fence agent for Sun ALOM" >
	<longdesc>fence_alom is an I/O Fencing agent which can be used with ALOM connected machines.</longdesc>
	<vendor-url>http://www.sun.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="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" 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>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="port_as_ip" unique="0" required="0">
	<getopt mixed="--port-as-ip" />
	<content type="boolean" />
	<shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_amt.xml b/tests/data/metadata/fence_amt.xml
	index 5f0adc98..ee174852 100644
	--- a/tests/data/metadata/fence_amt.xml
	+++ b/tests/data/metadata/fence_amt.xml
	@@ -1,169 +1,174 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_amt" shortdesc="Fence agent for AMT" >
	<longdesc>fence_amt is an I/O Fencing agent which can be used with Intel AMT. This agent calls support software amttool(http://www.kraxel.org/cgit/amtterm/).</longdesc>
	<vendor-url>http://www.intel.com/</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="boot_option" unique="0" required="0">
	<getopt mixed="-b, --boot-option=[option]" />
	<content type="select" >
	<option value="pxe" />
	<option value="hd" />
	<option value="hdsafe" />
	<option value="cd" />
	<option value="diag" />
	</content>
	<shortdesc lang="en">Change the default boot behavior of the machine.</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="integer" default="16994" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	<shortdesc lang="en">Method to fence</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="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="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="quiet" unique="0" required="0">
	<getopt mixed="-q, --quiet" />
	<content type="boolean" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="amttool_path" unique="0" required="0">
	<getopt mixed="--amttool-path=[path]" />
	<shortdesc lang="en">Path to amttool binary</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="port_as_ip" unique="0" required="0">
	<getopt mixed="--port-as-ip" />
	<content type="boolean" />
	<shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="sudo_path" unique="0" required="0">
	<getopt mixed="--sudo-path=[path]" />
	<shortdesc lang="en">Path to sudo binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_amt_ws.xml b/tests/data/metadata/fence_amt_ws.xml
	index 86f36f6c..9c223c8d 100644
	--- a/tests/data/metadata/fence_amt_ws.xml
	+++ b/tests/data/metadata/fence_amt_ws.xml
	@@ -1,151 +1,156 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_amt_ws" shortdesc="Fence agent for AMT (WS)" >
	<longdesc>fence_amt_ws is an I/O Fencing agent which can be used with Intel AMT (WS). This agent requires the pywsman Python library which is included in OpenWSMAN. (http://openwsman.github.io/).</longdesc>
	<vendor-url>http://www.intel.com/</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="boot_option" unique="0" required="0">
	<getopt mixed="-b, --boot-option=[option]" />
	<content type="select" >
	<option value="pxe" />
	<option value="hd" />
	<option value="hdsafe" />
	<option value="cd" />
	<option value="diag" />
	</content>
	<shortdesc lang="en">Change the default boot behavior of the machine.</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="integer" default="16992" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	<shortdesc lang="en">Method to fence</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="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="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="quiet" unique="0" required="0">
	<getopt mixed="-q, --quiet" />
	<content type="boolean" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="port_as_ip" unique="0" required="0">
	<getopt mixed="--port-as-ip" />
	<content type="boolean" />
	<shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_apc.xml b/tests/data/metadata/fence_apc.xml
	index 7330d8bc..efad9db8 100644
	--- a/tests/data/metadata/fence_apc.xml
	+++ b/tests/data/metadata/fence_apc.xml
	@@ -1,197 +1,202 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_apc" shortdesc="Fence agent for APC over telnet/ssh" >
	<longdesc>fence_apc is an I/O Fencing agent which can be used with the APC network power switch. It logs into device via telnet/ssh and reboots a specified outlet. Lengthy telnet/ssh connections should be avoided while a GFS cluster is running because the connection will block any necessary fencing actions.</longdesc>
	<vendor-url>http://www.apc.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="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>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<content type="string" default="-1 -c blowfish" />
	<shortdesc lang="en">SSH options to use</shortdesc>
	</parameter>
	<parameter name="switch" unique="0" required="0">
	<getopt mixed="-s, --switch=[id]" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<shortdesc lang="en">Path to telnet binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_apc_snmp.xml b/tests/data/metadata/fence_apc_snmp.xml
	index 7f1c616c..a1947672 100644
	--- a/tests/data/metadata/fence_apc_snmp.xml
	+++ b/tests/data/metadata/fence_apc_snmp.xml
	@@ -1,206 +1,211 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_apc_snmp" shortdesc="Fence agent for APC, Tripplite PDU over SNMP" >
	<symlink name="fence_tripplite_snmp" shortdesc="Fence agent for Tripplife over SNMP"/>
	<longdesc>fence_apc_snmp is an I/O Fencing agent which can be used with the APC network power switch or Tripplite PDU devices.It logs into a device via SNMP and reboots a specified outlet. It supports SNMP v1, v2c, v3 with all combinations of authenticity/privacy settings.</longdesc>
	<vendor-url>http://www.apc.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="community" unique="0" required="0">
	<getopt mixed="-c, --community=[community]" />
	<content type="string" default="private" />
	<shortdesc lang="en">Set the community string</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="snmp_auth_prot" unique="0" required="0">
	<getopt mixed="-b, --snmp-auth-prot=[prot]" />
	<content type="select" >
	<option value="MD5" />
	<option value="SHA" />
	</content>
	<shortdesc lang="en">Set authentication protocol</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd" unique="0" required="0">
	<getopt mixed="-P, --snmp-priv-passwd=[pass]" />
	<content type="string" />
	<shortdesc lang="en">Set privacy protocol password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd_script" unique="0" required="0">
	<getopt mixed="-R, --snmp-priv-passwd-script" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve privacy password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_prot" unique="0" required="0">
	<getopt mixed="-B, --snmp-priv-prot=[prot]" />
	<content type="select" >
	<option value="DES" />
	<option value="AES" />
	</content>
	<shortdesc lang="en">Set privacy protocol</shortdesc>
	</parameter>
	<parameter name="snmp_sec_level" unique="0" required="0">
	<getopt mixed="-E, --snmp-sec-level=[level]" />
	<content type="select" >
	<option value="noAuthNoPriv" />
	<option value="authNoPriv" />
	<option value="authPriv" />
	</content>
	<shortdesc lang="en">Set security level</shortdesc>
	</parameter>
	<parameter name="snmp_version" unique="0" required="0">
	<getopt mixed="-d, --snmp-version=[version]" />
	<content type="select" default="1" >
	<option value="1" />
	<option value="2c" />
	<option value="3" />
	</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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="snmpget_path" unique="0" required="0">
	<getopt mixed="--snmpget-path=[path]" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<shortdesc lang="en">Path to snmpwalk binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_aws.xml b/tests/data/metadata/fence_aws.xml
	index 12f67322..527fc86c 100644
	--- a/tests/data/metadata/fence_aws.xml
	+++ b/tests/data/metadata/fence_aws.xml
	@@ -1,122 +1,127 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_aws" shortdesc="Fence agent for AWS (Amazon Web Services)" >
	<longdesc>fence_aws is an I/O Fencing agent for AWS (Amazon WebServices). It uses the boto3 library to connect to AWS.

	boto3 can be configured with AWS CLI or by creating ~/.aws/credentials.
	For instructions see: https://boto3.readthedocs.io/en/latest/guide/quickstart.html#configuration</longdesc>
	<vendor-url>http://www.amazon.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</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="region" unique="0" required="0">
	<getopt mixed="-r, --region=[region]" />
	<content type="string" />
	<shortdesc lang="en">Region.</shortdesc>
	</parameter>
	<parameter name="access_key" unique="0" required="0">
	<getopt mixed="-a, --access-key=[key]" />
	<content type="string" />
	<shortdesc lang="en">Access Key.</shortdesc>
	</parameter>
	<parameter name="secret_key" unique="0" required="0">
	<getopt mixed="-s, --secret-key=[key]" />
	<content type="string" />
	<shortdesc lang="en">Secret Key.</shortdesc>
	</parameter>
	<parameter name="boto3_debug" unique="0" required="0">
	<getopt mixed="-b, --boto3_debug=[option]" />
	<content type="string" default="False" />
	<shortdesc lang="en">Boto Lib debug</shortdesc>
	</parameter>
	<parameter name="quiet" unique="0" required="0">
	<getopt mixed="-q, --quiet" />
	<content type="boolean" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="60" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_azure_arm.xml b/tests/data/metadata/fence_azure_arm.xml
	index 7ea672af..42c9952f 100644
	--- a/tests/data/metadata/fence_azure_arm.xml
	+++ b/tests/data/metadata/fence_azure_arm.xml
	@@ -1,179 +1,184 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_azure_arm" shortdesc="Fence agent for Azure Resource Manager" >
	<longdesc>fence_azure_arm is an I/O Fencing agent for Azure Resource Manager. It uses Azure SDK for Python to connect to Azure.

	For instructions to setup credentials see: https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-create-service-principal-portal

	Username and password are application ID and authentication key from "App registrations".

	NOTE: NETWORK FENCING
	Network fencing requires an additional Subnet named "fence-subnet" for the Virtual Network using a Network Security Group with the following rules:
	+-----------+-----+-------------------------+------+------+-----+-----+--------+
	\| DIRECTION \| PRI \| NAME \| PORT \| PROT \| SRC \| DST \| ACTION \|
	+-----------+-----+-------------------------+------+------+-----+-----+--------+
	\| Inbound \| 100 \| FENCE_DENY_ALL_INBOUND \| Any \| Any \| Any \| Any \| Deny \|
	\| Outbound \| 100 \| FENCE_DENY_ALL_OUTBOUND \| Any \| Any \| Any \| Any \| Deny \|
	+-----------+-----+-------------------------+------+------+-----+-----+--------+

	When using network fencing the reboot-action will cause a quick-return once the network has been fenced (instead of waiting for the off-action to succeed). It will check the status during the monitor-action, and request power-on when the shutdown operation is complete.</longdesc>
	<vendor-url>http://www.microsoft.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0" deprecated="1">
	<getopt mixed="-l, --username=[appid]" />
	<content type="string" />
	<shortdesc lang="en">Application ID</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0" deprecated="1">
	<getopt mixed="-p, --password=[authkey]" />
	<content type="string" />
	<shortdesc lang="en">Authentication key</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=[authkey]" />
	<content type="string" />
	<shortdesc lang="en">Authentication key</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="0" obsoletes="login">
	<getopt mixed="-l, --username=[appid]" />
	<content type="string" />
	<shortdesc lang="en">Application ID</shortdesc>
	</parameter>
	<parameter name="resourceGroup" unique="0" required="0">
	<getopt mixed="--resourceGroup=[name]" />
	<content type="string" />
	<shortdesc lang="en">Name of resource group. Metadata service is used if the value is not provided.</shortdesc>
	</parameter>
	<parameter name="tenantId" unique="0" required="0">
	<getopt mixed="--tenantId=[name]" />
	<content type="string" />
	<shortdesc lang="en">Id of Azure Active Directory tenant.</shortdesc>
	</parameter>
	<parameter name="subscriptionId" unique="0" required="0">
	<getopt mixed="--subscriptionId=[name]" />
	<content type="string" />
	<shortdesc lang="en">Id of the Azure subscription. Metadata service is used if the value is not provided.</shortdesc>
	</parameter>
	<parameter name="network-fencing" unique="0" required="0" deprecated="1">
	<getopt mixed="--network-fencing" />
	<content type="boolean" />
	<shortdesc lang="en">Use network fencing. See NOTE-section for configuration.</shortdesc>
	</parameter>
	<parameter name="network_fencing" unique="0" required="0" obsoletes="network-fencing">
	<getopt mixed="--network-fencing" />
	<content type="boolean" />
	<shortdesc lang="en">Use network fencing. See NOTE-section for configuration.</shortdesc>
	</parameter>
	<parameter name="msi" unique="0" required="0">
	<getopt mixed="--msi" />
	<content type="boolean" />
	<shortdesc lang="en">Determines if Managed Service Identity should be used.</shortdesc>
	</parameter>
	<parameter name="cloud" unique="0" required="0">
	<getopt mixed="--cloud=[name]" />
	<content type="string" />
	<shortdesc lang="en">Name of the cloud you want to use.</shortdesc>
	</parameter>
	<parameter name="quiet" unique="0" required="0">
	<getopt mixed="-q, --quiet" />
	<content type="boolean" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="150" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_bladecenter.xml b/tests/data/metadata/fence_bladecenter.xml
	index 0762e43f..f2ee28b1 100644
	--- a/tests/data/metadata/fence_bladecenter.xml
	+++ b/tests/data/metadata/fence_bladecenter.xml
	@@ -1,197 +1,202 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_bladecenter" shortdesc="Fence agent for IBM BladeCenter" >
	<longdesc>fence_bladecenter is an I/O Fencing agent which can be used with IBM Bladecenters with recent enough firmware that includes telnet support. It logs into a Brocade chasis via telnet or ssh and uses the command line interface to power on and off blades.</longdesc>
	<vendor-url>http://www.ibm.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="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>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="missing_as_off" unique="0" required="0">
	<getopt mixed="--missing-as-off" />
	<content type="boolean" />
	<shortdesc lang="en">Missing port returns OFF instead of failure</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="10" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<shortdesc lang="en">Path to telnet binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_brocade.xml b/tests/data/metadata/fence_brocade.xml
	index ef2b9833..f3287503 100644
	--- a/tests/data/metadata/fence_brocade.xml
	+++ b/tests/data/metadata/fence_brocade.xml
	@@ -1,191 +1,196 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_brocade" shortdesc="Fence agent for HP Brocade over telnet/ssh" >
	<longdesc>fence_brocade is an I/O Fencing agent which can be used with Brocade FC switches. It logs into a Brocade switch via telnet and disables a specified port. Disabling the port which a machine is connected to effectively fences that machine. Lengthy telnet connections to the switch should be avoided while a GFS cluster is running because the connection will block any necessary fencing actions. After a fence operation has taken place the fenced machine can no longer connect to the Brocade FC switch. When the fenced machine is ready to be brought back into the GFS cluster (after reboot) the port on the Brocade FC switch needs to be enabled. This can be done by running fence_brocade and specifying the enable action</longdesc>
	<vendor-url>http://www.brocade.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="off" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="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>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<shortdesc lang="en">Path to telnet binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="1"/>
	<action name="off" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_cisco_mds.xml b/tests/data/metadata/fence_cisco_mds.xml
	index 15d7798c..a0e62cba 100644
	--- a/tests/data/metadata/fence_cisco_mds.xml
	+++ b/tests/data/metadata/fence_cisco_mds.xml
	@@ -1,204 +1,209 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_cisco_mds" shortdesc="Fence agent for Cisco MDS" >
	<longdesc>fence_cisco_mds is an I/O Fencing agent which can be used with any Cisco MDS 9000 series with SNMP enabled device.</longdesc>
	<vendor-url>http://www.cisco.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="off" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="community" unique="0" required="0">
	<getopt mixed="-c, --community=[community]" />
	<content type="string" />
	<shortdesc lang="en">Set the community string</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="snmp_auth_prot" unique="0" required="0">
	<getopt mixed="-b, --snmp-auth-prot=[prot]" />
	<content type="select" >
	<option value="MD5" />
	<option value="SHA" />
	</content>
	<shortdesc lang="en">Set authentication protocol</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd" unique="0" required="0">
	<getopt mixed="-P, --snmp-priv-passwd=[pass]" />
	<content type="string" />
	<shortdesc lang="en">Set privacy protocol password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd_script" unique="0" required="0">
	<getopt mixed="-R, --snmp-priv-passwd-script" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve privacy password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_prot" unique="0" required="0">
	<getopt mixed="-B, --snmp-priv-prot=[prot]" />
	<content type="select" >
	<option value="DES" />
	<option value="AES" />
	</content>
	<shortdesc lang="en">Set privacy protocol</shortdesc>
	</parameter>
	<parameter name="snmp_sec_level" unique="0" required="0">
	<getopt mixed="-E, --snmp-sec-level=[level]" />
	<content type="select" >
	<option value="noAuthNoPriv" />
	<option value="authNoPriv" />
	<option value="authPriv" />
	</content>
	<shortdesc lang="en">Set security level</shortdesc>
	</parameter>
	<parameter name="snmp_version" unique="0" required="0">
	<getopt mixed="-d, --snmp-version=[version]" />
	<content type="select" >
	<option value="1" />
	<option value="2c" />
	<option value="3" />
	</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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="snmpget_path" unique="0" required="0">
	<getopt mixed="--snmpget-path=[path]" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<shortdesc lang="en">Path to snmpwalk binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="1"/>
	<action name="off" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_cisco_ucs.xml b/tests/data/metadata/fence_cisco_ucs.xml
	index 848e72f8..f4543f4b 100644
	--- a/tests/data/metadata/fence_cisco_ucs.xml
	+++ b/tests/data/metadata/fence_cisco_ucs.xml
	@@ -1,178 +1,183 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_cisco_ucs" shortdesc="Fence agent for Cisco UCS" >
	<longdesc>fence_cisco_ucs is an I/O Fencing agent which can be used with Cisco UCS to fence machines.</longdesc>
	<vendor-url>http://www.cisco.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="notls" unique="0" required="0">
	<getopt mixed="-t, --notls" />
	<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" 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="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="ssl" unique="0" required="0">
	<getopt mixed="-z, --ssl" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
	</parameter>
	<parameter name="ssl_insecure" unique="0" required="0">
	<getopt mixed="--ssl-insecure" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection without verifying certificate</shortdesc>
	</parameter>
	<parameter name="ssl_secure" unique="0" required="0">
	<getopt mixed="--ssl-secure" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
	</parameter>
	<parameter name="suborg" unique="0" required="0">
	<getopt mixed="--suborg=[path]" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="missing_as_off" unique="0" required="0">
	<getopt mixed="--missing-as-off" />
	<content type="boolean" />
	<shortdesc lang="en">Missing port returns OFF instead of failure</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="gnutlscli_path" unique="0" required="0">
	<getopt mixed="--gnutlscli-path=[path]" />
	<shortdesc lang="en">Path to gnutls-cli binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_compute.xml b/tests/data/metadata/fence_compute.xml
	index 2f183268..a5ce53cd 100644
	--- a/tests/data/metadata/fence_compute.xml
	+++ b/tests/data/metadata/fence_compute.xml
	@@ -1,203 +1,208 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_compute" shortdesc="Fence agent for the automatic resurrection of OpenStack compute instances" >
	<longdesc>Used to tell Nova that compute nodes are down and to reschedule flagged instances</longdesc>
	<vendor-url></vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="off" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="auth_url" unique="0" required="0">
	<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">
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="region_name" unique="0" required="0">
	<getopt mixed="--region-name=[region]" />
	<content type="string" default="" />
	<shortdesc lang="en">Region Name</shortdesc>
	</parameter>
	<parameter name="tenant_name" unique="0" required="0">
	<getopt mixed="-t, --tenant-name=[name]" />
	<content type="string" default="" />
	<shortdesc lang="en">Keystone Admin Tenant or v3 Project</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" />
	<shortdesc lang="en">Allow Insecure TLS Requests</shortdesc>
	</parameter>
	<parameter name="project-domain" unique="0" required="0" deprecated="1">
	<getopt mixed="-P, --project-domain=[name]" />
	<content type="string" default="Default" />
	<shortdesc lang="en">Keystone v3 Project Domain</shortdesc>
	</parameter>
	<parameter name="project_domain" unique="0" required="0" obsoletes="project-domain">
	<getopt mixed="-P, --project-domain=[name]" />
	<content type="string" default="Default" />
	<shortdesc lang="en">Keystone v3 Project Domain</shortdesc>
	</parameter>
	<parameter name="user-domain" unique="0" required="0" deprecated="1">
	<getopt mixed="-u, --user-domain=[name]" />
	<content type="string" default="Default" />
	<shortdesc lang="en">Keystone v3 User Domain</shortdesc>
	</parameter>
	<parameter name="user_domain" unique="0" required="0" obsoletes="user-domain">
	<getopt mixed="-u, --user-domain=[name]" />
	<content type="string" default="Default" />
	<shortdesc lang="en">Keystone v3 User Domain</shortdesc>
	</parameter>
	<parameter name="domain" unique="0" required="0">
	<getopt mixed="-d, --domain=[string]" />
	<content type="string" />
	<shortdesc lang="en">DNS domain in which hosts live</shortdesc>
	</parameter>
	<parameter name="instance_filtering" unique="0" required="0">
	<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">
	<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">
	<getopt mixed="--record-only" />
	<content type="string" default="False" />
	<shortdesc lang="en">Only record the target as needing evacuation</shortdesc>
	</parameter>
	<parameter name="compute-domain" unique="0" required="0" deprecated="1">
	<getopt mixed="--compute-domain=[string]" />
	<content type="string" />
	<shortdesc lang="en">Replaced by domain</shortdesc>
	</parameter>
	<parameter name="compute_domain" unique="0" required="0" obsoletes="compute-domain">
	<getopt mixed="--compute-domain=[string]" />
	<content type="string" />
	<shortdesc lang="en">Replaced by domain</shortdesc>
	</parameter>
	<parameter name="quiet" unique="0" required="0">
	<getopt mixed="-q, --quiet" />
	<content type="boolean" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="180" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="1"/>
	<action name="off" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_docker.xml b/tests/data/metadata/fence_docker.xml
	index 3285314c..6e3306d4 100644
	--- a/tests/data/metadata/fence_docker.xml
	+++ b/tests/data/metadata/fence_docker.xml
	@@ -1,161 +1,166 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_docker" shortdesc="Fence agent for Docker" >
	<longdesc>fence_docker is I/O fencing agent which can be used with the Docker Engine containers. You can use this fence-agent without any authentication, or you can use TLS authentication (use --ssl option, more info about TLS authentication in docker: http://docs.docker.com/examples/https/).</longdesc>
	<vendor-url>www.docker.io</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="integer" default="80" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	<shortdesc lang="en">Method to fence</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="ssl" unique="0" required="0">
	<getopt mixed="-z, --ssl" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
	</parameter>
	<parameter name="ssl_insecure" unique="0" required="0">
	<getopt mixed="--ssl-insecure" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection without verifying certificate</shortdesc>
	</parameter>
	<parameter name="ssl_secure" unique="0" required="0">
	<getopt mixed="--ssl-secure" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
	</parameter>
	<parameter name="api_version" unique="0" required="0">
	<getopt mixed="--api-version" />
	<content type="string" default="1.11" />
	<shortdesc lang="en">Version of Docker Remote API (default: 1.11)</shortdesc>
	</parameter>
	<parameter name="tlscacert" unique="0" required="0">
	<getopt mixed="--tlscacert" />
	<content type="string" />
	<shortdesc lang="en">Path to CA certificate (PEM format) for TLS authentication. Required if --ssl option is used.</shortdesc>
	</parameter>
	<parameter name="tlscert" unique="0" required="0">
	<getopt mixed="--tlscert" />
	<content type="string" />
	<shortdesc lang="en">Path to client certificate (PEM format) for TLS authentication. Required if --ssl option is used.</shortdesc>
	</parameter>
	<parameter name="tlskey" unique="0" required="0">
	<getopt mixed="--tlskey" />
	<content type="string" />
	<shortdesc lang="en">Path to client key (PEM format) for TLS authentication. Required if --ssl option is used.</shortdesc>
	</parameter>
	<parameter name="quiet" unique="0" required="0">
	<getopt mixed="-q, --quiet" />
	<content type="boolean" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="gnutlscli_path" unique="0" required="0">
	<getopt mixed="--gnutlscli-path=[path]" />
	<shortdesc lang="en">Path to gnutls-cli binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_drac.xml b/tests/data/metadata/fence_drac.xml
	index 2184ee0c..451ee504 100644
	--- a/tests/data/metadata/fence_drac.xml
	+++ b/tests/data/metadata/fence_drac.xml
	@@ -1,156 +1,161 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_drac" shortdesc="I/O Fencing agent for Dell DRAC IV" >
	<longdesc>fence_drac is an I/O Fencing agent which can be used with the Dell Remote Access Card (DRAC). This card provides remote access to controlling power to a server. It logs into the DRAC through the telnet interface of the card. By default, the telnet interface is not enabled. To enable the interface, you will need to use the racadm command in the racser-devel rpm available from Dell. To enable telnet on the DRAC: [root]# racadm config -g cfgSerial -o cfgSerialTelnetEnable 1 [root]# racadm racreset </longdesc>
	<vendor-url>http://www.dell.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="port_as_ip" unique="0" required="0">
	<getopt mixed="--port-as-ip" />
	<content type="boolean" />
	<shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<shortdesc lang="en">Path to telnet binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_drac5.xml b/tests/data/metadata/fence_drac5.xml
	index 069f7b00..564008ab 100644
	--- a/tests/data/metadata/fence_drac5.xml
	+++ b/tests/data/metadata/fence_drac5.xml
	@@ -1,201 +1,206 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_drac5" shortdesc="Fence agent for Dell DRAC CMC/5" >
	<longdesc>fence_drac5 is an I/O Fencing agent which can be used with the Dell Remote Access Card v5 or CMC (DRAC). This device provides remote access to controlling power to a server. It logs into the DRAC through the telnet/ssh interface of the card. By default, the telnet interface is not enabled.</longdesc>
	<vendor-url>http://www.dell.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="drac_version" unique="0" required="0">
	<getopt mixed="-d, --drac-version=[version]" />
	<content type="select" >
	<option value="DRAC CMC" />
	<option value="DRAC MC" />
	<option value="DRAC 5" />
	</content>
	<shortdesc lang="en">Force DRAC version to use</shortdesc>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="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>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<shortdesc lang="en">Path to telnet binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_dummy.xml b/tests/data/metadata/fence_dummy.xml
	index 873c565b..ec4d5b46 100644
	--- a/tests/data/metadata/fence_dummy.xml
	+++ b/tests/data/metadata/fence_dummy.xml
	@@ -1,97 +1,102 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_dummy" shortdesc="Dummy fence agent" >
	<longdesc>fence_dummy</longdesc>
	<vendor-url>http://www.example.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="random_sleep_range" unique="0" required="0">
	<getopt mixed="--random_sleep_range=[seconds]" />
	<content type="string" />
	<shortdesc lang="en">Issue a sleep between 1 and X seconds. Used for testing.</shortdesc>
	</parameter>
	<parameter name="status_file" unique="0" required="0">
	<getopt mixed="--status-file=[file]" />
	<content type="string" default="/tmp/fence_dummy.status" />
	<shortdesc lang="en">File with status</shortdesc>
	</parameter>
	<parameter name="type" unique="0" required="0">
	<getopt mixed="--type=[type]" />
	<content type="string" default="file" />
	<shortdesc lang="en">Type of the dummy fence agent</shortdesc>
	</parameter>
	<parameter name="quiet" unique="0" required="0">
	<getopt mixed="-q, --quiet" />
	<content type="boolean" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_eaton_snmp.xml b/tests/data/metadata/fence_eaton_snmp.xml
	index 3dd92dd2..1ec07c68 100644
	--- a/tests/data/metadata/fence_eaton_snmp.xml
	+++ b/tests/data/metadata/fence_eaton_snmp.xml
	@@ -1,205 +1,210 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_eaton_snmp" shortdesc="Fence agent for Eaton over SNMP" >
	<longdesc>fence_eaton_snmp is an I/O Fencing agent which can be used with the Eaton network power switch. It logs into a device via SNMP and reboots a specified outlet. It supports SNMP v1 and v3 with all combinations of authenticity/privacy settings.</longdesc>
	<vendor-url>http://powerquality.eaton.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="community" unique="0" required="0">
	<getopt mixed="-c, --community=[community]" />
	<content type="string" default="private" />
	<shortdesc lang="en">Set the community string</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="snmp_auth_prot" unique="0" required="0">
	<getopt mixed="-b, --snmp-auth-prot=[prot]" />
	<content type="select" >
	<option value="MD5" />
	<option value="SHA" />
	</content>
	<shortdesc lang="en">Set authentication protocol</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd" unique="0" required="0">
	<getopt mixed="-P, --snmp-priv-passwd=[pass]" />
	<content type="string" />
	<shortdesc lang="en">Set privacy protocol password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd_script" unique="0" required="0">
	<getopt mixed="-R, --snmp-priv-passwd-script" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve privacy password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_prot" unique="0" required="0">
	<getopt mixed="-B, --snmp-priv-prot=[prot]" />
	<content type="select" >
	<option value="DES" />
	<option value="AES" />
	</content>
	<shortdesc lang="en">Set privacy protocol</shortdesc>
	</parameter>
	<parameter name="snmp_sec_level" unique="0" required="0">
	<getopt mixed="-E, --snmp-sec-level=[level]" />
	<content type="select" >
	<option value="noAuthNoPriv" />
	<option value="authNoPriv" />
	<option value="authPriv" />
	</content>
	<shortdesc lang="en">Set security level</shortdesc>
	</parameter>
	<parameter name="snmp_version" unique="0" required="0">
	<getopt mixed="-d, --snmp-version=[version]" />
	<content type="select" default="1" >
	<option value="1" />
	<option value="2c" />
	<option value="3" />
	</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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="2" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="snmpget_path" unique="0" required="0">
	<getopt mixed="--snmpget-path=[path]" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<shortdesc lang="en">Path to snmpwalk binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_emerson.xml b/tests/data/metadata/fence_emerson.xml
	index f6886469..fbdcbcde 100644
	--- a/tests/data/metadata/fence_emerson.xml
	+++ b/tests/data/metadata/fence_emerson.xml
	@@ -1,205 +1,210 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_emerson" shortdesc="Fence agent for Emerson over SNMP" >
	<longdesc>fence_emerson is an I/O Fencing agent which can be used with MPX and MPH2 managed rack PDU.</longdesc>
	<vendor-url>http://www.emersonnetworkpower.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="community" unique="0" required="0">
	<getopt mixed="-c, --community=[community]" />
	<content type="string" />
	<shortdesc lang="en">Set the community string</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="snmp_auth_prot" unique="0" required="0">
	<getopt mixed="-b, --snmp-auth-prot=[prot]" />
	<content type="select" >
	<option value="MD5" />
	<option value="SHA" />
	</content>
	<shortdesc lang="en">Set authentication protocol</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd" unique="0" required="0">
	<getopt mixed="-P, --snmp-priv-passwd=[pass]" />
	<content type="string" />
	<shortdesc lang="en">Set privacy protocol password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd_script" unique="0" required="0">
	<getopt mixed="-R, --snmp-priv-passwd-script" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve privacy password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_prot" unique="0" required="0">
	<getopt mixed="-B, --snmp-priv-prot=[prot]" />
	<content type="select" >
	<option value="DES" />
	<option value="AES" />
	</content>
	<shortdesc lang="en">Set privacy protocol</shortdesc>
	</parameter>
	<parameter name="snmp_sec_level" unique="0" required="0">
	<getopt mixed="-E, --snmp-sec-level=[level]" />
	<content type="select" >
	<option value="noAuthNoPriv" />
	<option value="authNoPriv" />
	<option value="authPriv" />
	</content>
	<shortdesc lang="en">Set security level</shortdesc>
	</parameter>
	<parameter name="snmp_version" unique="0" required="0">
	<getopt mixed="-d, --snmp-version=[version]" />
	<content type="select" >
	<option value="1" />
	<option value="2c" />
	<option value="3" />
	</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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="snmpget_path" unique="0" required="0">
	<getopt mixed="--snmpget-path=[path]" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<shortdesc lang="en">Path to snmpwalk binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_eps.xml b/tests/data/metadata/fence_eps.xml
	index 26e75477..47cad6f0 100644
	--- a/tests/data/metadata/fence_eps.xml
	+++ b/tests/data/metadata/fence_eps.xml
	@@ -1,156 +1,161 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_eps" shortdesc="Fence agent for ePowerSwitch" >
	<longdesc>fence_eps is an I/O Fencing agent which can be used with the ePowerSwitch 8M+ power switch to fence connected machines. Fence agent works ONLY on 8M+ device, because this is only one, which has support for hidden page feature.

	Agent basically works by connecting to hidden page and pass appropriate arguments to GET request. This means, that hidden page feature must be enabled and properly configured.</longdesc>
	<vendor-url>http://www.epowerswitch.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<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="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="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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_evacuate.xml b/tests/data/metadata/fence_evacuate.xml
	index 95da0e1b..f32b48eb 100644
	--- a/tests/data/metadata/fence_evacuate.xml
	+++ b/tests/data/metadata/fence_evacuate.xml
	@@ -1,199 +1,204 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_evacuate" shortdesc="Fence agent for the automatic resurrection of OpenStack compute instances" >
	<longdesc>Used to reschedule flagged instances</longdesc>
	<vendor-url></vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="auth_url" unique="0" required="0">
	<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">
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="region_name" unique="0" required="0">
	<getopt mixed="--region-name=[region]" />
	<content type="string" default="" />
	<shortdesc lang="en">Region Name</shortdesc>
	</parameter>
	<parameter name="tenant_name" unique="0" required="0">
	<getopt mixed="-t, --tenant-name=[name]" />
	<content type="string" default="" />
	<shortdesc lang="en">Keystone Admin Tenant or v3 Project</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" />
	<shortdesc lang="en">Allow Insecure TLS Requests</shortdesc>
	</parameter>
	<parameter name="project-domain" unique="0" required="0" deprecated="1">
	<getopt mixed="-P, --project-domain=[name]" />
	<content type="string" default="Default" />
	<shortdesc lang="en">Keystone v3 Project Domain</shortdesc>
	</parameter>
	<parameter name="project_domain" unique="0" required="0" obsoletes="project-domain">
	<getopt mixed="-P, --project-domain=[name]" />
	<content type="string" default="Default" />
	<shortdesc lang="en">Keystone v3 Project Domain</shortdesc>
	</parameter>
	<parameter name="user-domain" unique="0" required="0" deprecated="1">
	<getopt mixed="-u, --user-domain=[name]" />
	<content type="string" default="Default" />
	<shortdesc lang="en">Keystone v3 User Domain</shortdesc>
	</parameter>
	<parameter name="user_domain" unique="0" required="0" obsoletes="user-domain">
	<getopt mixed="-u, --user-domain=[name]" />
	<content type="string" default="Default" />
	<shortdesc lang="en">Keystone v3 User Domain</shortdesc>
	</parameter>
	<parameter name="domain" unique="0" required="0">
	<getopt mixed="-d, --domain=[string]" />
	<content type="string" />
	<shortdesc lang="en">DNS domain in which hosts live</shortdesc>
	</parameter>
	<parameter name="instance_filtering" unique="0" required="0">
	<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">
	<getopt mixed="--no-shared-storage" />
	<content type="boolean" default="False" />
	<shortdesc lang="en">Disable functionality for dealing with shared storage</shortdesc>
	</parameter>
	<parameter name="compute-domain" unique="0" required="0" deprecated="1">
	<getopt mixed="--compute-domain=[string]" />
	<content type="string" />
	<shortdesc lang="en">Replaced by domain</shortdesc>
	</parameter>
	<parameter name="compute_domain" unique="0" required="0" obsoletes="compute-domain">
	<getopt mixed="--compute-domain=[string]" />
	<content type="string" />
	<shortdesc lang="en">Replaced by domain</shortdesc>
	</parameter>
	<parameter name="quiet" unique="0" required="0">
	<getopt mixed="-q, --quiet" />
	<content type="boolean" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="180" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_gce.xml b/tests/data/metadata/fence_gce.xml
	index 79b82ebb..3b8a24a4 100644
	--- a/tests/data/metadata/fence_gce.xml
	+++ b/tests/data/metadata/fence_gce.xml
	@@ -1,129 +1,134 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_gce" shortdesc="Fence agent for GCE (Google Cloud Engine)" >
	<longdesc>fence_gce is an I/O Fencing agent for GCE (Google Cloud Engine). It uses the googleapiclient library to connect to GCE.
	googleapiclient can be configured with Google SDK CLI or by executing 'gcloud auth application-default login'.
	For instructions see: https://cloud.google.com/compute/docs/tutorials/python-guide</longdesc>
	<vendor-url>http://cloud.google.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="cycle" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	<shortdesc lang="en">Method to fence</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="zone" unique="0" required="0">
	<getopt mixed="--zone=[name]" />
	<content type="string" />
	<shortdesc lang="en">Zone.</shortdesc>
	</parameter>
	<parameter name="project" unique="0" required="0">
	<getopt mixed="--project=[name]" />
	<content type="string" />
	<shortdesc lang="en">Project ID.</shortdesc>
	</parameter>
	<parameter name="stackdriver-logging" unique="0" required="0" deprecated="1">
	<getopt mixed="--stackdriver-logging" />
	<content type="boolean" />
	<shortdesc lang="en">Stackdriver-logging support.</shortdesc>
	</parameter>
	<parameter name="stackdriver_logging" unique="0" required="0" obsoletes="stackdriver-logging">
	<getopt mixed="--stackdriver-logging" />
	<content type="boolean" />
	<shortdesc lang="en">Stackdriver-logging support.</shortdesc>
	</parameter>
	<parameter name="quiet" unique="0" required="0">
	<getopt mixed="-q, --quiet" />
	<content type="boolean" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="60" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_hds_cb.xml b/tests/data/metadata/fence_hds_cb.xml
	index 71cfd8ed..5529472d 100644
	--- a/tests/data/metadata/fence_hds_cb.xml
	+++ b/tests/data/metadata/fence_hds_cb.xml
	@@ -1,197 +1,202 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_hds_cb" shortdesc="Fence agent for Hitachi Compute Blade systems" >
	<longdesc>fence_hds_cb is an I/O Fencing agent which can be used with Hitachi Compute Blades with recent enough firmware that includes telnet support.</longdesc>
	<vendor-url>http://www.hds.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="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>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="missing_as_off" unique="0" required="0">
	<getopt mixed="--missing-as-off" />
	<content type="boolean" />
	<shortdesc lang="en">Missing port returns OFF instead of failure</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<shortdesc lang="en">Path to telnet binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_heuristics_ping.xml b/tests/data/metadata/fence_heuristics_ping.xml
	index 3dbceeb2..53e3bb05 100644
	--- a/tests/data/metadata/fence_heuristics_ping.xml
	+++ b/tests/data/metadata/fence_heuristics_ping.xml
	@@ -1,121 +1,126 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_heuristics_ping" shortdesc="Fence agent for ping-heuristic based fencing" >
	<longdesc>fence_heuristics_ping uses ping-heuristics to control execution of another fence agent on the same fencing level.

	This is not a fence agent by itself! Its only purpose is to enable/disable another fence agent that lives on the same fencing level but after fence_heuristics_ping.</longdesc>
	<vendor-url></vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="cycle" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	<shortdesc lang="en">Method to fence</shortdesc>
	</parameter>
	<parameter name="ping_count" unique="0" required="0">
	<getopt mixed="--ping-count=[number]" />
	<content type="string" default="10" />
	<shortdesc lang="en">The number of ping-probes that is being sent per target</shortdesc>
	</parameter>
	<parameter name="ping_good_count" unique="0" required="0">
	<getopt mixed="--ping-good-count=[number]" />
	<content type="string" default="8" />
	<shortdesc lang="en">The number of positive ping-probes required to account a target as available</shortdesc>
	</parameter>
	<parameter name="ping_interval" unique="0" required="0">
	<getopt mixed="--ping-interval=[seconds]" />
	<content type="string" default="1" />
	<shortdesc lang="en">The interval in seconds between ping-probes</shortdesc>
	</parameter>
	<parameter name="ping_maxfail" unique="0" required="0">
	<getopt mixed="--ping-maxfail=[number]" />
	<content type="string" default="0" />
	<shortdesc lang="en">The number of failed ping-targets to still account as overall success</shortdesc>
	</parameter>
	<parameter name="ping_targets" unique="0" required="1">
	<getopt mixed="--ping-targets=tgt1,[inet6:]tgt2" />
	<content type="string" default="" />
	<shortdesc lang="en">A comma separated list of ping-targets (optionally prepended by 'inet:' or 'inet6:') to be probed</shortdesc>
	</parameter>
	<parameter name="ping_timeout" unique="0" required="0">
	<getopt mixed="--ping-timeout=[seconds]" />
	<content type="string" default="2" />
	<shortdesc lang="en">The timeout in seconds till an individual ping-probe is accounted as lost</shortdesc>
	</parameter>
	<parameter name="quiet" unique="0" required="0">
	<getopt mixed="-q, --quiet" />
	<content type="boolean" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_hpblade.xml b/tests/data/metadata/fence_hpblade.xml
	index 6cdc73ed..bbb51668 100644
	--- a/tests/data/metadata/fence_hpblade.xml
	+++ b/tests/data/metadata/fence_hpblade.xml
	@@ -1,197 +1,202 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_hpblade" shortdesc="Fence agent for HP BladeSystem" >
	<longdesc>fence_hpblade is an I/O Fencing agent which can be used with HP BladeSystem and HP Integrity Superdome X. It logs into the onboard administrator of an enclosure via telnet or ssh and uses the command line interface to power blades or partitions on or off.</longdesc>
	<vendor-url>http://www.hp.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="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>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="10" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="missing_as_off" unique="0" required="0">
	<getopt mixed="--missing-as-off" />
	<content type="boolean" />
	<shortdesc lang="en">Missing port returns OFF instead of failure</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<shortdesc lang="en">Path to telnet binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ibmblade.xml b/tests/data/metadata/fence_ibmblade.xml
	index 5084b3a0..6585c4fb 100644
	--- a/tests/data/metadata/fence_ibmblade.xml
	+++ b/tests/data/metadata/fence_ibmblade.xml
	@@ -1,205 +1,210 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ibmblade" shortdesc="Fence agent for IBM BladeCenter over SNMP" >
	<longdesc>fence_ibmblade is an I/O Fencing agent which can be used with IBM BladeCenter chassis. It issues SNMP Set request to BladeCenter chassis, rebooting, powering up or down the specified Blade Server.</longdesc>
	<vendor-url>http://www.ibm.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="community" unique="0" required="0">
	<getopt mixed="-c, --community=[community]" />
	<content type="string" />
	<shortdesc lang="en">Set the community string</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="snmp_auth_prot" unique="0" required="0">
	<getopt mixed="-b, --snmp-auth-prot=[prot]" />
	<content type="select" >
	<option value="MD5" />
	<option value="SHA" />
	</content>
	<shortdesc lang="en">Set authentication protocol</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd" unique="0" required="0">
	<getopt mixed="-P, --snmp-priv-passwd=[pass]" />
	<content type="string" />
	<shortdesc lang="en">Set privacy protocol password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd_script" unique="0" required="0">
	<getopt mixed="-R, --snmp-priv-passwd-script" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve privacy password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_prot" unique="0" required="0">
	<getopt mixed="-B, --snmp-priv-prot=[prot]" />
	<content type="select" >
	<option value="DES" />
	<option value="AES" />
	</content>
	<shortdesc lang="en">Set privacy protocol</shortdesc>
	</parameter>
	<parameter name="snmp_sec_level" unique="0" required="0">
	<getopt mixed="-E, --snmp-sec-level=[level]" />
	<content type="select" >
	<option value="noAuthNoPriv" />
	<option value="authNoPriv" />
	<option value="authPriv" />
	</content>
	<shortdesc lang="en">Set security level</shortdesc>
	</parameter>
	<parameter name="snmp_version" unique="0" required="0">
	<getopt mixed="-d, --snmp-version=[version]" />
	<content type="select" default="1" >
	<option value="1" />
	<option value="2c" />
	<option value="3" />
	</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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="snmpget_path" unique="0" required="0">
	<getopt mixed="--snmpget-path=[path]" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<shortdesc lang="en">Path to snmpwalk binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_idrac.xml b/tests/data/metadata/fence_idrac.xml
	index 55d9ced3..efecc720 100644
	--- a/tests/data/metadata/fence_idrac.xml
	+++ b/tests/data/metadata/fence_idrac.xml
	@@ -1,218 +1,223 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_idrac" shortdesc="Fence agent for IPMI" >
	<symlink name="fence_ilo3" shortdesc="Fence agent for HP iLO3"/>
	<symlink name="fence_ilo4" shortdesc="Fence agent for HP iLO4"/>
	<symlink name="fence_ilo5" shortdesc="Fence agent for HP iLO5"/>
	<symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/>
	<symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/>
	<longdesc>fence_ipmilan is an I/O Fencing agentwhich can be used with machines controlled by IPMI.This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
	<vendor-url></vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="auth" unique="0" required="0">
	<getopt mixed="-A, --auth=[auth]" />
	<content type="select" >
	<option value="md5" />
	<option value="password" />
	<option value="none" />
	</content>
	<shortdesc lang="en">IPMI Lan Auth type.</shortdesc>
	</parameter>
	<parameter name="cipher" unique="0" required="0">
	<getopt mixed="-C, --cipher=[cipher]" />
	<content type="string" />
	<shortdesc lang="en">Ciphersuite to use (same as ipmitool -C parameter)</shortdesc>
	</parameter>
	<parameter name="hexadecimal_kg" unique="0" required="0">
	<getopt mixed="--hexadecimal-kg=[key]" />
	<content type="string" />
	<shortdesc lang="en">Hexadecimal-encoded Kg key for IPMIv2 authentication</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="integer" default="623" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="lanplus" unique="0" required="0">
	<getopt mixed="-P, --lanplus" />
	<content type="boolean" default="0" />
	<shortdesc lang="en">Use Lanplus to improve security of connection</shortdesc>
	</parameter>
	<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="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	<shortdesc lang="en">Method to fence</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="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="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="privlvl" unique="0" required="0">
	<getopt mixed="-L, --privlvl=[level]" />
	<content type="select" default="administrator" >
	<option value="callback" />
	<option value="user" />
	<option value="operator" />
	<option value="administrator" />
	</content>
	<shortdesc lang="en">Privilege level on IPMI device</shortdesc>
	</parameter>
	<parameter name="target" unique="0" required="0">
	<getopt mixed="--target=[targetaddress]" />
	<content type="string" />
	<shortdesc lang="en">Bridge IPMI requests to the remote target address</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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="ipmitool_path" unique="0" required="0">
	<getopt mixed="--ipmitool-path=[path]" />
	<shortdesc lang="en">Path to ipmitool binary</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="port_as_ip" unique="0" required="0">
	<getopt mixed="--port-as-ip" />
	<content type="boolean" />
	<shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="2" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="ipmitool_timeout" unique="0" required="0">
	<getopt mixed="--ipmitool-timeout=[timeout]" />
	<content type="string" default="2" />
	<shortdesc lang="en">Timeout (sec) for IPMI operation</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="sudo_path" unique="0" required="0">
	<getopt mixed="--sudo-path=[path]" />
	<shortdesc lang="en">Path to sudo binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	<action name="diag" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ifmib.xml b/tests/data/metadata/fence_ifmib.xml
	index c07a6e1f..93bd8aa3 100644
	--- a/tests/data/metadata/fence_ifmib.xml
	+++ b/tests/data/metadata/fence_ifmib.xml
	@@ -1,206 +1,211 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ifmib" shortdesc="Fence agent for IF MIB" >
	<longdesc>fence_ifmib is an I/O Fencing agent which can be used with any SNMP IF-MIB capable device.

	It was written with managed ethernet switches in mind, in order to fence iSCSI SAN connections. However, there are many devices that support the IF-MIB interface. The agent uses IF-MIB::ifAdminStatus to control the state of an interface.</longdesc>
	<vendor-url>http://www.ietf.org/wg/concluded/ifmib.html</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="off" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="community" unique="0" required="0">
	<getopt mixed="-c, --community=[community]" />
	<content type="string" />
	<shortdesc lang="en">Set the community string</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="snmp_auth_prot" unique="0" required="0">
	<getopt mixed="-b, --snmp-auth-prot=[prot]" />
	<content type="select" >
	<option value="MD5" />
	<option value="SHA" />
	</content>
	<shortdesc lang="en">Set authentication protocol</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd" unique="0" required="0">
	<getopt mixed="-P, --snmp-priv-passwd=[pass]" />
	<content type="string" />
	<shortdesc lang="en">Set privacy protocol password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd_script" unique="0" required="0">
	<getopt mixed="-R, --snmp-priv-passwd-script" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve privacy password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_prot" unique="0" required="0">
	<getopt mixed="-B, --snmp-priv-prot=[prot]" />
	<content type="select" >
	<option value="DES" />
	<option value="AES" />
	</content>
	<shortdesc lang="en">Set privacy protocol</shortdesc>
	</parameter>
	<parameter name="snmp_sec_level" unique="0" required="0">
	<getopt mixed="-E, --snmp-sec-level=[level]" />
	<content type="select" >
	<option value="noAuthNoPriv" />
	<option value="authNoPriv" />
	<option value="authPriv" />
	</content>
	<shortdesc lang="en">Set security level</shortdesc>
	</parameter>
	<parameter name="snmp_version" unique="0" required="0">
	<getopt mixed="-d, --snmp-version=[version]" />
	<content type="select" default="2c" >
	<option value="1" />
	<option value="2c" />
	<option value="3" />
	</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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="snmpget_path" unique="0" required="0">
	<getopt mixed="--snmpget-path=[path]" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<shortdesc lang="en">Path to snmpwalk binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="1"/>
	<action name="off" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo.xml b/tests/data/metadata/fence_ilo.xml
	index 44b3c43a..7ed91061 100644
	--- a/tests/data/metadata/fence_ilo.xml
	+++ b/tests/data/metadata/fence_ilo.xml
	@@ -1,182 +1,187 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ilo" shortdesc="Fence agent for HP iLO" >
	<symlink name="fence_ilo2" shortdesc="Fence agent for HP iLO2"/>
	<longdesc>fence_ilo is an I/O Fencing agent used for HP servers with the Integrated Light Out (iLO) PCI card.The agent opens an SSL connection to the iLO card. Once the SSL connection is established, the agent is able to communicate with the iLO card through an XML stream.</longdesc>
	<vendor-url>http://www.hp.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="notls" unique="0" required="0">
	<getopt mixed="-t, --notls" />
	<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" 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="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="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" 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>
	</parameter>
	<parameter name="ssl" unique="0" required="0">
	<getopt mixed="-z, --ssl" />
	<content type="boolean" default="1" />
	<shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
	</parameter>
	<parameter name="ssl_insecure" unique="0" required="0">
	<getopt mixed="--ssl-insecure" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection without verifying certificate</shortdesc>
	</parameter>
	<parameter name="ssl_secure" unique="0" required="0">
	<getopt mixed="--ssl-secure" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
	</parameter>
	<parameter name="tls1.0" unique="0" required="0">
	<getopt mixed="--tls1.0" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="10" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="port_as_ip" unique="0" required="0">
	<getopt mixed="--port-as-ip" />
	<content type="boolean" />
	<shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="3" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="gnutlscli_path" unique="0" required="0">
	<getopt mixed="--gnutlscli-path=[path]" />
	<shortdesc lang="en">Path to gnutls-cli binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo2.xml b/tests/data/metadata/fence_ilo2.xml
	index e9cae6d2..5527cf21 100644
	--- a/tests/data/metadata/fence_ilo2.xml
	+++ b/tests/data/metadata/fence_ilo2.xml
	@@ -1,182 +1,187 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ilo2" shortdesc="Fence agent for HP iLO" >
	<symlink name="fence_ilo2" shortdesc="Fence agent for HP iLO2"/>
	<longdesc>fence_ilo is an I/O Fencing agent used for HP servers with the Integrated Light Out (iLO) PCI card.The agent opens an SSL connection to the iLO card. Once the SSL connection is established, the agent is able to communicate with the iLO card through an XML stream.</longdesc>
	<vendor-url>http://www.hp.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="notls" unique="0" required="0">
	<getopt mixed="-t, --notls" />
	<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" 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="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="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" 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>
	</parameter>
	<parameter name="ssl" unique="0" required="0">
	<getopt mixed="-z, --ssl" />
	<content type="boolean" default="1" />
	<shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
	</parameter>
	<parameter name="ssl_insecure" unique="0" required="0">
	<getopt mixed="--ssl-insecure" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection without verifying certificate</shortdesc>
	</parameter>
	<parameter name="ssl_secure" unique="0" required="0">
	<getopt mixed="--ssl-secure" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
	</parameter>
	<parameter name="tls1.0" unique="0" required="0">
	<getopt mixed="--tls1.0" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="10" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="port_as_ip" unique="0" required="0">
	<getopt mixed="--port-as-ip" />
	<content type="boolean" />
	<shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="3" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="gnutlscli_path" unique="0" required="0">
	<getopt mixed="--gnutlscli-path=[path]" />
	<shortdesc lang="en">Path to gnutls-cli binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo3.xml b/tests/data/metadata/fence_ilo3.xml
	index 2a99e0a4..b5db044c 100644
	--- a/tests/data/metadata/fence_ilo3.xml
	+++ b/tests/data/metadata/fence_ilo3.xml
	@@ -1,218 +1,223 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ilo3" shortdesc="Fence agent for IPMI" >
	<symlink name="fence_ilo3" shortdesc="Fence agent for HP iLO3"/>
	<symlink name="fence_ilo4" shortdesc="Fence agent for HP iLO4"/>
	<symlink name="fence_ilo5" shortdesc="Fence agent for HP iLO5"/>
	<symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/>
	<symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/>
	<longdesc>fence_ipmilan is an I/O Fencing agentwhich can be used with machines controlled by IPMI.This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
	<vendor-url></vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="auth" unique="0" required="0">
	<getopt mixed="-A, --auth=[auth]" />
	<content type="select" >
	<option value="md5" />
	<option value="password" />
	<option value="none" />
	</content>
	<shortdesc lang="en">IPMI Lan Auth type.</shortdesc>
	</parameter>
	<parameter name="cipher" unique="0" required="0">
	<getopt mixed="-C, --cipher=[cipher]" />
	<content type="string" />
	<shortdesc lang="en">Ciphersuite to use (same as ipmitool -C parameter)</shortdesc>
	</parameter>
	<parameter name="hexadecimal_kg" unique="0" required="0">
	<getopt mixed="--hexadecimal-kg=[key]" />
	<content type="string" />
	<shortdesc lang="en">Hexadecimal-encoded Kg key for IPMIv2 authentication</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="integer" default="623" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="lanplus" unique="0" required="0">
	<getopt mixed="-P, --lanplus" />
	<content type="boolean" default="1" />
	<shortdesc lang="en">Use Lanplus to improve security of connection</shortdesc>
	</parameter>
	<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="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	<shortdesc lang="en">Method to fence</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="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="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="privlvl" unique="0" required="0">
	<getopt mixed="-L, --privlvl=[level]" />
	<content type="select" default="administrator" >
	<option value="callback" />
	<option value="user" />
	<option value="operator" />
	<option value="administrator" />
	</content>
	<shortdesc lang="en">Privilege level on IPMI device</shortdesc>
	</parameter>
	<parameter name="target" unique="0" required="0">
	<getopt mixed="--target=[targetaddress]" />
	<content type="string" />
	<shortdesc lang="en">Bridge IPMI requests to the remote target address</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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="ipmitool_path" unique="0" required="0">
	<getopt mixed="--ipmitool-path=[path]" />
	<shortdesc lang="en">Path to ipmitool binary</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="port_as_ip" unique="0" required="0">
	<getopt mixed="--port-as-ip" />
	<content type="boolean" />
	<shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="4" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="ipmitool_timeout" unique="0" required="0">
	<getopt mixed="--ipmitool-timeout=[timeout]" />
	<content type="string" default="2" />
	<shortdesc lang="en">Timeout (sec) for IPMI operation</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="sudo_path" unique="0" required="0">
	<getopt mixed="--sudo-path=[path]" />
	<shortdesc lang="en">Path to sudo binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	<action name="diag" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo3_ssh.xml b/tests/data/metadata/fence_ilo3_ssh.xml
	index e46d607c..a3c8f11c 100644
	--- a/tests/data/metadata/fence_ilo3_ssh.xml
	+++ b/tests/data/metadata/fence_ilo3_ssh.xml
	@@ -1,203 +1,208 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ilo3_ssh" shortdesc="Fence agent for HP iLO over SSH" >
	<symlink name="fence_ilo3_ssh" shortdesc="Fence agent for HP iLO3 over SSH"/>
	<symlink name="fence_ilo4_ssh" shortdesc="Fence agent for HP iLO4 over SSH"/>
	<symlink name="fence_ilo5_ssh" shortdesc="Fence agent for HP iLO5 over SSH"/>
	<longdesc>fence_ilo_ssh is a fence agent that connects to iLO device. It logs into device via ssh and reboot a specified outlet.

	WARNING: The monitor-action is prone to timeouts. Use the fence_ilo-equivalent to avoid this issue.</longdesc>
	<vendor-url>http://www.hp.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	<shortdesc lang="en">Method to fence</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="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="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" 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>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="port_as_ip" unique="0" required="0">
	<getopt mixed="--port-as-ip" />
	<content type="boolean" />
	<shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<shortdesc lang="en">Path to telnet binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo4.xml b/tests/data/metadata/fence_ilo4.xml
	index 68790266..210b05d2 100644
	--- a/tests/data/metadata/fence_ilo4.xml
	+++ b/tests/data/metadata/fence_ilo4.xml
	@@ -1,218 +1,223 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ilo4" shortdesc="Fence agent for IPMI" >
	<symlink name="fence_ilo3" shortdesc="Fence agent for HP iLO3"/>
	<symlink name="fence_ilo4" shortdesc="Fence agent for HP iLO4"/>
	<symlink name="fence_ilo5" shortdesc="Fence agent for HP iLO5"/>
	<symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/>
	<symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/>
	<longdesc>fence_ipmilan is an I/O Fencing agentwhich can be used with machines controlled by IPMI.This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
	<vendor-url></vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="auth" unique="0" required="0">
	<getopt mixed="-A, --auth=[auth]" />
	<content type="select" >
	<option value="md5" />
	<option value="password" />
	<option value="none" />
	</content>
	<shortdesc lang="en">IPMI Lan Auth type.</shortdesc>
	</parameter>
	<parameter name="cipher" unique="0" required="0">
	<getopt mixed="-C, --cipher=[cipher]" />
	<content type="string" />
	<shortdesc lang="en">Ciphersuite to use (same as ipmitool -C parameter)</shortdesc>
	</parameter>
	<parameter name="hexadecimal_kg" unique="0" required="0">
	<getopt mixed="--hexadecimal-kg=[key]" />
	<content type="string" />
	<shortdesc lang="en">Hexadecimal-encoded Kg key for IPMIv2 authentication</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="integer" default="623" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="lanplus" unique="0" required="0">
	<getopt mixed="-P, --lanplus" />
	<content type="boolean" default="1" />
	<shortdesc lang="en">Use Lanplus to improve security of connection</shortdesc>
	</parameter>
	<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="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	<shortdesc lang="en">Method to fence</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="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="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="privlvl" unique="0" required="0">
	<getopt mixed="-L, --privlvl=[level]" />
	<content type="select" default="administrator" >
	<option value="callback" />
	<option value="user" />
	<option value="operator" />
	<option value="administrator" />
	</content>
	<shortdesc lang="en">Privilege level on IPMI device</shortdesc>
	</parameter>
	<parameter name="target" unique="0" required="0">
	<getopt mixed="--target=[targetaddress]" />
	<content type="string" />
	<shortdesc lang="en">Bridge IPMI requests to the remote target address</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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="ipmitool_path" unique="0" required="0">
	<getopt mixed="--ipmitool-path=[path]" />
	<shortdesc lang="en">Path to ipmitool binary</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="port_as_ip" unique="0" required="0">
	<getopt mixed="--port-as-ip" />
	<content type="boolean" />
	<shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="2" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="ipmitool_timeout" unique="0" required="0">
	<getopt mixed="--ipmitool-timeout=[timeout]" />
	<content type="string" default="2" />
	<shortdesc lang="en">Timeout (sec) for IPMI operation</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="sudo_path" unique="0" required="0">
	<getopt mixed="--sudo-path=[path]" />
	<shortdesc lang="en">Path to sudo binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	<action name="diag" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo4_ssh.xml b/tests/data/metadata/fence_ilo4_ssh.xml
	index a2c4614a..9b993dd5 100644
	--- a/tests/data/metadata/fence_ilo4_ssh.xml
	+++ b/tests/data/metadata/fence_ilo4_ssh.xml
	@@ -1,203 +1,208 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ilo4_ssh" shortdesc="Fence agent for HP iLO over SSH" >
	<symlink name="fence_ilo3_ssh" shortdesc="Fence agent for HP iLO3 over SSH"/>
	<symlink name="fence_ilo4_ssh" shortdesc="Fence agent for HP iLO4 over SSH"/>
	<symlink name="fence_ilo5_ssh" shortdesc="Fence agent for HP iLO5 over SSH"/>
	<longdesc>fence_ilo_ssh is a fence agent that connects to iLO device. It logs into device via ssh and reboot a specified outlet.

	WARNING: The monitor-action is prone to timeouts. Use the fence_ilo-equivalent to avoid this issue.</longdesc>
	<vendor-url>http://www.hp.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	<shortdesc lang="en">Method to fence</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="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="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" 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>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="port_as_ip" unique="0" required="0">
	<getopt mixed="--port-as-ip" />
	<content type="boolean" />
	<shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<shortdesc lang="en">Path to telnet binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo5.xml b/tests/data/metadata/fence_ilo5.xml
	index b483f8c8..780cc5a7 100644
	--- a/tests/data/metadata/fence_ilo5.xml
	+++ b/tests/data/metadata/fence_ilo5.xml
	@@ -1,218 +1,223 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ilo5" shortdesc="Fence agent for IPMI" >
	<symlink name="fence_ilo3" shortdesc="Fence agent for HP iLO3"/>
	<symlink name="fence_ilo4" shortdesc="Fence agent for HP iLO4"/>
	<symlink name="fence_ilo5" shortdesc="Fence agent for HP iLO5"/>
	<symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/>
	<symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/>
	<longdesc>fence_ipmilan is an I/O Fencing agentwhich can be used with machines controlled by IPMI.This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
	<vendor-url></vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="auth" unique="0" required="0">
	<getopt mixed="-A, --auth=[auth]" />
	<content type="select" >
	<option value="md5" />
	<option value="password" />
	<option value="none" />
	</content>
	<shortdesc lang="en">IPMI Lan Auth type.</shortdesc>
	</parameter>
	<parameter name="cipher" unique="0" required="0">
	<getopt mixed="-C, --cipher=[cipher]" />
	<content type="string" />
	<shortdesc lang="en">Ciphersuite to use (same as ipmitool -C parameter)</shortdesc>
	</parameter>
	<parameter name="hexadecimal_kg" unique="0" required="0">
	<getopt mixed="--hexadecimal-kg=[key]" />
	<content type="string" />
	<shortdesc lang="en">Hexadecimal-encoded Kg key for IPMIv2 authentication</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="integer" default="623" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="lanplus" unique="0" required="0">
	<getopt mixed="-P, --lanplus" />
	<content type="boolean" default="1" />
	<shortdesc lang="en">Use Lanplus to improve security of connection</shortdesc>
	</parameter>
	<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="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	<shortdesc lang="en">Method to fence</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="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="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="privlvl" unique="0" required="0">
	<getopt mixed="-L, --privlvl=[level]" />
	<content type="select" default="administrator" >
	<option value="callback" />
	<option value="user" />
	<option value="operator" />
	<option value="administrator" />
	</content>
	<shortdesc lang="en">Privilege level on IPMI device</shortdesc>
	</parameter>
	<parameter name="target" unique="0" required="0">
	<getopt mixed="--target=[targetaddress]" />
	<content type="string" />
	<shortdesc lang="en">Bridge IPMI requests to the remote target address</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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="ipmitool_path" unique="0" required="0">
	<getopt mixed="--ipmitool-path=[path]" />
	<shortdesc lang="en">Path to ipmitool binary</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="port_as_ip" unique="0" required="0">
	<getopt mixed="--port-as-ip" />
	<content type="boolean" />
	<shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="2" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="ipmitool_timeout" unique="0" required="0">
	<getopt mixed="--ipmitool-timeout=[timeout]" />
	<content type="string" default="2" />
	<shortdesc lang="en">Timeout (sec) for IPMI operation</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="sudo_path" unique="0" required="0">
	<getopt mixed="--sudo-path=[path]" />
	<shortdesc lang="en">Path to sudo binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	<action name="diag" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo5_ssh.xml b/tests/data/metadata/fence_ilo5_ssh.xml
	index d737f035..dba0222f 100644
	--- a/tests/data/metadata/fence_ilo5_ssh.xml
	+++ b/tests/data/metadata/fence_ilo5_ssh.xml
	@@ -1,203 +1,208 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ilo5_ssh" shortdesc="Fence agent for HP iLO over SSH" >
	<symlink name="fence_ilo3_ssh" shortdesc="Fence agent for HP iLO3 over SSH"/>
	<symlink name="fence_ilo4_ssh" shortdesc="Fence agent for HP iLO4 over SSH"/>
	<symlink name="fence_ilo5_ssh" shortdesc="Fence agent for HP iLO5 over SSH"/>
	<longdesc>fence_ilo_ssh is a fence agent that connects to iLO device. It logs into device via ssh and reboot a specified outlet.

	WARNING: The monitor-action is prone to timeouts. Use the fence_ilo-equivalent to avoid this issue.</longdesc>
	<vendor-url>http://www.hp.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	<shortdesc lang="en">Method to fence</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="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="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" 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>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="port_as_ip" unique="0" required="0">
	<getopt mixed="--port-as-ip" />
	<content type="boolean" />
	<shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<shortdesc lang="en">Path to telnet binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo_moonshot.xml b/tests/data/metadata/fence_ilo_moonshot.xml
	index 00e43840..1e31424a 100644
	--- a/tests/data/metadata/fence_ilo_moonshot.xml
	+++ b/tests/data/metadata/fence_ilo_moonshot.xml
	@@ -1,188 +1,193 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ilo_moonshot" shortdesc="Fence agent for HP Moonshot iLO" >
	<longdesc></longdesc>
	<vendor-url>http://www.hp.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="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>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo_mp.xml b/tests/data/metadata/fence_ilo_mp.xml
	index 2bba33dc..b825cd32 100644
	--- a/tests/data/metadata/fence_ilo_mp.xml
	+++ b/tests/data/metadata/fence_ilo_mp.xml
	@@ -1,190 +1,195 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ilo_mp" shortdesc="Fence agent for HP iLO MP" >
	<longdesc></longdesc>
	<vendor-url>http://www.hp.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="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" 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>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="port_as_ip" unique="0" required="0">
	<getopt mixed="--port-as-ip" />
	<content type="boolean" />
	<shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<shortdesc lang="en">Path to telnet binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo_ssh.xml b/tests/data/metadata/fence_ilo_ssh.xml
	index 1c8145b8..df87fd5f 100644
	--- a/tests/data/metadata/fence_ilo_ssh.xml
	+++ b/tests/data/metadata/fence_ilo_ssh.xml
	@@ -1,203 +1,208 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ilo_ssh" shortdesc="Fence agent for HP iLO over SSH" >
	<symlink name="fence_ilo3_ssh" shortdesc="Fence agent for HP iLO3 over SSH"/>
	<symlink name="fence_ilo4_ssh" shortdesc="Fence agent for HP iLO4 over SSH"/>
	<symlink name="fence_ilo5_ssh" shortdesc="Fence agent for HP iLO5 over SSH"/>
	<longdesc>fence_ilo_ssh is a fence agent that connects to iLO device. It logs into device via ssh and reboot a specified outlet.

	WARNING: The monitor-action is prone to timeouts. Use the fence_ilo-equivalent to avoid this issue.</longdesc>
	<vendor-url>http://www.hp.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	<shortdesc lang="en">Method to fence</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="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="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" 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>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="port_as_ip" unique="0" required="0">
	<getopt mixed="--port-as-ip" />
	<content type="boolean" />
	<shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<shortdesc lang="en">Path to telnet binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_imm.xml b/tests/data/metadata/fence_imm.xml
	index e22e4723..d00ad7fa 100644
	--- a/tests/data/metadata/fence_imm.xml
	+++ b/tests/data/metadata/fence_imm.xml
	@@ -1,218 +1,223 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_imm" shortdesc="Fence agent for IPMI" >
	<symlink name="fence_ilo3" shortdesc="Fence agent for HP iLO3"/>
	<symlink name="fence_ilo4" shortdesc="Fence agent for HP iLO4"/>
	<symlink name="fence_ilo5" shortdesc="Fence agent for HP iLO5"/>
	<symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/>
	<symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/>
	<longdesc>fence_ipmilan is an I/O Fencing agentwhich can be used with machines controlled by IPMI.This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
	<vendor-url></vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="auth" unique="0" required="0">
	<getopt mixed="-A, --auth=[auth]" />
	<content type="select" >
	<option value="md5" />
	<option value="password" />
	<option value="none" />
	</content>
	<shortdesc lang="en">IPMI Lan Auth type.</shortdesc>
	</parameter>
	<parameter name="cipher" unique="0" required="0">
	<getopt mixed="-C, --cipher=[cipher]" />
	<content type="string" />
	<shortdesc lang="en">Ciphersuite to use (same as ipmitool -C parameter)</shortdesc>
	</parameter>
	<parameter name="hexadecimal_kg" unique="0" required="0">
	<getopt mixed="--hexadecimal-kg=[key]" />
	<content type="string" />
	<shortdesc lang="en">Hexadecimal-encoded Kg key for IPMIv2 authentication</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="integer" default="623" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="lanplus" unique="0" required="0">
	<getopt mixed="-P, --lanplus" />
	<content type="boolean" default="0" />
	<shortdesc lang="en">Use Lanplus to improve security of connection</shortdesc>
	</parameter>
	<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="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	<shortdesc lang="en">Method to fence</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="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="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="privlvl" unique="0" required="0">
	<getopt mixed="-L, --privlvl=[level]" />
	<content type="select" default="administrator" >
	<option value="callback" />
	<option value="user" />
	<option value="operator" />
	<option value="administrator" />
	</content>
	<shortdesc lang="en">Privilege level on IPMI device</shortdesc>
	</parameter>
	<parameter name="target" unique="0" required="0">
	<getopt mixed="--target=[targetaddress]" />
	<content type="string" />
	<shortdesc lang="en">Bridge IPMI requests to the remote target address</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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="ipmitool_path" unique="0" required="0">
	<getopt mixed="--ipmitool-path=[path]" />
	<shortdesc lang="en">Path to ipmitool binary</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="port_as_ip" unique="0" required="0">
	<getopt mixed="--port-as-ip" />
	<content type="boolean" />
	<shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="2" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="ipmitool_timeout" unique="0" required="0">
	<getopt mixed="--ipmitool-timeout=[timeout]" />
	<content type="string" default="2" />
	<shortdesc lang="en">Timeout (sec) for IPMI operation</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="sudo_path" unique="0" required="0">
	<getopt mixed="--sudo-path=[path]" />
	<shortdesc lang="en">Path to sudo binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	<action name="diag" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_intelmodular.xml b/tests/data/metadata/fence_intelmodular.xml
	index 5e0d3b19..ed5afcb8 100644
	--- a/tests/data/metadata/fence_intelmodular.xml
	+++ b/tests/data/metadata/fence_intelmodular.xml
	@@ -1,207 +1,212 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_intelmodular" shortdesc="Fence agent for Intel Modular" >
	<longdesc>fence_intelmodular is an I/O Fencing agent which can be used with Intel Modular device (tested on Intel MFSYS25, should work with MFSYS35 as well).

	Note: Since firmware update version 2.7, SNMP v2 write support is removed, and replaced by SNMP v3 support. So agent now has default SNMP version 3. If you are using older firmware, please supply -d for command line and snmp_version option for your cluster.conf.</longdesc>
	<vendor-url>http://www.intel.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="community" unique="0" required="0">
	<getopt mixed="-c, --community=[community]" />
	<content type="string" />
	<shortdesc lang="en">Set the community string</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="snmp_auth_prot" unique="0" required="0">
	<getopt mixed="-b, --snmp-auth-prot=[prot]" />
	<content type="select" >
	<option value="MD5" />
	<option value="SHA" />
	</content>
	<shortdesc lang="en">Set authentication protocol</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd" unique="0" required="0">
	<getopt mixed="-P, --snmp-priv-passwd=[pass]" />
	<content type="string" />
	<shortdesc lang="en">Set privacy protocol password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd_script" unique="0" required="0">
	<getopt mixed="-R, --snmp-priv-passwd-script" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve privacy password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_prot" unique="0" required="0">
	<getopt mixed="-B, --snmp-priv-prot=[prot]" />
	<content type="select" >
	<option value="DES" />
	<option value="AES" />
	</content>
	<shortdesc lang="en">Set privacy protocol</shortdesc>
	</parameter>
	<parameter name="snmp_sec_level" unique="0" required="0">
	<getopt mixed="-E, --snmp-sec-level=[level]" />
	<content type="select" >
	<option value="noAuthNoPriv" />
	<option value="authNoPriv" />
	<option value="authPriv" />
	</content>
	<shortdesc lang="en">Set security level</shortdesc>
	</parameter>
	<parameter name="snmp_version" unique="0" required="0">
	<getopt mixed="-d, --snmp-version=[version]" />
	<content type="select" >
	<option value="1" />
	<option value="2c" />
	<option value="3" />
	</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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="snmpget_path" unique="0" required="0">
	<getopt mixed="--snmpget-path=[path]" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<shortdesc lang="en">Path to snmpwalk binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ipdu.xml b/tests/data/metadata/fence_ipdu.xml
	index 546e372c..78575c7c 100644
	--- a/tests/data/metadata/fence_ipdu.xml
	+++ b/tests/data/metadata/fence_ipdu.xml
	@@ -1,205 +1,210 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ipdu" shortdesc="Fence agent for iPDU over SNMP" >
	<longdesc>fence_ipdu is an I/O Fencing agent which can be used with the IBM iPDU network power switch. It logs into a device via SNMP and reboots a specified outlet. It supports SNMP v3 with all combinations of authenticity/privacy settings.</longdesc>
	<vendor-url>http://www.ibm.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="community" unique="0" required="0">
	<getopt mixed="-c, --community=[community]" />
	<content type="string" default="private" />
	<shortdesc lang="en">Set the community string</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="snmp_auth_prot" unique="0" required="0">
	<getopt mixed="-b, --snmp-auth-prot=[prot]" />
	<content type="select" >
	<option value="MD5" />
	<option value="SHA" />
	</content>
	<shortdesc lang="en">Set authentication protocol</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd" unique="0" required="0">
	<getopt mixed="-P, --snmp-priv-passwd=[pass]" />
	<content type="string" />
	<shortdesc lang="en">Set privacy protocol password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd_script" unique="0" required="0">
	<getopt mixed="-R, --snmp-priv-passwd-script" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve privacy password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_prot" unique="0" required="0">
	<getopt mixed="-B, --snmp-priv-prot=[prot]" />
	<content type="select" >
	<option value="DES" />
	<option value="AES" />
	</content>
	<shortdesc lang="en">Set privacy protocol</shortdesc>
	</parameter>
	<parameter name="snmp_sec_level" unique="0" required="0">
	<getopt mixed="-E, --snmp-sec-level=[level]" />
	<content type="select" >
	<option value="noAuthNoPriv" />
	<option value="authNoPriv" />
	<option value="authPriv" />
	</content>
	<shortdesc lang="en">Set security level</shortdesc>
	</parameter>
	<parameter name="snmp_version" unique="0" required="0">
	<getopt mixed="-d, --snmp-version=[version]" />
	<content type="select" default="3" >
	<option value="1" />
	<option value="2c" />
	<option value="3" />
	</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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="snmpget_path" unique="0" required="0">
	<getopt mixed="--snmpget-path=[path]" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<shortdesc lang="en">Path to snmpwalk binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ipmilan.xml b/tests/data/metadata/fence_ipmilan.xml
	index 3e13d288..d4c23f73 100644
	--- a/tests/data/metadata/fence_ipmilan.xml
	+++ b/tests/data/metadata/fence_ipmilan.xml
	@@ -1,218 +1,223 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ipmilan" shortdesc="Fence agent for IPMI" >
	<symlink name="fence_ilo3" shortdesc="Fence agent for HP iLO3"/>
	<symlink name="fence_ilo4" shortdesc="Fence agent for HP iLO4"/>
	<symlink name="fence_ilo5" shortdesc="Fence agent for HP iLO5"/>
	<symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/>
	<symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/>
	<longdesc>fence_ipmilan is an I/O Fencing agentwhich can be used with machines controlled by IPMI.This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc>
	<vendor-url></vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="auth" unique="0" required="0">
	<getopt mixed="-A, --auth=[auth]" />
	<content type="select" >
	<option value="md5" />
	<option value="password" />
	<option value="none" />
	</content>
	<shortdesc lang="en">IPMI Lan Auth type.</shortdesc>
	</parameter>
	<parameter name="cipher" unique="0" required="0">
	<getopt mixed="-C, --cipher=[cipher]" />
	<content type="string" />
	<shortdesc lang="en">Ciphersuite to use (same as ipmitool -C parameter)</shortdesc>
	</parameter>
	<parameter name="hexadecimal_kg" unique="0" required="0">
	<getopt mixed="--hexadecimal-kg=[key]" />
	<content type="string" />
	<shortdesc lang="en">Hexadecimal-encoded Kg key for IPMIv2 authentication</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="integer" default="623" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="lanplus" unique="0" required="0">
	<getopt mixed="-P, --lanplus" />
	<content type="boolean" default="0" />
	<shortdesc lang="en">Use Lanplus to improve security of connection</shortdesc>
	</parameter>
	<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="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	<shortdesc lang="en">Method to fence</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="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="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="privlvl" unique="0" required="0">
	<getopt mixed="-L, --privlvl=[level]" />
	<content type="select" default="administrator" >
	<option value="callback" />
	<option value="user" />
	<option value="operator" />
	<option value="administrator" />
	</content>
	<shortdesc lang="en">Privilege level on IPMI device</shortdesc>
	</parameter>
	<parameter name="target" unique="0" required="0">
	<getopt mixed="--target=[targetaddress]" />
	<content type="string" />
	<shortdesc lang="en">Bridge IPMI requests to the remote target address</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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="ipmitool_path" unique="0" required="0">
	<getopt mixed="--ipmitool-path=[path]" />
	<shortdesc lang="en">Path to ipmitool binary</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="port_as_ip" unique="0" required="0">
	<getopt mixed="--port-as-ip" />
	<content type="boolean" />
	<shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="2" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="ipmitool_timeout" unique="0" required="0">
	<getopt mixed="--ipmitool-timeout=[timeout]" />
	<content type="string" default="2" />
	<shortdesc lang="en">Timeout (sec) for IPMI operation</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="sudo_path" unique="0" required="0">
	<getopt mixed="--sudo-path=[path]" />
	<shortdesc lang="en">Path to sudo binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	<action name="diag" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ironic.xml b/tests/data/metadata/fence_ironic.xml
	index 5775f285..84beaffc 100644
	--- a/tests/data/metadata/fence_ironic.xml
	+++ b/tests/data/metadata/fence_ironic.xml
	@@ -1,158 +1,163 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ironic" shortdesc="Fence agent for OpenStack's Ironic (Bare Metal as a service) service" >
	<longdesc>fence_ironic is a Fencing agent which can be used with machines controlled by the Ironic service. This agent calls the openstack CLI. WARNING! This fence agent is not intended for production use. Relying on a functional ironic service for fencing is not a good design choice.</longdesc>
	<vendor-url>https://wiki.openstack.org/wiki/Ironic</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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="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" 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="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="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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<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" 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" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ldom.xml b/tests/data/metadata/fence_ldom.xml
	index b3c53458..4bb38571 100644
	--- a/tests/data/metadata/fence_ldom.xml
	+++ b/tests/data/metadata/fence_ldom.xml
	@@ -1,190 +1,195 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ldom" shortdesc="Fence agent for Sun LDOM" >
	<longdesc>fence_ldom is an I/O Fencing agent which can be used with LDoms virtual machines. This agent works so, that run ldm command on host machine. So ldm must be directly runnable.

	Very useful parameter is -c (or cmd_prompt in stdin mode). This must be set to something, what is displayed after successful login to host machine. Default string is space on end of string (default for root in bash). But (for example) csh use ], so in that case you must use parameter -c with argument ]. Very similar situation is, if you use bash and login to host machine with other user than root. Than prompt is $, so again, you must use parameter -c.</longdesc>
	<vendor-url>http://www.sun.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="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>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_lpar.xml b/tests/data/metadata/fence_lpar.xml
	index 16d43a78..7ddc2c45 100644
	--- a/tests/data/metadata/fence_lpar.xml
	+++ b/tests/data/metadata/fence_lpar.xml
	@@ -1,202 +1,207 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_lpar" shortdesc="Fence agent for IBM LPAR" >
	<longdesc></longdesc>
	<vendor-url>http://www.ibm.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="hmc_version" unique="0" required="0">
	<getopt mixed="-H, --hmc-version=[version]" />
	<content type="select" default="4" >
	<option value="3" />
	<option value="4" />
	<option value="ivm" />
	</content>
	<shortdesc lang="en">Force HMC version to use</shortdesc>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="managed" unique="0" required="0">
	<getopt mixed="-s, --managed=[id]" />
	<content type="string" />
	<shortdesc lang="en">Managed system name</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="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="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>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="15" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_mpath.xml b/tests/data/metadata/fence_mpath.xml
	index f5e60823..83d69f6c 100644
	--- a/tests/data/metadata/fence_mpath.xml
	+++ b/tests/data/metadata/fence_mpath.xml
	@@ -1,124 +1,129 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_mpath" shortdesc="Fence agent for multipath persistent reservation" >
	<longdesc>fence_mpath is an I/O fencing agent that uses SCSI-3 persistent reservations to control access multipath devices. Underlying devices must support SCSI-3 persistent reservations (SPC-3 or greater) as well as the "preempt-and-abort" subcommand.
	The fence_mpath agent works by having a unique key for each node that has to be set in /etc/multipath.conf. Once registered, a single node will become the reservation holder by creating a "write exclusive, registrants only" reservation on the device(s). The result is that only registered nodes may write to the device(s). When a node failure occurs, the fence_mpath agent will remove the key belonging to the failed node from the device(s). The failed node will no longer be able to write to the device(s). A manual reboot is required.</longdesc>
	<vendor-url>https://www.sourceware.org/dm/</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="off" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="devices" unique="0" required="0">
	<getopt mixed="-d, --devices=[devices]" />
	<content type="string" />
	<shortdesc lang="en">List of devices to use for current operation. Devices can be comma-separated list of device-mapper multipath devices (eg. /dev/mapper/3600508b400105df70000e00000ac0000 or /dev/mapper/mpath1). Each device must support SCSI-3 persistent reservations.</shortdesc>
	</parameter>
	<parameter name="key" unique="0" required="0">
	<getopt mixed="-k, --key=[key]" />
	<content type="string" />
	<shortdesc lang="en">Replaced by port/-n/--plug</shortdesc>
	</parameter>
	<parameter name="plug" unique="0" required="0" obsoletes="port">
	<getopt mixed="-n, --plug=[key]" />
	<content type="string" />
	<shortdesc lang="en">Key to use for the current operation. This key should be unique to a node and have to be written in /etc/multipath.conf. For the "on" action, the key specifies the key use to register the local node. For the "off" action, this key specifies the key to be removed from the device(s).</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="0" deprecated="1">
	<getopt mixed="-n, --plug=[key]" />
	<content type="string" />
	<shortdesc lang="en">Key to use for the current operation. This key should be unique to a node and have to be written in /etc/multipath.conf. For the "on" action, the key specifies the key use to register the local node. For the "off" action, this key specifies the key to be removed from the device(s).</shortdesc>
	</parameter>
	<parameter name="quiet" unique="0" required="0">
	<getopt mixed="-q, --quiet" />
	<content type="boolean" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="mpathpersist_path" unique="0" required="0">
	<getopt mixed="--mpathpersist-path=[path]" />
	<shortdesc lang="en">Path to mpathpersist binary</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="store_path" unique="0" required="0">
	<getopt mixed="--store-path=[path]" />
	<shortdesc lang="en">Path to directory where fence agent can store information</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="sudo_path" unique="0" required="0">
	<getopt mixed="--sudo-path=[path]" />
	<shortdesc lang="en">Path to sudo binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" on_target="1" automatic="1"/>
	<action name="off" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_netio.xml b/tests/data/metadata/fence_netio.xml
	index 79d27af3..b409bde7 100644
	--- a/tests/data/metadata/fence_netio.xml
	+++ b/tests/data/metadata/fence_netio.xml
	@@ -1,148 +1,153 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_netio" shortdesc="I/O Fencing agent for Koukaam NETIO-230B" >
	<longdesc>fence_netio is an I/O Fencing agent which can be used with the Koukaam NETIO-230B Power Distribution Unit. It logs into device via telnet and reboots a specified outlet. Lengthy telnet connections should be avoided while a GFS cluster is running because the connection will block any necessary fencing actions.</longdesc>
	<vendor-url>http://www.koukaam.se/</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<shortdesc lang="en">Path to telnet binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_openstack.xml b/tests/data/metadata/fence_openstack.xml
	index 22517657..645cd655 100644
	--- a/tests/data/metadata/fence_openstack.xml
	+++ b/tests/data/metadata/fence_openstack.xml
	@@ -1,167 +1,172 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_openstack" shortdesc="Fence agent for OpenStack's Nova service" >
	<longdesc>fence_openstack is a Fencing agent which can be used with machines controlled by the Openstack's Nova service. This agent calls the python-novaclient and it is mandatory to be installed </longdesc>
	<vendor-url>https://wiki.openstack.org/wiki/Nova</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="auth-url" unique="0" required="1" deprecated="1">
	<getopt mixed="--auth-url=[authurl]" />
	<content type="string" />
	<shortdesc lang="en">Keystone Auth URL</shortdesc>
	</parameter>
	<parameter name="auth_url" unique="0" required="1" obsoletes="auth-url">
	<getopt mixed="--auth-url=[authurl]" />
	<content type="string" />
	<shortdesc lang="en">Keystone 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" 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="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="0" obsoletes="port">
	<getopt mixed="-n, --plug=[UUID]" />
	<content type="string" />
	<shortdesc lang="en">UUID of the node to be fenced.</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="0" deprecated="1">
	<getopt mixed="-n, --plug=[UUID]" />
	<content type="string" />
	<shortdesc lang="en">UUID of the node to be fenced.</shortdesc>
	</parameter>
	<parameter name="project-domain-name" unique="0" required="0" deprecated="1">
	<getopt mixed="--project-domain-name=[domain]" />
	<content type="string" default="Default" />
	<shortdesc lang="en">Keystone Project Domain Name</shortdesc>
	</parameter>
	<parameter name="project-name" unique="0" required="1" deprecated="1">
	<getopt mixed="--project-name=[project]" />
	<content type="string" default="admin" />
	<shortdesc lang="en">Keystone Project</shortdesc>
	</parameter>
	<parameter name="project_domain_name" unique="0" required="0" obsoletes="project-domain-name">
	<getopt mixed="--project-domain-name=[domain]" />
	<content type="string" default="Default" />
	<shortdesc lang="en">Keystone Project Domain Name</shortdesc>
	</parameter>
	<parameter name="project_name" unique="0" required="1" obsoletes="project-name">
	<getopt mixed="--project-name=[project]" />
	<content type="string" default="admin" />
	<shortdesc lang="en">Keystone Project</shortdesc>
	</parameter>
	<parameter name="user-domain-name" unique="0" required="0" deprecated="1">
	<getopt mixed="--user-domain-name=[domain]" />
	<content type="string" default="Default" />
	<shortdesc lang="en">Keystone User Domain Name</shortdesc>
	</parameter>
	<parameter name="user_domain_name" unique="0" required="0" obsoletes="user-domain-name">
	<getopt mixed="--user-domain-name=[domain]" />
	<content type="string" default="Default" />
	<shortdesc lang="en">Keystone User Domain Name</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="uuid" unique="0" required="0">
	<getopt mixed="--uuid=[uuid]" />
	<content type="string" />
	<shortdesc lang="en">Replaced by port/-n/--plug</shortdesc>
	</parameter>
	<parameter name="quiet" unique="0" required="0">
	<getopt mixed="-q, --quiet" />
	<content type="boolean" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ovh.xml b/tests/data/metadata/fence_ovh.xml
	index b2767cc0..e8160bf7 100644
	--- a/tests/data/metadata/fence_ovh.xml
	+++ b/tests/data/metadata/fence_ovh.xml
	@@ -1,133 +1,138 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ovh" shortdesc="Fence agent for OVH" >
	<longdesc>fence_ovh is an Power Fencing agent which can be used within OVH datecentre. Poweroff is simulated with a reboot into rescue-pro mode.</longdesc>
	<vendor-url>http://www.ovh.net</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="email" unique="0" required="1">
	<getopt mixed="-Z, --email=[email]" />
	<content type="string" />
	<shortdesc lang="en">Reboot email</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" 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="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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_powerman.xml b/tests/data/metadata/fence_powerman.xml
	index ce72e002..3bf56882 100644
	--- a/tests/data/metadata/fence_powerman.xml
	+++ b/tests/data/metadata/fence_powerman.xml
	@@ -1,116 +1,121 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_powerman" shortdesc="Fence Agent for Powerman" >
	<longdesc>This is a Pacemaker Fence Agent for the Powerman management utility that was designed for LLNL systems.</longdesc>
	<vendor-url>https://github.com/chaos/powerman</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="integer" default="10101" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<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="quiet" unique="0" required="0">
	<getopt mixed="-q, --quiet" />
	<content type="boolean" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="port_as_ip" unique="0" required="0">
	<getopt mixed="--port-as-ip" />
	<content type="boolean" />
	<shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="powerman_path" unique="0" required="0">
	<getopt mixed="--powerman-path=[path]" />
	<shortdesc lang="en">Path to powerman binary</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_pve.xml b/tests/data/metadata/fence_pve.xml
	index 5d744903..1c83f2ef 100644
	--- a/tests/data/metadata/fence_pve.xml
	+++ b/tests/data/metadata/fence_pve.xml
	@@ -1,167 +1,172 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_pve" shortdesc="Fencing agent for the Proxmox Virtual Environment" >
	<longdesc>The fence_pve agent can be used to fence virtual machines acting as nodes in a virtualized cluster.</longdesc>
	<vendor-url>http://www.proxmox.com/</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" default="root@pam" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	<shortdesc lang="en">Method to fence</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="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">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="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>
	</parameter>
	<parameter name="vmtype" unique="0" required="1">
	<getopt mixed="--vmtype" />
	<content type="string" default="qemu" />
	<shortdesc lang="en">Virtual machine type lxc or qemu. (Default: qemu)</shortdesc>
	</parameter>
	<parameter name="quiet" unique="0" required="0">
	<getopt mixed="-q, --quiet" />
	<content type="boolean" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_raritan.xml b/tests/data/metadata/fence_raritan.xml
	index 565eebc7..537cb141 100644
	--- a/tests/data/metadata/fence_raritan.xml
	+++ b/tests/data/metadata/fence_raritan.xml
	@@ -1,148 +1,153 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_raritan" shortdesc="I/O Fencing agent for Raritan Dominion PX" >
	<longdesc>fence_raritan is an I/O Fencing agent which can be used with the Raritan DPXS12-20 Power Distribution Unit. It logs into device via telnet and reboots a specified outlet. Lengthy telnet connections should be avoided while a GFS cluster is running because the connection will block any necessary fencing actions.</longdesc>
	<vendor-url>http://www.raritan.com/</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<shortdesc lang="en">Path to telnet binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_rcd_serial.xml b/tests/data/metadata/fence_rcd_serial.xml
	index c22f78de..b2a20cb7 100644
	--- a/tests/data/metadata/fence_rcd_serial.xml
	+++ b/tests/data/metadata/fence_rcd_serial.xml
	@@ -1,92 +1,97 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_rcd_serial" shortdesc="rcd_serial fence agent" >
	<longdesc>fence_rcd_serial operates a serial cable that toggles a reset of an opposing server using the reset switch on its motherboard. The cable itself is simple with no power, network or moving parts. An example of the cable is available here: https://smcleod.net/rcd-stonith/ and the circuit design is available in the fence-agents src as SVG</longdesc>
	<vendor-url>https://github.com/sammcj/fence_rcd_serial</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="cycle" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	<shortdesc lang="en">Method to fence</shortdesc>
	</parameter>
	<parameter name="serial_port" unique="0" required="1">
	<getopt mixed="--serial-port=[port]" />
	<content type="string" default="/dev/ttyS0" />
	<shortdesc lang="en">Port of the serial device</shortdesc>
	</parameter>
	<parameter name="quiet" unique="0" required="0">
	<getopt mixed="-q, --quiet" />
	<content type="boolean" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="2" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="reboot" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_redfish.xml b/tests/data/metadata/fence_redfish.xml
	index 91b483b7..32ea402e 100644
	--- a/tests/data/metadata/fence_redfish.xml
	+++ b/tests/data/metadata/fence_redfish.xml
	@@ -1,181 +1,186 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_redfish" shortdesc="I/O Fencing agent for Redfish" >
	<longdesc>fence_redfish is an I/O Fencing agent which can be used with Out-of-Band controllers that support Redfish APIs. These controllers provide remote access to control power on a server.</longdesc>
	<vendor-url>http://www.dmtf.org</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="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="redfish-uri" unique="0" required="0" deprecated="1">
	<getopt mixed="--redfish-uri=[uri]" />
	<content type="string" default="/redfish/v1" />
	<shortdesc lang="en">Base or starting Redfish URI</shortdesc>
	</parameter>
	<parameter name="redfish_uri" unique="0" required="0" obsoletes="redfish-uri">
	<getopt mixed="--redfish-uri=[uri]" />
	<content type="string" default="/redfish/v1" />
	<shortdesc lang="en">Base or starting Redfish URI</shortdesc>
	</parameter>
	<parameter name="ssl" unique="0" required="0">
	<getopt mixed="-z, --ssl" />
	<content type="boolean" default="1" />
	<shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
	</parameter>
	<parameter name="ssl_insecure" unique="0" required="0">
	<getopt mixed="--ssl-insecure" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection without verifying certificate</shortdesc>
	</parameter>
	<parameter name="ssl_secure" unique="0" required="0">
	<getopt mixed="--ssl-secure" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
	</parameter>
	<parameter name="systems-uri" unique="0" required="0" deprecated="1">
	<getopt mixed="--systems-uri=[uri]" />
	<content type="string" />
	<shortdesc lang="en">Redfish Systems resource URI, i.e. /redfish/v1/Systems/System.Embedded.1</shortdesc>
	</parameter>
	<parameter name="systems_uri" unique="0" required="0" obsoletes="systems-uri">
	<getopt mixed="--systems-uri=[uri]" />
	<content type="string" />
	<shortdesc lang="en">Redfish Systems resource URI, i.e. /redfish/v1/Systems/System.Embedded.1</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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="port_as_ip" unique="0" required="0">
	<getopt mixed="--port-as-ip" />
	<content type="boolean" />
	<shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="gnutlscli_path" unique="0" required="0">
	<getopt mixed="--gnutlscli-path=[path]" />
	<shortdesc lang="en">Path to gnutls-cli binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_rhevm.xml b/tests/data/metadata/fence_rhevm.xml
	index 73c9906f..deb326c3 100644
	--- a/tests/data/metadata/fence_rhevm.xml
	+++ b/tests/data/metadata/fence_rhevm.xml
	@@ -1,192 +1,197 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_rhevm" shortdesc="Fence agent for RHEV-M REST API" >
	<longdesc>fence_rhevm is an I/O Fencing agent which can be used with RHEV-M REST API to fence virtual machines.</longdesc>
	<vendor-url>http://www.redhat.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="notls" unique="0" required="0">
	<getopt mixed="-t, --notls" />
	<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" 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="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=[name]" />
	<content type="string" />
	<shortdesc lang="en">VM name in RHV</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1" deprecated="1">
	<getopt mixed="-n, --plug=[name]" />
	<content type="string" />
	<shortdesc lang="en">VM name in RHV</shortdesc>
	</parameter>
	<parameter name="ssl" unique="0" required="0">
	<getopt mixed="-z, --ssl" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
	</parameter>
	<parameter name="ssl_insecure" unique="0" required="0">
	<getopt mixed="--ssl-insecure" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection without verifying certificate</shortdesc>
	</parameter>
	<parameter name="ssl_secure" unique="0" required="0">
	<getopt mixed="--ssl-secure" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
	</parameter>
	<parameter name="use_cookies" unique="0" required="0">
	<getopt mixed="--use-cookies" />
	<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="api_version" unique="0" required="0">
	<getopt mixed="--api-version" />
	<content type="string" default="auto" />
	<shortdesc lang="en">Version of RHEV API (default: auto)</shortdesc>
	</parameter>
	<parameter name="cookie_file" unique="0" required="0">
	<getopt mixed="--cookie-file" />
	<content type="string" />
	<shortdesc lang="en">Path to cookie file for authentication</shortdesc>
	</parameter>
	<parameter name="api_path" unique="0" required="0">
	<getopt mixed="--api-path=[path]" />
	<shortdesc lang="en">The path part of the API URL</shortdesc>
	</parameter>
	<parameter name="disable_http_filter" unique="0" required="0">
	<getopt mixed="--disable-http-filter" />
	<content type="boolean" />
	<shortdesc lang="en">Set HTTP Filter header to false</shortdesc>
	</parameter>
	<parameter name="quiet" unique="0" required="0">
	<getopt mixed="-q, --quiet" />
	<content type="boolean" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="1" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="gnutlscli_path" unique="0" required="0">
	<getopt mixed="--gnutlscli-path=[path]" />
	<shortdesc lang="en">Path to gnutls-cli binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_rsa.xml b/tests/data/metadata/fence_rsa.xml
	index f9a55f82..51009427 100644
	--- a/tests/data/metadata/fence_rsa.xml
	+++ b/tests/data/metadata/fence_rsa.xml
	@@ -1,190 +1,195 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_rsa" shortdesc="Fence agent for IBM RSA" >
	<longdesc>fence_rsa is an I/O Fencing agent which can be used with the IBM RSA II management interface. It logs into an RSA II device via telnet and reboots the associated machine. Lengthy telnet connections to the RSA II device should be avoided while a GFS cluster is running because the connection will block any necessary fencing actions.</longdesc>
	<vendor-url>http://www.ibm.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="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" 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>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="10" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="port_as_ip" unique="0" required="0">
	<getopt mixed="--port-as-ip" />
	<content type="boolean" />
	<shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<shortdesc lang="en">Path to telnet binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_rsb.xml b/tests/data/metadata/fence_rsb.xml
	index 022835be..7d8575d1 100644
	--- a/tests/data/metadata/fence_rsb.xml
	+++ b/tests/data/metadata/fence_rsb.xml
	@@ -1,190 +1,195 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_rsb" shortdesc="I/O Fencing agent for Fujitsu-Siemens RSB" >
	<longdesc>fence_rsb is an I/O Fencing agent which can be used with the Fujitsu-Siemens RSB management interface. It logs into device via telnet/ssh and reboots a specified outlet. Lengthy telnet/ssh connections should be avoided while a GFS cluster is running because the connection will block any necessary fencing actions.</longdesc>
	<vendor-url>http://www.fujitsu.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="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" 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>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="port_as_ip" unique="0" required="0">
	<getopt mixed="--port-as-ip" />
	<content type="boolean" />
	<shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<shortdesc lang="en">Path to telnet binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_sanbox2.xml b/tests/data/metadata/fence_sanbox2.xml
	index 7e20c8ce..bf07f360 100644
	--- a/tests/data/metadata/fence_sanbox2.xml
	+++ b/tests/data/metadata/fence_sanbox2.xml
	@@ -1,157 +1,162 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_sanbox2" shortdesc="Fence agent for QLogic SANBox2 FC switches" >
	<longdesc>fence_sanbox2 is an I/O Fencing agent which can be used with QLogic SANBox2 FC switches. It logs into a SANBox2 switch via telnet and disables a specified port. Disabling the port which a machine is connected to effectively fences that machine. Lengthy telnet connections to the switch should be avoided while a GFS cluster is running because the connection will block any necessary fencing actions.</longdesc>
	<vendor-url>http://www.qlogic.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="off" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<shortdesc lang="en">Path to telnet binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="1"/>
	<action name="off" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_sbd.xml b/tests/data/metadata/fence_sbd.xml
	index 6095a74b..db52b49a 100644
	--- a/tests/data/metadata/fence_sbd.xml
	+++ b/tests/data/metadata/fence_sbd.xml
	@@ -1,116 +1,121 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_sbd" shortdesc="Fence agent for sbd" >
	<longdesc>fence_sbd is I/O Fencing agent which can be used in environments where sbd can be used (shared storage).</longdesc>
	<vendor-url></vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="devices" unique="0" required="1">
	<getopt mixed="--devices=[device_a,device_b]" />
	<content type="string" />
	<shortdesc lang="en">SBD Device</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="cycle" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	<shortdesc lang="en">Method to fence</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="quiet" unique="0" required="0">
	<getopt mixed="-q, --quiet" />
	<content type="boolean" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="sbd_path" unique="0" required="0">
	<getopt mixed="--sbd-path=[path]" />
	<shortdesc lang="en">Path to SBD binary</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_scsi.xml b/tests/data/metadata/fence_scsi.xml
	index d0818b0d..ceb79de5 100644
	--- a/tests/data/metadata/fence_scsi.xml
	+++ b/tests/data/metadata/fence_scsi.xml
	@@ -1,140 +1,145 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_scsi" shortdesc="Fence agent for SCSI persistent reservation" >
	<longdesc>fence_scsi is an I/O fencing agent that uses SCSI-3 persistent reservations to control access to shared storage devices. These devices must support SCSI-3 persistent reservations (SPC-3 or greater) as well as the "preempt-and-abort" subcommand.
	The fence_scsi agent works by having each node in the cluster register a unique key with the SCSI device(s). Reservation key is generated from "node id" (default) or from "node name hash" (RECOMMENDED) by adjusting "key_value" option. Using hash is recommended to prevent issues when removing nodes from cluster without full cluster restart. Once registered, a single node will become the reservation holder by creating a "write exclusive, registrants only" reservation on the device(s). The result is that only registered nodes may write to the device(s). When a node failure occurs, the fence_scsi agent will remove the key belonging to the failed node from the device(s). The failed node will no longer be able to write to the device(s). A manual reboot is required.

	When used as a watchdog device you can define e.g. retry=1, retry-sleep=2 and verbose=yes parameters in /etc/sysconfig/stonith if you have issues with it failing.</longdesc>
	<vendor-url></vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="off" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="aptpl" unique="0" required="0">
	<getopt mixed="-a, --aptpl" />
	<content type="boolean" />
	<shortdesc lang="en">Use the APTPL flag for registrations. This option is only used for the 'on' action.</shortdesc>
	</parameter>
	<parameter name="devices" unique="0" required="0">
	<getopt mixed="-d, --devices=[devices]" />
	<content type="string" />
	<shortdesc lang="en">List of devices to use for current operation. Devices can be comma-separated list of raw devices (eg. /dev/sdc). Each device must support SCSI-3 persistent reservations.</shortdesc>
	</parameter>
	<parameter name="key" unique="0" required="0">
	<getopt mixed="-k, --key=[key]" />
	<content type="string" />
	<shortdesc lang="en">Key to use for the current operation. This key should be unique to a node. For the "on" action, the key specifies the key use to register the local node. For the "off" action, this key specifies the key to be removed from the device(s).</shortdesc>
	</parameter>
	<parameter name="plug" unique="0" required="1" obsoletes="port">
	<getopt mixed="-n, --plug=[nodename]" />
	<content type="string" />
	<shortdesc lang="en">Name of the node to be fenced. The node name is used to generate the key value used for the current operation. This option will be ignored when used with the -k option.</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1" deprecated="1">
	<getopt mixed="-n, --plug=[nodename]" />
	<content type="string" />
	<shortdesc lang="en">Name of the node to be fenced. The node name is used to generate the key value used for the current operation. This option will be ignored when used with the -k option.</shortdesc>
	</parameter>
	<parameter name="readonly" unique="0" required="0">
	<getopt mixed="--readonly" />
	<content type="boolean" />
	<shortdesc lang="en">Open DEVICE read-only.</shortdesc>
	</parameter>
	<parameter name="logfile" unique="0" required="0">
	<getopt mixed="-f, --logfile" />
	<content type="string" />
	<shortdesc lang="en">Log output (stdout and stderr) to file</shortdesc>
	</parameter>
	<parameter name="quiet" unique="0" required="0">
	<getopt mixed="-q, --quiet" />
	<content type="boolean" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<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">
	<getopt mixed="--corosync-cmap-path=[path]" />
	<shortdesc lang="en">Path to corosync-cmapctl binary</shortdesc>
	</parameter>
	<parameter name="key_value" unique="0" required="0">
	<getopt mixed="--key-value=<id\|hash>" />
	<content type="string" default="id" />
	<shortdesc lang="en">Method used to generate the SCSI key. "id" (default) uses the positional ID from "corosync-cmactl nodelist" output which can get inconsistent when nodes are removed from cluster without full cluster restart. "hash" uses part of hash made out of node names which is not affected over time but there is theoretical chance that hashes can collide as size of SCSI key is quite limited.</shortdesc>
	</parameter>
	<parameter name="sg_persist_path" unique="0" required="0">
	<getopt mixed="--sg_persist-path=[path]" />
	<shortdesc lang="en">Path to sg_persist binary</shortdesc>
	</parameter>
	<parameter name="sg_turs_path" unique="0" required="0">
	<getopt mixed="--sg_turs-path=[path]" />
	<shortdesc lang="en">Path to sg_turs binary</shortdesc>
	</parameter>
	<parameter name="vgs_path" unique="0" required="0">
	<getopt mixed="--vgs-path=[path]" />
	<shortdesc lang="en">Path to vgs binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" on_target="1" automatic="1"/>
	<action name="off" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_skalar.xml b/tests/data/metadata/fence_skalar.xml
	index 7c960788..77f8129d 100644
	--- a/tests/data/metadata/fence_skalar.xml
	+++ b/tests/data/metadata/fence_skalar.xml
	@@ -1,173 +1,178 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_skalar" shortdesc="Skala-R Fence agent" >
	<longdesc>A fence agent for Skala-R.</longdesc>
	<vendor-url>https://www.skala-r.ru/</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="force" unique="0" required="0">
	<getopt mixed="--force" />
	<content type="boolean" />
	<shortdesc lang="en">vm_stop command parameter, force stop or not, default false</shortdesc>
	</parameter>
	<parameter name="graceful" unique="0" required="0">
	<getopt mixed="--graceful" />
	<content type="boolean" />
	<shortdesc lang="en">vm_stop command parameter, graceful stop or not, default false</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="ssl" unique="0" required="0">
	<getopt mixed="-z, --ssl" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
	</parameter>
	<parameter name="ssl_insecure" unique="0" required="0">
	<getopt mixed="--ssl-insecure" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection without verifying certificate</shortdesc>
	</parameter>
	<parameter name="ssl_secure" unique="0" required="0">
	<getopt mixed="--ssl-secure" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="gnutlscli_path" unique="0" required="0">
	<getopt mixed="--gnutlscli-path=[path]" />
	<shortdesc lang="en">Path to gnutls-cli binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_tripplite_snmp.xml b/tests/data/metadata/fence_tripplite_snmp.xml
	index d3769133..becc0d18 100644
	--- a/tests/data/metadata/fence_tripplite_snmp.xml
	+++ b/tests/data/metadata/fence_tripplite_snmp.xml
	@@ -1,206 +1,211 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_tripplite_snmp" shortdesc="Fence agent for APC, Tripplite PDU over SNMP" >
	<symlink name="fence_tripplite_snmp" shortdesc="Fence agent for Tripplife over SNMP"/>
	<longdesc>fence_apc_snmp is an I/O Fencing agent which can be used with the APC network power switch or Tripplite PDU devices.It logs into a device via SNMP and reboots a specified outlet. It supports SNMP v1, v2c, v3 with all combinations of authenticity/privacy settings.</longdesc>
	<vendor-url>http://www.apc.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="community" unique="0" required="0">
	<getopt mixed="-c, --community=[community]" />
	<content type="string" default="private" />
	<shortdesc lang="en">Set the community string</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="snmp_auth_prot" unique="0" required="0">
	<getopt mixed="-b, --snmp-auth-prot=[prot]" />
	<content type="select" >
	<option value="MD5" />
	<option value="SHA" />
	</content>
	<shortdesc lang="en">Set authentication protocol</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd" unique="0" required="0">
	<getopt mixed="-P, --snmp-priv-passwd=[pass]" />
	<content type="string" />
	<shortdesc lang="en">Set privacy protocol password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd_script" unique="0" required="0">
	<getopt mixed="-R, --snmp-priv-passwd-script" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve privacy password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_prot" unique="0" required="0">
	<getopt mixed="-B, --snmp-priv-prot=[prot]" />
	<content type="select" >
	<option value="DES" />
	<option value="AES" />
	</content>
	<shortdesc lang="en">Set privacy protocol</shortdesc>
	</parameter>
	<parameter name="snmp_sec_level" unique="0" required="0">
	<getopt mixed="-E, --snmp-sec-level=[level]" />
	<content type="select" >
	<option value="noAuthNoPriv" />
	<option value="authNoPriv" />
	<option value="authPriv" />
	</content>
	<shortdesc lang="en">Set security level</shortdesc>
	</parameter>
	<parameter name="snmp_version" unique="0" required="0">
	<getopt mixed="-d, --snmp-version=[version]" />
	<content type="select" default="1" >
	<option value="1" />
	<option value="2c" />
	<option value="3" />
	</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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="snmpget_path" unique="0" required="0">
	<getopt mixed="--snmpget-path=[path]" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<shortdesc lang="en">Path to snmpwalk binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_vbox.xml b/tests/data/metadata/fence_vbox.xml
	index 3b53c7d2..045fbe9e 100644
	--- a/tests/data/metadata/fence_vbox.xml
	+++ b/tests/data/metadata/fence_vbox.xml
	@@ -1,222 +1,227 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_vbox" shortdesc="Fence agent for VirtualBox" >
	<longdesc>fence_vbox is an I/O Fencing agent which can be used with the virtual machines managed by VirtualBox. It logs via ssh to a dom0 where it runs VBoxManage to do all of the work.

	By default, vbox needs to log in as a user that is a member of the vboxusers group. Also, you must allow ssh login in your sshd_config.</longdesc>
	<vendor-url>https://www.virtualbox.org/</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="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>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="host_os" unique="0" required="0">
	<getopt mixed="--host-os=[os]" />
	<content type="select" default="linux" >
	<option value="linux" />
	<option value="macos" />
	<option value="windows" />
	</content>
	<shortdesc lang="en">Operating system of the host</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="missing_as_off" unique="0" required="0">
	<getopt mixed="--missing-as-off" />
	<content type="boolean" />
	<shortdesc lang="en">Missing port returns OFF instead of failure</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="vboxmanage_path" unique="0" required="0">
	<getopt mixed="--vboxmanage-path=[path]" />
	<shortdesc lang="en">Path to VBoxManage on the host</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="sudo_path" unique="0" required="0">
	<getopt mixed="--sudo-path=[path]" />
	<shortdesc lang="en">Path to sudo binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_virsh.xml b/tests/data/metadata/fence_virsh.xml
	index 864986d0..2ab09c33 100644
	--- a/tests/data/metadata/fence_virsh.xml
	+++ b/tests/data/metadata/fence_virsh.xml
	@@ -1,209 +1,214 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_virsh" shortdesc="Fence agent for virsh" >
	<longdesc>fence_virsh is an I/O Fencing agent which can be used with the virtual machines managed by libvirt. It logs via ssh to a dom0 and there run virsh command, which does all work.

	By default, virsh needs root account to do properly work. So you must allow ssh login in your sshd_config.</longdesc>
	<vendor-url>http://libvirt.org</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="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>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="missing_as_off" unique="0" required="0">
	<getopt mixed="--missing-as-off" />
	<content type="boolean" />
	<shortdesc lang="en">Missing port returns OFF instead of failure</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="sudo_path" unique="0" required="0">
	<getopt mixed="--sudo-path=[path]" />
	<shortdesc lang="en">Path to sudo binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_vmware.xml b/tests/data/metadata/fence_vmware.xml
	index 48fc408b..14b504ed 100644
	--- a/tests/data/metadata/fence_vmware.xml
	+++ b/tests/data/metadata/fence_vmware.xml
	@@ -1,199 +1,204 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_vmware" shortdesc="Fence agent for VMWare" >
	<longdesc>fence_vmware is an I/O Fencing agent which can be used with the VMware ESX, VMware ESXi or VMware Server to fence virtual machines.

	Before you can use this agent, it must be installed VI Perl Toolkit or vmrun command on every node you want to make fencing.

	VI Perl Toolkit is preferred for VMware ESX/ESXi and Virtual Center. Vmrun command is only solution for VMware Server 1/2 (this command will works against ESX/ESXi 3.5 up2 and VC up2 too, but not cluster aware!) and is available as part of VMware VIX API SDK package. VI Perl and VIX API SDK are both available from VMware web pages (not int RHEL repository!).

	You can specify type of VMware you are connecting to with -d switch (or vmware_type for stdin). Possible values are esx, server2 and server1.Default value is esx, which will use VI Perl. With server1 and server2, vmrun command is used.

	After you have successfully installed VI Perl Toolkit or VIX API, you should be able to run fence_vmware_helper (part of this agent) or vmrun command. This agent supports only vmrun from version 2.0.0 (VIX API 1.6.0).</longdesc>
	<vendor-url>http://www.vmware.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="exec" unique="0" required="0">
	<getopt mixed="-e, --exec=[command]" />
	<content type="string" />
	<shortdesc lang="en">Command to execute</shortdesc>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="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" 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>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<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" />
	<shortdesc lang="en">Type of VMware to connect</shortdesc>
	</parameter>
	<parameter name="vmware_datacenter" unique="0" required="0">
	<getopt mixed="-s, --vmware-datacenter=[dc]" />
	<content type="string" />
	<shortdesc lang="en">VMWare datacenter filter</shortdesc>
	</parameter>
	<parameter name="quiet" unique="0" required="0">
	<getopt mixed="-q, --quiet" />
	<content type="boolean" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="port_as_ip" unique="0" required="0">
	<getopt mixed="--port-as-ip" />
	<content type="boolean" />
	<shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_vmware_rest.xml b/tests/data/metadata/fence_vmware_rest.xml
	index 830b6a21..41b09ba2 100644
	--- a/tests/data/metadata/fence_vmware_rest.xml
	+++ b/tests/data/metadata/fence_vmware_rest.xml
	@@ -1,179 +1,184 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_vmware_rest" shortdesc="Fence agent for VMware REST API" >
	<longdesc>fence_vmware_rest is an I/O Fencing agent which can be used with VMware API to fence virtual machines.

	NOTE: If there's more than 1000 VMs there is a filter parameter to work around the API limit. See https://code.vmware.com/apis/62/vcenter-management#/VM%20/get_vcenter_vm for full list of filters.</longdesc>
	<vendor-url>https://www.vmware.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="notls" unique="0" required="0">
	<getopt mixed="-t, --notls" />
	<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" 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="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="ssl" unique="0" required="0">
	<getopt mixed="-z, --ssl" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
	</parameter>
	<parameter name="ssl_insecure" unique="0" required="0">
	<getopt mixed="--ssl-insecure" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection without verifying certificate</shortdesc>
	</parameter>
	<parameter name="ssl_secure" unique="0" required="0">
	<getopt mixed="--ssl-secure" />
	<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="api_path" unique="0" required="0">
	<getopt mixed="--api-path=[path]" />
	<shortdesc lang="en">The path part of the API URL</shortdesc>
	</parameter>
	<parameter name="filter" unique="0" required="0">
	<getopt mixed="--filter=[filter]" />
	<content type="string" />
	<shortdesc lang="en">Filter to only return relevant VMs. It can be used to avoid the agent failing when more than 1000 VMs should be returned.</shortdesc>
	</parameter>
	<parameter name="quiet" unique="0" required="0">
	<getopt mixed="-q, --quiet" />
	<content type="boolean" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="1" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="gnutlscli_path" unique="0" required="0">
	<getopt mixed="--gnutlscli-path=[path]" />
	<shortdesc lang="en">Path to gnutls-cli binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_vmware_soap.xml b/tests/data/metadata/fence_vmware_soap.xml
	index da6a1002..ee385adf 100644
	--- a/tests/data/metadata/fence_vmware_soap.xml
	+++ b/tests/data/metadata/fence_vmware_soap.xml
	@@ -1,170 +1,175 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_vmware_soap" shortdesc="Fence agent for VMWare over SOAP API" >
	<longdesc>fence_vmware_soap is an I/O Fencing agent which can be used with the virtual machines managed by VMWare products that have SOAP API v4.1+.

	Name of virtual machine (-n / port) has to be used in inventory path format (e.g. /datacenter/vm/Discovered virtual machine/myMachine). In the cases when name of yours VM is unique you can use it instead. Alternatively you can always use UUID to access virtual machine.</longdesc>
	<vendor-url>http://www.vmware.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="notls" unique="0" required="0">
	<getopt mixed="-t, --notls" />
	<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" 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="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="ssl" unique="0" required="0">
	<getopt mixed="-z, --ssl" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
	</parameter>
	<parameter name="ssl_insecure" unique="0" required="0">
	<getopt mixed="--ssl-insecure" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection without verifying certificate</shortdesc>
	</parameter>
	<parameter name="ssl_secure" unique="0" required="0">
	<getopt mixed="--ssl-secure" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="gnutlscli_path" unique="0" required="0">
	<getopt mixed="--gnutlscli-path=[path]" />
	<shortdesc lang="en">Path to gnutls-cli binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_vmware_vcloud.xml b/tests/data/metadata/fence_vmware_vcloud.xml
	index 505eaf2b..21c9b77d 100644
	--- a/tests/data/metadata/fence_vmware_vcloud.xml
	+++ b/tests/data/metadata/fence_vmware_vcloud.xml
	@@ -1,172 +1,177 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_vmware_vcloud" shortdesc="Fence agent for VMware vCloud Director API" >
	<longdesc>fence_vmware_vcloud is an I/O Fencing agent which can be used with VMware vCloud Director API to fence virtual machines.</longdesc>
	<vendor-url>https://www.vmware.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="notls" unique="0" required="0">
	<getopt mixed="-t, --notls" />
	<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" 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="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="ssl" unique="0" required="0">
	<getopt mixed="-z, --ssl" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
	</parameter>
	<parameter name="ssl_insecure" unique="0" required="0">
	<getopt mixed="--ssl-insecure" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection without verifying certificate</shortdesc>
	</parameter>
	<parameter name="ssl_secure" unique="0" required="0">
	<getopt mixed="--ssl-secure" />
	<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="api_path" unique="0" required="0">
	<getopt mixed="--api-path=[path]" />
	<shortdesc lang="en">The path part of the API URL</shortdesc>
	</parameter>
	<parameter name="quiet" unique="0" required="0">
	<getopt mixed="-q, --quiet" />
	<content type="boolean" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="1" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="gnutlscli_path" unique="0" required="0">
	<getopt mixed="--gnutlscli-path=[path]" />
	<shortdesc lang="en">Path to gnutls-cli binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_wti.xml b/tests/data/metadata/fence_wti.xml
	index 872e4a90..8064b703 100644
	--- a/tests/data/metadata/fence_wti.xml
	+++ b/tests/data/metadata/fence_wti.xml
	@@ -1,192 +1,197 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_wti" shortdesc="Fence agent for WTI" >
	<longdesc>fence_wti is an I/O Fencing agent which can be used with the WTI Network Power Switch (NPS). It logs into an NPS via telnet or ssh and boots a specified plug. Lengthy telnet connections to the NPS should be avoided while a GFS cluster is running because the connection will block any necessary fencing actions.</longdesc>
	<vendor-url>http://www.wti.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</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="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="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>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<shortdesc lang="en">Path to telnet binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_xenapi.xml b/tests/data/metadata/fence_xenapi.xml
	index f6f4e46d..a1694ec5 100644
	--- a/tests/data/metadata/fence_xenapi.xml
	+++ b/tests/data/metadata/fence_xenapi.xml
	@@ -1,134 +1,139 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_xenapi" shortdesc="Fence agent for Citrix XenServer over XenAPI" >
	<longdesc>fence_cxs is an I/O Fencing agent used on Citrix XenServer hosts. It uses the XenAPI, supplied by Citrix, to establish an XML-RPC session to a XenServer host. Once the session is established, further XML-RPC commands are issued in order to switch on, switch off, restart and query the status of virtual machines running on the host.</longdesc>
	<vendor-url>http://www.xenproject.org</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<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" 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="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="session_url" unique="0" required="1">
	<getopt mixed="-s, --session-url" />
	<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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_zvmip.xml b/tests/data/metadata/fence_zvmip.xml
	index 408ad977..95c2ded3 100644
	--- a/tests/data/metadata/fence_zvmip.xml
	+++ b/tests/data/metadata/fence_zvmip.xml
	@@ -1,182 +1,187 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_zvmip" shortdesc="Fence agent for use with z/VM Virtual Machines" >
	<longdesc>The fence_zvm agent is intended to be used with with z/VM SMAPI service via TCP/IP

	To use this agent the z/VM SMAPI service needs to be configured to allow the virtual machine running this agent to connect to it and issue
	the image_recycle operation. This involves updating the VSMWORK1 AUTHLIST VMSYS:VSMWORK1. file. The entry should look something similar to
	this:

	Column 1 Column 66 Column 131

	\| \| \|
	V V V

	XXXXXXXX ALL IMAGE_CHARACTERISTICS

	Where XXXXXXX is the name of the virtual machine used in the authuser field of the request. This virtual machine also has to be authorized
	to access the system's directory manager.
	</longdesc>
	<vendor-url>http://www.ibm.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<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" deprecated="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	<shortdesc lang="en">Method to fence</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="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" />
	<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	- <shortdesc lang="en">Verbose mode</shortdesc>
	+ <shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>
	+ </parameter>
	+ <parameter name="verbose_level" unique="0" required="0">
	+ <getopt mixed="--verbose-level" />
	+ <content type="integer" />
	+ <shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>
	</parameter>
	<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>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="missing_as_off" unique="0" required="0">
	<getopt mixed="--missing-as-off" />
	<content type="boolean" default="1" />
	<shortdesc lang="en">Missing port returns OFF instead of failure</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="second" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="second" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="second" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="integer" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="manpage" />
	<action name="validate-all" />
	</actions>
	</resource-agent>

File Metadata

Mime Type: text/x-diff
Expires: Sat, Nov 23, 2:31 PM (20 h, 19 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1018786
Default Alt Text: (671 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions