No OneTemporary
Actions

Size

398 KB

Referenced Files

None

Subscribers

None

View Options

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

	diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
	index 8f1e8920..94b728ca 100644
	--- a/fence/agents/lib/fencing.py.py
	+++ b/fence/agents/lib/fencing.py.py
	@@ -1,1346 +1,1324 @@
	#!/usr/bin/python -tt

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

	## do not add code here.
	#BEGIN_VERSION_GENERATION
	RELEASE_VERSION = "New fence lib agent - test release on steroids"
	REDHAT_COPYRIGHT = ""
	BUILD_DATE = "March, 2008"
	#END_VERSION_GENERATION

	__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

	all_opt = {
	"help" : {
	"getopt" : "h",
	"longopt" : "help",
	"help" : "-h, --help Display this help and exit",
	"required" : "0",
	"shortdesc" : "Display help and exit",
	"order" : 54},
	"version" : {
	"getopt" : "V",
	"longopt" : "version",
	- "help" : "-V, --version Output version information and exit",
	+ "help" : "-V, --version Display version information and exit",
	"required" : "0",
	"shortdesc" : "Display version information and exit",
	"order" : 53},
	"verbose" : {
	"getopt" : "v",
	"longopt" : "verbose",
	"help" : "-v, --verbose Verbose mode",
	"required" : "0",
	"order" : 51},
	"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},
	"delay" : {
	"getopt" : ":",
	"longopt" : "delay",
	"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},
	"action" : {
	"getopt" : "o:",
	"longopt" : "action",
	"help" : "-o, --action=[action] Action: status, reboot (default), off or on",
	"required" : "1",
	- "shortdesc" : "Fencing Action",
	+ "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",
	- "shortdesc" : "IP Address or Hostname",
	"order" : 1},
	"ipport" : {
	"getopt" : "u:",
	"longopt" : "ipport",
	- "help" : "-u, --ipport=[port] TCP/UDP port to use",
	+ "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" : "?",
	- "shortdesc" : "Login Name",
	"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},
	"telnet" : {
	"getopt" : "",
	"help" : "",
	"order" : ""},
	"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",
	- "shortdesc" : "Script to retrieve password",
	"order" : 1},
	"identity_file" : {
	"getopt" : "k:",
	"longopt" : "identity-file",
	- "help" : "-k, --identity-file=[filename] Identity file (private key) for ssh ",
	+ "help" : "-k, --identity-file=[filename] Identity file (private key) for SSH",
	"required" : "0",
	- "shortdesc" : "Identity file for ssh",
	"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",
	- "shortdesc" : "SSH connection",
	+ "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",
	+ "help" : "-z, --ssl Use SSL connection with verifying certificate",
	"required" : "0",
	- "shortdesc" : "SSL connection",
	"order" : 1},
	"ssl_insecure" : {
	"getopt" : "",
	"longopt" : "ssl-insecure",
	- "help" : "--ssl-insecure Use ssl connection without verifying certificate",
	+ "help" : "--ssl-insecure Use SSL connection without verifying certificate",
	"required" : "0",
	- "shortdesc" : "SSL connection without verifying fence device's certificate",
	"order" : 1},
	"ssl_secure" : {
	"getopt" : "",
	"longopt" : "ssl-secure",
	- "help" : "--ssl-secure Use ssl connection with verifying certificate",
	+ "help" : "--ssl-secure Use SSL connection with verifying certificate",
	"required" : "0",
	- "shortdesc" : "SSL connection with verifying fence device's certificate",
	"order" : 1},
	-
	"notls" : {
	"getopt" : "t",
	"longopt" : "notls",
	"help" : "-t, --notls "
	- "Disable TLS negotiation and force SSL3.0.\n"
	- " "
	- "This should only be used for devices that\n"
	- " "
	- "do not support TLS1.0 and up.",
	+ "Disable TLS negotiation and force SSL3.0. "
	+ "This should only be used for devices that do not support TLS1.0 and up.",
	"required" : "0",
	- "shortdesc" : "Disable TLS negotiation, force SSL 3.0",
	"order" : 1},
	"tls1.0" : {
	"getopt" : "",
	"longopt" : "tls1.0",
	"help" : "--tls1.0 "
	- "Disable TLS negotiation and force TLS1.0\n"
	- " "
	- "This should only be used for devices that\n"
	- " "
	- "do not support TLS1.1 and up.",
	+ "Disable TLS negotiation and force TLS1.0. "
	+ "This should only be used for devices that do not support TLS1.1 and up.",
	"required" : "0",
	- "shortdesc" : "Disable TLS negotiaton, force TLS 1.0",
	"order" : 1},
	"port" : {
	"getopt" : "n:",
	"longopt" : "plug",
	- "help" : "-n, --plug=[id] Physical plug number on device, UUID or\n" +
	- " identification of machine",
	+ "help" : "-n, --plug=[id] "
	+ "Physical plug number on device, UUID or identification of machine",
	"required" : "1",
	- "shortdesc" : "Physical plug number, name of virtual machine or UUID",
	"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",
	- "shortdesc" : "Show only machines in specified datacenter",
	"order" : 2},
	"snmp_version" : {
	"getopt" : "d:",
	"longopt" : "snmp-version",
	"help" : "-d, --snmp-version=[version] Specifies SNMP version to use",
	"required" : "0",
	"shortdesc" : "Specifies SNMP version to use (1,2c,3)",
	"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 (MD5\|SHA)",
	"choices" : ["MD5", "SHA"],
	"order" : 1},
	"snmp_sec_level" : {
	"getopt" : "E:",
	"longopt" : "snmp-sec-level",
	- "help" : "-E, --snmp-sec-level=[level] Set security level\n"+
	- " (noAuthNoPriv\|authNoPriv\|authPriv)",
	+ "help" : "-E, --snmp-sec-level=[level] "
	+ "Set security level (noAuthNoPriv\|authNoPriv\|authPriv)",
	"required" : "0",
	"shortdesc" : "Set security level (noAuthNoPriv\|authNoPriv\|authPriv)",
	"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 (DES\|AES)",
	"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",
	- "shortdesc" : "Separator for CSV created by operation list",
	"order" : 100},
	"login_timeout" : {
	"getopt" : ":",
	"longopt" : "login-timeout",
	"help" : "--login-timeout=[seconds] Wait X seconds for cmd prompt after login",
	"default" : "5",
	"required" : "0",
	"order" : 200},
	"shell_timeout" : {
	"getopt" : ":",
	"longopt" : "shell-timeout",
	"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",
	"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",
	"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",
	"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",
	- "shortdesc" : "The URL of the XenServer host.",
	"order" : 1},
	"sudo" : {
	"getopt" : "",
	"longopt" : "use-sudo",
	"help" : "--use-sudo Use sudo (without password) when calling 3rd party software",
	"required" : "0",
	- "shortdesc" : "Use sudo (without password) when calling 3rd party sotfware.",
	"order" : 205},
	"method" : {
	"getopt" : "m:",
	"longopt" : "method",
	"help" : "-m, --method=[method] Method to fence (onoff\|cycle) (Default: onoff)",
	"required" : "0",
	"shortdesc" : "Method to fence (onoff\|cycle)",
	"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},
	"on_target": {
	"getopt" : "",
	"help" : "",
	"order" : 1}
	}

	# 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"],
	"passwd" : ["passwd_script"],
	"sudo" : ["sudo_path"],
	"secure" : ["identity_file", "ssh_options", "ssh_path"],
	"telnet" : ["telnet_path"],
	"ipaddr" : ["ipport", "inet4_only", "inet6_only"],
	"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):
	logging.info("Running command: %s", command)
	pexpect.spawn.__init__(self, command)
	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 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 DEPENDENCY_OPT.has_key(opt):
	added_opt.extend([y for y in DEPENDENCY_OPT[opt] if options.count(y) == 0])
	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):
	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."
	}[error_code] + "\n"
	logging.error("%s\n", message)
	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(lambda x, y: cmp(x[1]["order"], y[1]["order"]))

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

	def metadata(avail_opt, docs):
	# avail_opt has to be unique, if there are duplicities then they should be removed
	sorted_list = [(key, all_opt[key]) for key in list(set(avail_opt))]
	sorted_list.sort(lambda x, y: cmp(x[0], y[0]))
	sorted_list.sort(lambda x, y: cmp(x[1]["order"], y[1]["order"]))

	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 option, _ in sorted_list:
	if all_opt[option].has_key("help") and len(all_opt[option]["help"]) > 0:
	print "\t<parameter name=\"" + option + "\" unique=\"0\" required=\"" + all_opt[option]["required"] + "\">"

	default = ""
	if all_opt[option].has_key("default"):
	default = "default=\"" + _encode_html_entities(str(all_opt[option]["default"])) + "\" "

	mixed = all_opt[option]["help"]
	## split it between option and help text
	res = re.compile(r"^(.*?--\S+)\s+", re.IGNORECASE \| re.S).search(mixed)
	if None != res:
	mixed = res.group(1)
	mixed = _encode_html_entities(mixed)

	if not "shortdesc" in all_opt[option]:
	shortdesc = re.sub("\s\s+", " ", all_opt[option]["help"][31:])
	else:
	shortdesc = all_opt[option]["shortdesc"]

	print "\t\t<getopt mixed=\"" + mixed + "\" />"
	if all_opt[option].has_key("choices"):
	print "\t\t<content type=\"select\" "+default+" >"
	for choice in all_opt[option]["choices"]:
	print "\t\t\t<option value=\"%s\" />" % (choice)
	print "\t\t</content>"
	elif all_opt[option]["getopt"].count(":") > 0:
	print "\t\t<content type=\"string\" "+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 len(sys.argv) > 1:
	opt = _parse_input_cmdline(avail_opt)
	else:
	opt = _parse_input_stdin(avail_opt)
	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"] == "metadata" or any(options.has_key(k) for k in ("--help", "--version")):
	return options

	if options.has_key("--verbose"):
	logging.getLogger().setLevel(logging.DEBUG)

	## add logging to syslog
	logging.getLogger().addHandler(SyslogLibHandler())
	## add logging to stderr
	logging.getLogger().addHandler(logging.StreamHandler(stream=sys.stderr))

	(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:
	_validate_input(options, False)
	sys.exit(EC_OK)
	else:
	_validate_input(options, True)

	if options.has_key("--debug-file"):
	try:
	debug_file = logging.FileHandler(options["--debug-file"])
	debug_file.setLevel(logging.DEBUG)
	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 options.has_key("--snmp-priv-passwd-script"):
	options["--snmp-priv-passwd"] = os.popen(options["--snmp-priv-passwd-script"]).read().rstrip()

	if options.has_key("--password-script"):
	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 options.has_key("--plugs") 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 set_multi_power_fn(connection, options, set_power_fn, get_power_fn, retry_attempts=1):
	plugs = options["--plugs"] if options.has_key("--plugs") 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 xrange(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 show_docs(options, docs=None):
	device_opt = options["device_opt"]

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

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

	if options.get("--action", "") == "metadata":
	metadata(device_opt, docs)
	sys.exit(0)

	if options.has_key("--version"):
	print __main__.RELEASE_VERSION, __main__.BUILD_DATE
	print __main__.REDHAT_COPYRIGHT
	sys.exit(0)

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

	try:
	if options.has_key("--plug"):
	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")):

	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:
	original_action = options["--action"]
	options["--action"] = "list"
	outlets = get_outlet_list(connection, options)
	options["--action"] = original_action

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

	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

	status = get_multi_power_fn(connection, options, get_power_fn)

	if status != "on" and status != "off":
	fail(EC_STATUS)

	if options["--action"] == status:
	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, 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):
	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):
	fail(EC_WAITING_OFF)

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

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

	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, ex:
	logging.error("%s\n", str(ex))
	fail(EC_TIMED_OUT)
	except socket.timeout, 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 not options.has_key("eol"):
	options["eol"] = "\r\n"

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

	try:
	if options.has_key("--ssl"):
	conn = _open_ssl_connection(options)
	elif options.has_key("--ssh") and not options.has_key("--identity-file"):
	conn = _login_ssh_with_password(options, re_login_string)
	elif options.has_key("--ssh") and options.has_key("--identity-file"):
	conn = _login_ssh_with_identity_file(options)
	else:
	conn = _login_telnet(options, re_login_string)
	except pexpect.EOF:
	fail(EC_LOGIN_DENIED)
	except pexpect.TIMEOUT:
	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):
	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", command)

	try:
	process = subprocess.Popen(shlex.split(command), stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
	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)

	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):
	## Delay is important for two-node clusters fencing but we do not need to delay 'status' operations
	if options["--action"] in ["off", "reboot"]:
	logging.info("Delay %s second(s) before logging in to the fence device", options["--delay"])
	time.sleep(int(options["--delay"]))

	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 exceptions.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 options.has_key("--notls"):
	gnutls_opts = "--priority \"NORMAL:-VERS-TLS1.2:-VERS-TLS1.1:-VERS-TLS1.0:+VERS-SSL3.0\""
	elif options.has_key("--tls1.0"):
	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 options.has_key("--ssl-insecure"):
	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, ex:
	logging.error("%s\n", str(ex))
	sys.exit(EC_GENERIC_ERROR)

	return conn

	def _login_ssh_with_identity_file(options):
	if options.has_key("--inet6-only"):
	force_ipvx = "-6 "
	elif options.has_key("--inet4-only"):
	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 options.has_key("--ssh-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 options.has_key("--password"):
	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(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 options.has_key("--inet6-only"):
	force_ipvx = "-6 "
	elif options.has_key("--inet4-only"):
	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 options.has_key("--ssh-options"):
	command += ' ' + options["--ssh-options"]

	conn = fspawn(options, command)

	if options.has_key("telnet_over_ssh"):
	# 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"

	(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 all_opt["ipport"].has_key("default"):
	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 all_opt[opt].has_key("default") and not opt == "ipport":
	getopt_long = "--" + all_opt[opt]["longopt"]
	if not options.has_key(getopt_long):
	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 not options.has_key("--username") 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 not options.has_key("--ip") and not options.has_key("--managed"):
	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 (options.has_key("--password") or options.has_key("--password-script")):
	valid_input = False
	fail_usage("Failed: You have to enter password or password script", stop)
	else:
	if not (options.has_key("--password") or \
	options.has_key("--password-script") or options.has_key("--identity-file")):
	valid_input = False
	fail_usage("Failed: You have to enter password, password script or identity file", stop)

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

	if options.has_key("--identity-file") 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 \
	not options.has_key("--plug") and device_opt.count("port") and device_opt.count("no_port") == 0:
	valid_input = False
	fail_usage("Failed: You have to enter plug number or machine identification", stop)

	if options.has_key("--plug") and len(options["--plug"].split(",")) > 1 and \
	options.has_key("--method") 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)

	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 all_opt.has_key(k) and all_opt[k]["getopt"] != ":":
	# getopt == ":" means that opt is without short getopt, but has value
	getopt_string += all_opt[k]["getopt"]
	elif not all_opt.has_key(k):
	fail_usage("Parse error: unknown option '"+k+"'")

	if all_opt.has_key(k) and all_opt[k].has_key("longopt"):
	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 = ""
	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]

	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"
	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 = getopt.gnu_getopt(sys.argv[1:], getopt_string, longopt_list)[0]
	except getopt.GetoptError, 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 dict(entered_opt).keys():
	all_key = [key for (key, value) in 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]

	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 "):
	x = _join2(words, normal_separator, last_separator)
	wrapper = textwrap.TextWrapper()
	wrapper.initial_indent = " "*42
	wrapper.subsequent_indent = " "*40
	wrapper.width = 80
	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 all_opt[opt].has_key("choices"):
	longopt = "--" + all_opt[opt]["longopt"]
	possible_values_upper = [y.upper() for y in all_opt[opt]["choices"]]
	if options.has_key(longopt):
	options[longopt] = options[longopt].upper()
	if not options["--" + all_opt[opt]["longopt"]] in possible_values_upper:
	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", "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 not device_opt.count("separator"):
	available_actions.remove("list")
	available_actions.remove("list-status")

	return (available_actions, default_value)
	diff --git a/tests/data/metadata/fence_alom.xml b/tests/data/metadata/fence_alom.xml
	index 1c899917..57efc659 100644
	--- a/tests/data/metadata/fence_alom.xml
	+++ b/tests/data/metadata/fence_alom.xml
	@@ -1,131 +1,131 @@
	<?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>
	+ <shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<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 for ssh</shortdesc>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="22" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" default="1" />
	- <shortdesc lang="en">SSH connection</shortdesc>
	+ <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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/ssh" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_amt.xml b/tests/data/metadata/fence_amt.xml
	index f6d1757e..97bd35ec 100644
	--- a/tests/data/metadata/fence_amt.xml
	+++ b/tests/data/metadata/fence_amt.xml
	@@ -1,135 +1,135 @@
	<?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>
	+ <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="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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" 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 (onoff\|cycle)</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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]" />
	<content type="string" default="/usr/bin/amttool" />
	<shortdesc lang="en">Path to amttool binary</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="string" 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="string" 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="string" 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="string" 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="string" 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="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="sudo" unique="0" required="0">
	<getopt mixed="--use-sudo" />
	<content type="boolean" />
	- <shortdesc lang="en">Use sudo (without password) when calling 3rd party sotfware.</shortdesc>
	+ <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]" />
	<content type="string" default="/usr/bin/sudo" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_apc.xml b/tests/data/metadata/fence_apc.xml
	index c5df0a54..b148a3a6 100644
	--- a/tests/data/metadata/fence_apc.xml
	+++ b/tests/data/metadata/fence_apc.xml
	@@ -1,153 +1,154 @@
	<?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>
	+ <shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<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 for ssh</shortdesc>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="23" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <shortdesc lang="en">Physical plug number on device, UUID or
	+identification of machine</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	- <shortdesc lang="en">SSH connection</shortdesc>
	+ <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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/ssh" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<content type="string" default="/usr/bin/telnet" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_apc_snmp.xml b/tests/data/metadata/fence_apc_snmp.xml
	index 71dafecb..2d960fd9 100644
	--- a/tests/data/metadata/fence_apc_snmp.xml
	+++ b/tests/data/metadata/fence_apc_snmp.xml
	@@ -1,182 +1,183 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_apc_snmp" shortdesc="Fence agent for APC, Tripplite PDU 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>
	+ <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="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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="161" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <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 (MD5\|SHA)</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 (DES\|AES)</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 (noAuthNoPriv\|authNoPriv\|authPriv)</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 (1,2c,3)</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/snmpget" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<content type="string" default="/usr/bin/snmpset" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<content type="string" default="/usr/bin/snmpwalk" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_bladecenter.xml b/tests/data/metadata/fence_bladecenter.xml
	index ac017cc6..64c2bd24 100644
	--- a/tests/data/metadata/fence_bladecenter.xml
	+++ b/tests/data/metadata/fence_bladecenter.xml
	@@ -1,153 +1,154 @@
	<?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>
	+ <shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<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 for ssh</shortdesc>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="23" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <shortdesc lang="en">Physical plug number on device, UUID or
	+identification of machine</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	- <shortdesc lang="en">SSH connection</shortdesc>
	+ <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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/ssh" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<content type="string" default="/usr/bin/telnet" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_brocade.xml b/tests/data/metadata/fence_brocade.xml
	index efdfe224..5d81b64f 100644
	--- a/tests/data/metadata/fence_brocade.xml
	+++ b/tests/data/metadata/fence_brocade.xml
	@@ -1,147 +1,148 @@
	<?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>
	+ <shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<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 for ssh</shortdesc>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="23" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <shortdesc lang="en">Physical plug number on device, UUID or
	+identification of machine</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	- <shortdesc lang="en">SSH connection</shortdesc>
	+ <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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/ssh" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<content type="string" default="/usr/bin/telnet" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_cisco_mds.xml b/tests/data/metadata/fence_cisco_mds.xml
	index bd07420c..d8462e01 100644
	--- a/tests/data/metadata/fence_cisco_mds.xml
	+++ b/tests/data/metadata/fence_cisco_mds.xml
	@@ -1,181 +1,182 @@
	<?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>
	+ <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="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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="161" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <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 (MD5\|SHA)</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 (DES\|AES)</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 (noAuthNoPriv\|authNoPriv\|authPriv)</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 (1,2c,3)</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/snmpget" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<content type="string" default="/usr/bin/snmpset" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<content type="string" default="/usr/bin/snmpwalk" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_cisco_ucs.xml b/tests/data/metadata/fence_cisco_ucs.xml
	index d4799b71..59c160f0 100644
	--- a/tests/data/metadata/fence_cisco_ucs.xml
	+++ b/tests/data/metadata/fence_cisco_ucs.xml
	@@ -1,148 +1,149 @@
	<?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>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="80" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <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, force SSL 3.0</shortdesc>
	+ <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">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <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">SSL connection</shortdesc>
	+ <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">SSL connection without verifying fence device's certificate</shortdesc>
	+ <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">SSL connection with verifying fence device's certificate</shortdesc>
	+ <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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/gnutls-cli" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_docker.xml b/tests/data/metadata/fence_docker.xml
	index 54d1ad38..bedca88a 100644
	--- a/tests/data/metadata/fence_docker.xml
	+++ b/tests/data/metadata/fence_docker.xml
	@@ -1,146 +1,147 @@
	<?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>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" 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 (onoff\|cycle)</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <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">SSL connection</shortdesc>
	+ <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">SSL connection without verifying fence device's certificate</shortdesc>
	+ <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">SSL connection with verifying fence device's certificate</shortdesc>
	+ <shortdesc lang="en">Use SSL connection with verifying certificate</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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/gnutls-cli" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_drac.xml b/tests/data/metadata/fence_drac.xml
	index 6d3c934e..49c09935 100644
	--- a/tests/data/metadata/fence_drac.xml
	+++ b/tests/data/metadata/fence_drac.xml
	@@ -1,116 +1,116 @@
	<?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>
	+ <shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<getopt mixed="-c, --command-prompt=[prompt]" />
	<content type="string" default="['\\[username\\]# ']" />
	<shortdesc lang="en">Force Python regex for command prompt</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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="23" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/telnet" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_drac5.xml b/tests/data/metadata/fence_drac5.xml
	index 39e85e8c..83087d60 100644
	--- a/tests/data/metadata/fence_drac5.xml
	+++ b/tests/data/metadata/fence_drac5.xml
	@@ -1,157 +1,158 @@
	<?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>
	+ <shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<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 (DRAC 5, DRAC CMC, DRAC MC)</shortdesc>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	- <shortdesc lang="en">Identity file for ssh</shortdesc>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="23" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <shortdesc lang="en">Physical plug number on device, UUID or
	+identification of machine</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	- <shortdesc lang="en">SSH connection</shortdesc>
	+ <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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/ssh" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<content type="string" default="/usr/bin/telnet" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_dummy.xml b/tests/data/metadata/fence_dummy.xml
	index 84054730..916eafb5 100644
	--- a/tests/data/metadata/fence_dummy.xml
	+++ b/tests/data/metadata/fence_dummy.xml
	@@ -1,93 +1,93 @@
	<?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>
	+ <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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_eaton_snmp.xml b/tests/data/metadata/fence_eaton_snmp.xml
	index 660c1b61..17013a4f 100644
	--- a/tests/data/metadata/fence_eaton_snmp.xml
	+++ b/tests/data/metadata/fence_eaton_snmp.xml
	@@ -1,182 +1,183 @@
	<?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>
	+ <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="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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="161" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <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 (MD5\|SHA)</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 (DES\|AES)</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 (noAuthNoPriv\|authNoPriv\|authPriv)</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 (1,2c,3)</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/snmpget" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<content type="string" default="/usr/bin/snmpset" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<content type="string" default="/usr/bin/snmpwalk" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_emerson.xml b/tests/data/metadata/fence_emerson.xml
	index 7eadd412..d5fc4161 100644
	--- a/tests/data/metadata/fence_emerson.xml
	+++ b/tests/data/metadata/fence_emerson.xml
	@@ -1,182 +1,183 @@
	<?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>
	+ <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="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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="161" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <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 (MD5\|SHA)</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 (DES\|AES)</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 (noAuthNoPriv\|authNoPriv\|authPriv)</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 (1,2c,3)</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/snmpget" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<content type="string" default="/usr/bin/snmpset" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<content type="string" default="/usr/bin/snmpwalk" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_eps.xml b/tests/data/metadata/fence_eps.xml
	index f9f7f8ab..22ec9d95 100644
	--- a/tests/data/metadata/fence_eps.xml
	+++ b/tests/data/metadata/fence_eps.xml
	@@ -1,125 +1,126 @@
	<?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.
	.TP
	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>
	+ <shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="hidden_page" unique="0" required="0">
	<getopt mixed="-c, --page=[page]" />
	<content type="string" default="hidden.htm" />
	<shortdesc lang="en">Name of hidden page</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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="80" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <shortdesc lang="en">Physical plug number on device, UUID or
	+identification of machine</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_hds_cb.xml b/tests/data/metadata/fence_hds_cb.xml
	index 75bb81dd..2ff40ac7 100644
	--- a/tests/data/metadata/fence_hds_cb.xml
	+++ b/tests/data/metadata/fence_hds_cb.xml
	@@ -1,153 +1,154 @@
	<?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>
	+ <shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<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 for ssh</shortdesc>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="23" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <shortdesc lang="en">Physical plug number on device, UUID or
	+identification of machine</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	- <shortdesc lang="en">SSH connection</shortdesc>
	+ <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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/ssh" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<content type="string" default="/usr/bin/telnet" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_hpblade.xml b/tests/data/metadata/fence_hpblade.xml
	index 380a185e..4c4a3cc8 100644
	--- a/tests/data/metadata/fence_hpblade.xml
	+++ b/tests/data/metadata/fence_hpblade.xml
	@@ -1,153 +1,154 @@
	<?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. It logs into an enclosure via telnet or ssh and uses the command line interface to power on and off blades.</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>
	+ <shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<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 for ssh</shortdesc>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="23" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <shortdesc lang="en">Physical plug number on device, UUID or
	+identification of machine</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	- <shortdesc lang="en">SSH connection</shortdesc>
	+ <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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/ssh" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<content type="string" default="/usr/bin/telnet" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ibmblade.xml b/tests/data/metadata/fence_ibmblade.xml
	index d0492b8c..3d7ec14c 100644
	--- a/tests/data/metadata/fence_ibmblade.xml
	+++ b/tests/data/metadata/fence_ibmblade.xml
	@@ -1,182 +1,183 @@
	<?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>
	+ <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="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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="161" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <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 (MD5\|SHA)</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 (DES\|AES)</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 (noAuthNoPriv\|authNoPriv\|authPriv)</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 (1,2c,3)</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/snmpget" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<content type="string" default="/usr/bin/snmpset" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<content type="string" default="/usr/bin/snmpwalk" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_idrac.xml b/tests/data/metadata/fence_idrac.xml
	index fc2aa742..22dc05f8 100644
	--- a/tests/data/metadata/fence_idrac.xml
	+++ b/tests/data/metadata/fence_idrac.xml
	@@ -1,162 +1,162 @@
	<?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_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/).</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>
	+ <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="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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" 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">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <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 (onoff\|cycle)</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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="string" 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]" />
	<content type="string" default="/usr/bin/ipmitool" />
	<shortdesc lang="en">Path to ipmitool binary</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" 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="string" 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="string" 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="string" 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="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="sudo" unique="0" required="0">
	<getopt mixed="--use-sudo" />
	<content type="boolean" />
	- <shortdesc lang="en">Use sudo (without password) when calling 3rd party sotfware.</shortdesc>
	+ <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]" />
	<content type="string" default="/usr/bin/sudo" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ifmib.xml b/tests/data/metadata/fence_ifmib.xml
	index a560da8f..19ce45e3 100644
	--- a/tests/data/metadata/fence_ifmib.xml
	+++ b/tests/data/metadata/fence_ifmib.xml
	@@ -1,183 +1,184 @@
	<?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.
	.P
	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>
	+ <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="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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="161" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <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 (MD5\|SHA)</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 (DES\|AES)</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 (noAuthNoPriv\|authNoPriv\|authPriv)</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 (1,2c,3)</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/snmpget" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<content type="string" default="/usr/bin/snmpset" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<content type="string" default="/usr/bin/snmpwalk" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo.xml b/tests/data/metadata/fence_ilo.xml
	index 5d183b06..025a362e 100644
	--- a/tests/data/metadata/fence_ilo.xml
	+++ b/tests/data/metadata/fence_ilo.xml
	@@ -1,142 +1,142 @@
	<?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>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="443" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <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, force SSL 3.0</shortdesc>
	+ <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">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="ribcl" unique="0" required="0">
	<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">SSL connection</shortdesc>
	+ <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">SSL connection without verifying fence device's certificate</shortdesc>
	+ <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">SSL connection with verifying fence device's certificate</shortdesc>
	+ <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 negotiaton, force TLS 1.0</shortdesc>
	+ <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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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="string" 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="string" default="10" />
	<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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/gnutls-cli" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo2.xml b/tests/data/metadata/fence_ilo2.xml
	index 72b1dead..c23c483f 100644
	--- a/tests/data/metadata/fence_ilo2.xml
	+++ b/tests/data/metadata/fence_ilo2.xml
	@@ -1,142 +1,142 @@
	<?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>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="443" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <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, force SSL 3.0</shortdesc>
	+ <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">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="ribcl" unique="0" required="0">
	<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">SSL connection</shortdesc>
	+ <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">SSL connection without verifying fence device's certificate</shortdesc>
	+ <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">SSL connection with verifying fence device's certificate</shortdesc>
	+ <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 negotiaton, force TLS 1.0</shortdesc>
	+ <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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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="string" 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="string" default="10" />
	<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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/gnutls-cli" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo3.xml b/tests/data/metadata/fence_ilo3.xml
	index 6c606ee8..c948cffb 100644
	--- a/tests/data/metadata/fence_ilo3.xml
	+++ b/tests/data/metadata/fence_ilo3.xml
	@@ -1,162 +1,162 @@
	<?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_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/).</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>
	+ <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="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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" 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">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</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 (onoff\|cycle)</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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="string" 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]" />
	<content type="string" default="/usr/bin/ipmitool" />
	<shortdesc lang="en">Path to ipmitool binary</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" 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="string" 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="string" 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="string" 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="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="sudo" unique="0" required="0">
	<getopt mixed="--use-sudo" />
	<content type="boolean" />
	- <shortdesc lang="en">Use sudo (without password) when calling 3rd party sotfware.</shortdesc>
	+ <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]" />
	<content type="string" default="/usr/bin/sudo" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo3_ssh.xml b/tests/data/metadata/fence_ilo3_ssh.xml
	index fe5eabf0..4a3d0a90 100644
	--- a/tests/data/metadata/fence_ilo3_ssh.xml
	+++ b/tests/data/metadata/fence_ilo3_ssh.xml
	@@ -1,146 +1,146 @@
	<?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"/>
	<longdesc>fence_ilo_ssh is a fence agent that connects to iLO device. It logs into device via ssh and reboot a specified outlet. </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>
	+ <shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<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 for ssh</shortdesc>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="23" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <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 (onoff\|cycle)</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	- <shortdesc lang="en">SSH connection</shortdesc>
	+ <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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/ssh" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<content type="string" default="/usr/bin/telnet" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo4.xml b/tests/data/metadata/fence_ilo4.xml
	index 53bb5782..fc241fd2 100644
	--- a/tests/data/metadata/fence_ilo4.xml
	+++ b/tests/data/metadata/fence_ilo4.xml
	@@ -1,162 +1,162 @@
	<?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_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/).</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>
	+ <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="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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" 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">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <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 (onoff\|cycle)</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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="string" 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]" />
	<content type="string" default="/usr/bin/ipmitool" />
	<shortdesc lang="en">Path to ipmitool binary</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" 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="string" 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="string" 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="string" 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="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="sudo" unique="0" required="0">
	<getopt mixed="--use-sudo" />
	<content type="boolean" />
	- <shortdesc lang="en">Use sudo (without password) when calling 3rd party sotfware.</shortdesc>
	+ <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]" />
	<content type="string" default="/usr/bin/sudo" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo4_ssh.xml b/tests/data/metadata/fence_ilo4_ssh.xml
	index de64cf16..7eb49987 100644
	--- a/tests/data/metadata/fence_ilo4_ssh.xml
	+++ b/tests/data/metadata/fence_ilo4_ssh.xml
	@@ -1,146 +1,146 @@
	<?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"/>
	<longdesc>fence_ilo_ssh is a fence agent that connects to iLO device. It logs into device via ssh and reboot a specified outlet. </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>
	+ <shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<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 for ssh</shortdesc>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="23" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <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 (onoff\|cycle)</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	- <shortdesc lang="en">SSH connection</shortdesc>
	+ <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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/ssh" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<content type="string" default="/usr/bin/telnet" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo_moonshot.xml b/tests/data/metadata/fence_ilo_moonshot.xml
	index 39b745d7..1eb82ed3 100644
	--- a/tests/data/metadata/fence_ilo_moonshot.xml
	+++ b/tests/data/metadata/fence_ilo_moonshot.xml
	@@ -1,143 +1,144 @@
	<?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>
	+ <shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<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 for ssh</shortdesc>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="22" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <shortdesc lang="en">Physical plug number on device, UUID or
	+identification of machine</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" default="1" />
	- <shortdesc lang="en">SSH connection</shortdesc>
	+ <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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/ssh" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo_mp.xml b/tests/data/metadata/fence_ilo_mp.xml
	index 093d848d..90aec721 100644
	--- a/tests/data/metadata/fence_ilo_mp.xml
	+++ b/tests/data/metadata/fence_ilo_mp.xml
	@@ -1,136 +1,136 @@
	<?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>
	+ <shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<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 for ssh</shortdesc>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="23" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	- <shortdesc lang="en">SSH connection</shortdesc>
	+ <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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/ssh" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<content type="string" default="/usr/bin/telnet" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo_ssh.xml b/tests/data/metadata/fence_ilo_ssh.xml
	index 338dc56d..c02ca8c8 100644
	--- a/tests/data/metadata/fence_ilo_ssh.xml
	+++ b/tests/data/metadata/fence_ilo_ssh.xml
	@@ -1,146 +1,146 @@
	<?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"/>
	<longdesc>fence_ilo_ssh is a fence agent that connects to iLO device. It logs into device via ssh and reboot a specified outlet. </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>
	+ <shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<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 for ssh</shortdesc>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="23" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <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 (onoff\|cycle)</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	- <shortdesc lang="en">SSH connection</shortdesc>
	+ <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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/ssh" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<content type="string" default="/usr/bin/telnet" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_imm.xml b/tests/data/metadata/fence_imm.xml
	index eae6ab48..0ff5c088 100644
	--- a/tests/data/metadata/fence_imm.xml
	+++ b/tests/data/metadata/fence_imm.xml
	@@ -1,162 +1,162 @@
	<?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_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/).</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>
	+ <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="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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" 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">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <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 (onoff\|cycle)</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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="string" 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]" />
	<content type="string" default="/usr/bin/ipmitool" />
	<shortdesc lang="en">Path to ipmitool binary</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" 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="string" 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="string" 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="string" 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="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="sudo" unique="0" required="0">
	<getopt mixed="--use-sudo" />
	<content type="boolean" />
	- <shortdesc lang="en">Use sudo (without password) when calling 3rd party sotfware.</shortdesc>
	+ <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]" />
	<content type="string" default="/usr/bin/sudo" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_intelmodular.xml b/tests/data/metadata/fence_intelmodular.xml
	index 8224858c..ac1c0d6d 100644
	--- a/tests/data/metadata/fence_intelmodular.xml
	+++ b/tests/data/metadata/fence_intelmodular.xml
	@@ -1,184 +1,185 @@
	<?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).
	.P
	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>
	+ <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="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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="161" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <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 (MD5\|SHA)</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 (DES\|AES)</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 (noAuthNoPriv\|authNoPriv\|authPriv)</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 (1,2c,3)</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/snmpget" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<content type="string" default="/usr/bin/snmpset" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<content type="string" default="/usr/bin/snmpwalk" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ipdu.xml b/tests/data/metadata/fence_ipdu.xml
	index 22756e98..2deae01c 100644
	--- a/tests/data/metadata/fence_ipdu.xml
	+++ b/tests/data/metadata/fence_ipdu.xml
	@@ -1,182 +1,183 @@
	<?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>
	+ <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="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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="161" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <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 (MD5\|SHA)</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 (DES\|AES)</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 (noAuthNoPriv\|authNoPriv\|authPriv)</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 (1,2c,3)</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/snmpget" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<content type="string" default="/usr/bin/snmpset" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<content type="string" default="/usr/bin/snmpwalk" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ipmilan.xml b/tests/data/metadata/fence_ipmilan.xml
	index 3f8b96af..c7bfefba 100644
	--- a/tests/data/metadata/fence_ipmilan.xml
	+++ b/tests/data/metadata/fence_ipmilan.xml
	@@ -1,162 +1,162 @@
	<?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_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/).</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>
	+ <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="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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" 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">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <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 (onoff\|cycle)</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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="string" 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]" />
	<content type="string" default="/usr/bin/ipmitool" />
	<shortdesc lang="en">Path to ipmitool binary</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" 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="string" 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="string" 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="string" 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="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="sudo" unique="0" required="0">
	<getopt mixed="--use-sudo" />
	<content type="boolean" />
	- <shortdesc lang="en">Use sudo (without password) when calling 3rd party sotfware.</shortdesc>
	+ <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]" />
	<content type="string" default="/usr/bin/sudo" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ldom.xml b/tests/data/metadata/fence_ldom.xml
	index df8897c5..16a57820 100644
	--- a/tests/data/metadata/fence_ldom.xml
	+++ b/tests/data/metadata/fence_ldom.xml
	@@ -1,145 +1,146 @@
	<?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.
	.P
	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>
	+ <shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<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 for ssh</shortdesc>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="22" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <shortdesc lang="en">Physical plug number on device, UUID or
	+identification of machine</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" default="1" />
	- <shortdesc lang="en">SSH connection</shortdesc>
	+ <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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/ssh" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_lpar.xml b/tests/data/metadata/fence_lpar.xml
	index 967815e4..cc474e07 100644
	--- a/tests/data/metadata/fence_lpar.xml
	+++ b/tests/data/metadata/fence_lpar.xml
	@@ -1,156 +1,157 @@
	<?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>
	+ <shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<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" />
	</content>
	<shortdesc lang="en">Force HMC version to use (3 or 4)</shortdesc>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	- <shortdesc lang="en">Identity file for ssh</shortdesc>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="22" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <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">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <shortdesc lang="en">Physical plug number on device, UUID or
	+identification of machine</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" default="1" />
	- <shortdesc lang="en">SSH connection</shortdesc>
	+ <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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/ssh" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_mpath.xml b/tests/data/metadata/fence_mpath.xml
	index c8053317..f53e877c 100644
	--- a/tests/data/metadata/fence_mpath.xml
	+++ b/tests/data/metadata/fence_mpath.xml
	@@ -1,100 +1,100 @@
	<?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 an unique key for each pair of node and device that has to be set also 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>
	+ <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/dm-3). Each device must support SCSI-3 persistent reservations.</shortdesc>
	</parameter>
	<parameter name="key" unique="0" required="1">
	<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 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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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="string" 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="string" 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]" />
	<content type="string" default="/usr/sbin/mpathpersist" />
	<shortdesc lang="en">Path to mpathpersist binary</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="string" 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="string" 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="string" 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="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="sudo" unique="0" required="0">
	<getopt mixed="--use-sudo" />
	<content type="boolean" />
	- <shortdesc lang="en">Use sudo (without password) when calling 3rd party sotfware.</shortdesc>
	+ <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]" />
	<content type="string" default="/usr/bin/sudo" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_netio.xml b/tests/data/metadata/fence_netio.xml
	index bcaac430..1782c260 100644
	--- a/tests/data/metadata/fence_netio.xml
	+++ b/tests/data/metadata/fence_netio.xml
	@@ -1,123 +1,124 @@
	<?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>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="1234" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <shortdesc lang="en">Physical plug number on device, UUID or
	+identification of machine</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/telnet" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ovh.xml b/tests/data/metadata/fence_ovh.xml
	index 19df9589..bb134a2c 100644
	--- a/tests/data/metadata/fence_ovh.xml
	+++ b/tests/data/metadata/fence_ovh.xml
	@@ -1,102 +1,103 @@
	<?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>
	+ <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">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <shortdesc lang="en">Physical plug number on device, UUID or
	+identification of machine</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_pve.xml b/tests/data/metadata/fence_pve.xml
	index 838f12cb..59c650c9 100644
	--- a/tests/data/metadata/fence_pve.xml
	+++ b/tests/data/metadata/fence_pve.xml
	@@ -1,123 +1,123 @@
	<?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>
	+ <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="ipaddr" unique="0" required="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="string" default="8006" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" default="root@pam" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	<shortdesc lang="en">Id of the virtual machine.</shortdesc>
	</parameter>
	<parameter name="node_name" unique="0" required="0">
	<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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_raritan.xml b/tests/data/metadata/fence_raritan.xml
	index d66fd558..76bee1ee 100644
	--- a/tests/data/metadata/fence_raritan.xml
	+++ b/tests/data/metadata/fence_raritan.xml
	@@ -1,123 +1,124 @@
	<?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>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="23" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <shortdesc lang="en">Physical plug number on device, UUID or
	+identification of machine</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/telnet" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_rhevm.xml b/tests/data/metadata/fence_rhevm.xml
	index 87f90edf..80f05a3d 100644
	--- a/tests/data/metadata/fence_rhevm.xml
	+++ b/tests/data/metadata/fence_rhevm.xml
	@@ -1,148 +1,149 @@
	<?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>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="80" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <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, force SSL 3.0</shortdesc>
	+ <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">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <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">SSL connection</shortdesc>
	+ <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">SSL connection without verifying fence device's certificate</shortdesc>
	+ <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">SSL connection with verifying fence device's certificate</shortdesc>
	+ <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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/gnutls-cli" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_rsa.xml b/tests/data/metadata/fence_rsa.xml
	index de2ef231..8b6102cb 100644
	--- a/tests/data/metadata/fence_rsa.xml
	+++ b/tests/data/metadata/fence_rsa.xml
	@@ -1,136 +1,136 @@
	<?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>
	+ <shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<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 for ssh</shortdesc>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="23" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	- <shortdesc lang="en">SSH connection</shortdesc>
	+ <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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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="string" 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="string" default="10" />
	<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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/ssh" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<content type="string" default="/usr/bin/telnet" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_rsb.xml b/tests/data/metadata/fence_rsb.xml
	index ff4450ea..c9cab8ef 100644
	--- a/tests/data/metadata/fence_rsb.xml
	+++ b/tests/data/metadata/fence_rsb.xml
	@@ -1,136 +1,136 @@
	<?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>
	+ <shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<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 for ssh</shortdesc>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="3172" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	- <shortdesc lang="en">SSH connection</shortdesc>
	+ <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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/ssh" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<content type="string" default="/usr/bin/telnet" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_sanbox2.xml b/tests/data/metadata/fence_sanbox2.xml
	index 18e7c31d..4f2f7f13 100644
	--- a/tests/data/metadata/fence_sanbox2.xml
	+++ b/tests/data/metadata/fence_sanbox2.xml
	@@ -1,127 +1,128 @@
	<?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>
	+ <shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<getopt mixed="-c, --command-prompt=[prompt]" />
	<content type="string" default="[' #> ']" />
	<shortdesc lang="en">Force Python regex for command prompt</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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="23" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <shortdesc lang="en">Physical plug number on device, UUID or
	+identification of machine</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/telnet" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_scsi.xml b/tests/data/metadata/fence_scsi.xml
	index 01e5648c..926b921f 100644
	--- a/tests/data/metadata/fence_scsi.xml
	+++ b/tests/data/metadata/fence_scsi.xml
	@@ -1,116 +1,116 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_scsi" shortdesc="Fence agent for SCSI persistentl 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 devive(s). 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.</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>
	+ <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 device (eg. /dev/sdc) or device-mapper multipath devices (eg. /dev/dm-3). 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="nodename" unique="0" required="0">
	<getopt mixed="-n, --nodename=[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="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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/sbin/corosync-cmapctl" />
	<shortdesc lang="en">Path to corosync-cmapctl binary</shortdesc>
	</parameter>
	<parameter name="sg_persist_path" unique="0" required="0">
	<getopt mixed="--sg_persist-path=[path]" />
	<content type="string" default="/usr/bin/sg_persist" />
	<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]" />
	<content type="string" default="/usr/bin/sg_turs" />
	<shortdesc lang="en">Path to sg_turs binary</shortdesc>
	</parameter>
	<parameter name="vgs_path" unique="0" required="0">
	<getopt mixed="--vgs-path=[path]" />
	<content type="string" default="/usr/sbin/vgs" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_tripplite_snmp.xml b/tests/data/metadata/fence_tripplite_snmp.xml
	index fc98bd40..d1b7da61 100644
	--- a/tests/data/metadata/fence_tripplite_snmp.xml
	+++ b/tests/data/metadata/fence_tripplite_snmp.xml
	@@ -1,182 +1,183 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_tripplite_snmp" shortdesc="Fence agent for APC, Tripplite PDU 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>
	+ <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="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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="161" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <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 (MD5\|SHA)</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 (DES\|AES)</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 (noAuthNoPriv\|authNoPriv\|authPriv)</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 (1,2c,3)</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/snmpget" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<content type="string" default="/usr/bin/snmpset" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<content type="string" default="/usr/bin/snmpwalk" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_virsh.xml b/tests/data/metadata/fence_virsh.xml
	index e03b2b9f..9b61d9ab 100644
	--- a/tests/data/metadata/fence_virsh.xml
	+++ b/tests/data/metadata/fence_virsh.xml
	@@ -1,155 +1,156 @@
	<?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.
	.P
	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>
	+ <shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<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 for ssh</shortdesc>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="22" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <shortdesc lang="en">Physical plug number on device, UUID or
	+identification of machine</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" default="1" />
	- <shortdesc lang="en">SSH connection</shortdesc>
	+ <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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="sudo" unique="0" required="0">
	<getopt mixed="--use-sudo" />
	<content type="boolean" />
	- <shortdesc lang="en">Use sudo (without password) when calling 3rd party sotfware.</shortdesc>
	+ <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]" />
	<content type="string" default="/usr/bin/ssh" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="sudo_path" unique="0" required="0">
	<getopt mixed="--sudo-path=[path]" />
	<content type="string" default="/usr/bin/sudo" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_vmware_soap.xml b/tests/data/metadata/fence_vmware_soap.xml
	index accf8640..519aae95 100644
	--- a/tests/data/metadata/fence_vmware_soap.xml
	+++ b/tests/data/metadata/fence_vmware_soap.xml
	@@ -1,145 +1,146 @@
	<?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+.
	.P
	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>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="80" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <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, force SSL 3.0</shortdesc>
	+ <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">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <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">SSL connection</shortdesc>
	+ <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">SSL connection without verifying fence device's certificate</shortdesc>
	+ <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">SSL connection with verifying fence device's certificate</shortdesc>
	+ <shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/gnutls-cli" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_wti.xml b/tests/data/metadata/fence_wti.xml
	index 83d5f783..64dcf5fa 100644
	--- a/tests/data/metadata/fence_wti.xml
	+++ b/tests/data/metadata/fence_wti.xml
	@@ -1,148 +1,149 @@
	<?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>
	+ <shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<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 for ssh</shortdesc>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="23" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <shortdesc lang="en">Physical plug number on device, UUID or
	+identification of machine</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	- <shortdesc lang="en">SSH connection</shortdesc>
	+ <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="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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]" />
	<content type="string" default="/usr/bin/ssh" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<content type="string" default="/usr/bin/telnet" />
	<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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_xenapi.xml b/tests/data/metadata/fence_xenapi.xml
	index fcfaf3aa..b6dbe2d5 100644
	--- a/tests/data/metadata/fence_xenapi.xml
	+++ b/tests/data/metadata/fence_xenapi.xml
	@@ -1,103 +1,104 @@
	<?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 sesssion 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>
	+ <shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <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">The URL of the XenServer host.</shortdesc>
	+ <shortdesc lang="en">URL to connect to XenServer on</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" 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="string" 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="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_zvmip.xml b/tests/data/metadata/fence_zvmip.xml
	index f698dfed..3d3c5866 100644
	--- a/tests/data/metadata/fence_zvmip.xml
	+++ b/tests/data/metadata/fence_zvmip.xml
	@@ -1,140 +1,141 @@
	<?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_OPERATIONS

	Where XXXXXXX is the name of the virtual machine used in the authuser field of the request.
	</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>
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	- <shortdesc lang="en">IP Address or Hostname</shortdesc>
	+ <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="string" default="44444" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	- <shortdesc lang="en">Login Name</shortdesc>
	+ <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 (onoff\|cycle)</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<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">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	- <shortdesc lang="en">Script to retrieve password</shortdesc>
	+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	- <shortdesc lang="en">Physical plug number, name of virtual machine or UUID</shortdesc>
	+ <shortdesc lang="en">Physical plug number on device, UUID or
	+identification of machine</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<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 operation list</shortdesc>
	+ <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="string" 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="string" 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="string" 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="string" 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="string" default="5.0" />
	<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="string" 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="validate-all" />
	</actions>
	</resource-agent>

File Metadata

Mime Type: text/x-diff
Expires: Wed, Feb 26, 9:59 PM (10 h, 8 m ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1465803
Default Alt Text: (398 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions