No OneTemporary
Actions

Size

112 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
	index c84476f2..6a30ef8a 100644
	--- a/fence/agents/lib/fencing.py.py
	+++ b/fence/agents/lib/fencing.py.py
	@@ -1,1128 +1,1128 @@
	#!/usr/bin/python -tt

	import sys, getopt, time, os, uuid, pycurl, stat
	import pexpect, re, atexit, syslog
	import logging
	import subprocess
	import threading
	import shlex
	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' ]

	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

	TELNET_PATH = "/usr/bin/telnet"
	SSH_PATH = "/usr/bin/ssh"
	SSL_PATH = "@GNUTLSCLI_PATH@"
	SUDO_PATH = "/usr/bin/sudo"

	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",
	"required" : "0",
	"shortdesc" : "Display version information and exit",
	"order" : 53 },
	"verbose" : {
	"getopt" : "v",
	"longopt" : "verbose",
	"help" : "-v, --verbose Verbose mode",
	"required" : "0",
	"shortdesc" : "Verbose mode",
	"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" : "f:",
	"longopt" : "delay",
	"help" : "--delay=[seconds] Wait X seconds before fencing is started",
	"required" : "0",
	"shortdesc" : "Wait X seconds before fencing is started",
	"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",
	"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",
	"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 },
	"passwd" : {
	"getopt" : "p:",
	"longopt" : "password",
	"help" : "-p, --password=[password] Login password or passphrase",
	"required" : "0",
	"shortdesc" : "Login password or passphrase",
	"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 ",
	"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",
	"shortdesc" : "Force Python regex for command prompt",
	"required" : "0",
	"order" : 1 },
	"secure" : {
	"getopt" : "x",
	"longopt" : "ssh",
	"help" : "-x, --ssh Use ssh connection",
	"shortdesc" : "SSH connection",
	"required" : "0",
	"order" : 1 },
	"ssh_options" : {
	"getopt" : "X:",
	"longopt" : "ssh-options",
	"help" : "--ssh-options=[options] SSH options to use",
	"shortdesc" : "SSH options to use",
	"required" : "0",
	"order" : 1 },
	"ssl" : {
	"getopt" : "z",
	"longopt" : "ssl",
	"help" : "-z, --ssl Use ssl connection",
	"required" : "0",
	"shortdesc" : "SSL connection",
	"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 do not support TLS1.0 and up.",
	"required" : "0",
	"shortdesc" : "Disable TLS negotiation",
	"order" : 1 },
	"port" : {
	"getopt" : "n:",
	"longopt" : "plug",
	"help" : "-n, --plug=[id] Physical plug number on device, UUID or\n" +
	" 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",
	"shortdesc" : "Physical switch number on device",
	"order" : 1 },
	"exec" : {
	"getopt" : "e:",
	"longopt" : "exec",
	"help" : "-e, --exec=[command] Command to execute",
	"required" : "0",
	"shortdesc" : "Command to execute",
	"order" : 1 },
	"vmware_type" : {
	"getopt" : "d:",
	"longopt" : "vmware_type",
	"help" : "-d, --vmware_type=[type] Type of VMware to connect",
	"required" : "0",
	"shortdesc" : "Type of VMware to connect",
	"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",
	"shortdesc" : "Set the community string",
	"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)",
	"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",
	"shortdesc" : "Set privacy protocol password",
	"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",
	"shortdesc" : "Script to run to retrieve privacy password",
	"order" : 1},
	"inet4_only" : {
	"getopt" : "4",
	"longopt" : "inet4-only",
	"help" : "-4, --inet4-only Forces agent to use IPv4 addresses only",
	"required" : "0",
	"shortdesc" : "Forces agent to use IPv4 addresses only",
	"order" : 1 },
	"inet6_only" : {
	"getopt" : "6",
	"longopt" : "inet6-only",
	"help" : "-6, --inet6-only Forces agent to use IPv6 addresses only",
	"required" : "0",
	"shortdesc" : "Forces agent to use IPv6 addresses only",
	"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" : "y:",
	"longopt" : "login-timeout",
	"help" : "--login-timeout=[seconds] Wait X seconds for cmd prompt after login",
	"default" : "5",
	"required" : "0",
	"shortdesc" : "Wait X seconds for cmd prompt after login",
	"order" : 200 },
	"shell_timeout" : {
	"getopt" : "Y:",
	"longopt" : "shell-timeout",
	"help" : "--shell-timeout=[seconds] Wait X seconds for cmd prompt after issuing command",
	"default" : "3",
	"required" : "0",
	"shortdesc" : "Wait X seconds for cmd prompt after issuing command",
	"order" : 200 },
	"power_timeout" : {
	"getopt" : "g:",
	"longopt" : "power-timeout",
	"help" : "--power-timeout=[seconds] Test X seconds for status change after ON/OFF",
	"default" : "20",
	"required" : "0",
	"shortdesc" : "Test X seconds for status change after ON/OFF",
	"order" : 200 },
	"power_wait" : {
	"getopt" : "G:",
	"longopt" : "power-wait",
	"help" : "--power-wait=[seconds] Wait X seconds after issuing ON/OFF",
	"default" : "0",
	"required" : "0",
	"shortdesc" : "Wait X seconds after issuing ON/OFF",
	"order" : 200 },
	"missing_as_off" : {
	"getopt" : "M",
	"longopt" : "missing-as-off",
	"help" : "--missing-as-off Missing port returns OFF instead of failure",
	"required" : "0",
	"shortdesc" : "Missing port returns OFF instead of failure",
	"order" : 200 },
	"retry_on" : {
	"getopt" : "F:",
	"longopt" : "retry-on",
	"help" : "--retry-on=[attempts] Count of attempts to retry power on",
	"default" : "1",
	"required" : "0",
	"shortdesc" : "Count of attempts to retry power on",
	"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" : "d",
	"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}
	}

	# 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" ],
	"secure" : [ "identity_file", "ssh_options" ],
	"ipaddr" : [ "ipport", "inet4_only", "inet6_only" ],
	"port" : [ "separator" ],
	"community" : [ "snmp_auth_prot", "snmp_sec_level", "snmp_priv_prot", \
	"snmp_priv_passwd", "snmp_priv_passwd_script" ]
	}

	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, options, 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)
	pexpect.spawn.send(self, message)

	# send EOL according to what was detected in login process (telnet)
	def send_eol(self, message):
	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]))
	syslog.syslog(syslog.LOG_ERR, "Failed to close standard output")
	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 = ""):
	if len(message) > 0:
	logging.error("%s\n" % message)
	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)
	syslog.syslog(syslog.LOG_ERR, 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, options, 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[1]["order"], y[1]["order"]))

	print "<?xml version=\"1.0\" ?>"
	print "<resource-agent name=\"" + os.path.basename(sys.argv[0]) + \
	"\" shortdesc=\"" + docs["shortdesc"] + "\" >"
	if "symlink" in docs:
	for (symlink, desc) in docs["symlink"]:
	print "<symlink name=\"" + symlink + "\" shortdesc=\"" + desc + "\"/>"
	print "<longdesc>" + docs["longdesc"] + "</longdesc>"
	if docs.has_key("vendorurl"):
	print "<vendor-url>" + docs["vendorurl"] + "</vendor-url>"
	print "<parameters>"
	for option, _ in sorted_list:
	if all_opt[option].has_key("shortdesc"):
	print "\t<parameter name=\"" + option + "\" unique=\"0\" required=\"" + all_opt[option]["required"] + "\">"

	default = ""
	if all_opt[option].has_key("default"):
	default = str(all_opt[option]["default"])
	elif options.has_key("--" + all_opt[option]["longopt"]) and all_opt[option]["getopt"].endswith(":"):
	if options["--" + all_opt[option]["longopt"]]:
	try:
	default = options["--" + all_opt[option]["longopt"]]
	except TypeError:
	## @todo/@note: Currently there is no clean way how to handle lists
	## we can create a string from it but we can't set it on command line
	default = str(options["--" + all_opt[option]["longopt"]])
	elif options.has_key("--" + all_opt[option]["longopt"]):
	default = "true"

	if default:
	default = default.replace("&", "&" )
	default = default.replace('"', """ )
	default = default.replace('<', "<" )
	default = default.replace('>', ">" )
	default = default.replace("'", "'" )
	default = "default=\"" + 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)
	+ res = re.compile(r"^(.*?--\S+)\s+", re.IGNORECASE \| re.S).search(mixed)
	if None != res:
	mixed = res.group(1)
	mixed = mixed.replace("<", "<").replace(">", ">")
	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\">" + all_opt[option]["shortdesc"] + "</shortdesc>"
	print "\t</parameter>"
	print "</parameters>"
	print "<actions>"
	if avail_opt.count("fabric_fencing") == 1:
	## do 'unfence' at the start
	print "\t<action name=\"on\" automatic=\"1\"/>"
	else:
	print "\t<action name=\"on\" automatic=\"0\"/>"
	print "\t<action name=\"off\" />"

	if avail_opt.count("fabric_fencing") == 0:
	print "\t<action name=\"reboot\" />"

	print "\t<action name=\"status\" />"
	print "\t<action name=\"list\" />"
	print "\t<action name=\"monitor\" />"
	print "\t<action name=\"metadata\" />"
	print "</actions>"
	print "</resource-agent>"

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

	##
	## Set standard environment
	#####
	os.putenv("LANG", "C")
	os.putenv("LC_ALL", "C")

	##
	## Prepare list of options for getopt
	#####
	getopt_string = ""
	longopt_list = [ ]
	for k in avail_opt:
	if all_opt.has_key(k):
	getopt_string += all_opt[k]["getopt"]
	else:
	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"])

	##
	## Read options from command line or standard input
	#####
	if len(sys.argv) > 1:
	try:
	opt, _args = getopt.gnu_getopt(sys.argv[1:], getopt_string, longopt_list)
	except getopt.GetoptError, error:
	fail_usage("Parse error: " + error.msg)

	## Transform short getopt to long one which are used in fencing agents
	#####
	old_opt = opt
	opt = { }
	for o in dict(old_opt).keys():
	if o.startswith("--"):
	for x in all_opt.keys():
	if all_opt[x].has_key("longopt") and "--" + all_opt[x]["longopt"] == o:
	opt["--" + all_opt[x]["longopt"]] = dict(old_opt)[o]
	else:
	for x in all_opt.keys():
	if x in avail_opt and all_opt[x].has_key("getopt") and all_opt[x].has_key("longopt") and \
	("-" + all_opt[x]["getopt"] == o or "-" + all_opt[x]["getopt"].rstrip(":") == o):
	opt["--" + all_opt[x]["longopt"]] = dict(old_opt)[o]
	opt[o] = dict(old_opt)[o]

	## Compatibility Layer
	#####
	z = dict(opt)
	if z.has_key("--plug") == 1:
	z["-m"] = z["--plug"]

	opt = z
	##
	#####
	else:
	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:
	logging.warning("Parse error: Ignoring unknown option '%s'\n" % line)
	syslog.syslog(syslog.LOG_WARNING, "Parse error: Ignoring unknown option '"+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

	##
	## 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):

	device_opt.extend(add_dependency_options(device_opt))

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

	## Set requirements that should be included in metadata
	#####
	if device_opt.count("login") and device_opt.count("no_login") == 0:
	all_opt["login"]["required"] = "1"
	else:
	all_opt["login"]["required"] = "0"

	if device_opt.count("fabric_fencing"):
	all_opt["action"]["default"] = "off"
	all_opt["action"]["help"] = "-o, --action=[action] Action: status, off (default) or on"

	if device_opt.count("ipport"):
	if options.has_key("--ipport"):
	all_opt["ipport"]["help"] = "-u, --ipport=[port] " + \
	"TCP/UDP port to use (default " + options["--ipport"] +")"
	elif all_opt.has_key("ipport") and all_opt["ipport"].has_key("default"):
	all_opt["ipport"]["help"] = "-u, --ipport=[port] " + \
	"TCP/UDP port to use (default " + all_opt["ipport"]["default"] +")"
	elif device_opt.count("snmp_version"):
	all_opt["ipport"]["default"] = "161"
	all_opt["ipport"]["help"] = "-u, --ipport=[port] TCP/UDP port to use (default 161)"
	elif options.has_key("--ssh") or (all_opt["secure"].has_key("default") and all_opt["secure"]["default"] == '1'):
	all_opt["ipport"]["default"] = 22
	all_opt["ipport"]["help"] = "-u, --ipport=[port] TCP/UDP port to use (default 22)"
	elif options.has_key("--ssl") or (all_opt["ssl"].has_key("default") and all_opt["ssl"]["default"] == '1'):
	all_opt["ipport"]["default"] = 443
	all_opt["ipport"]["help"] = "-u, --ipport=[port] TCP/UDP port to use (default 443)"
	elif device_opt.count("web"):
	all_opt["ipport"]["default"] = 80
	if device_opt.count("ssl") == 0:
	all_opt["ipport"]["help"] = "-u, --ipport=[port] TCP/UDP port to use (default 80)"
	else:
	all_opt["ipport"]["help"] = "-u, --ipport=[port] TCP/UDP port to use\n\
	(default 80, 443 if --ssl option is used)"
	else:
	all_opt["ipport"]["default"] = 23
	if device_opt.count("secure") == 0:
	all_opt["ipport"]["help"] = "-u, --ipport=[port] TCP/UDP port to use (default 23)"
	else:
	all_opt["ipport"]["help"] = "-u, --ipport=[port] TCP/UDP port to use\n\
	(default 23, 22 if --ssh option is used)"

	## Set default values
	#####
	for opt in device_opt:
	if all_opt[opt].has_key("default"):
	getopt_long = "--" + all_opt[opt]["longopt"]
	if 0 == options.has_key(getopt_long):
	options[getopt_long] = all_opt[opt]["default"]

	## In special cases (show help, metadata or version) we don't need to check anything
	#####
	if options.has_key("--help") or options.has_key("--version") or \
	(options.has_key("--action") and options["--action"].lower() == "metadata"):
	return options

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

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

	acceptable_actions = [ "on", "off", "status", "list", "monitor" ]
	if 1 == device_opt.count("fabric_fencing"):
	## Compatibility layer
	#####
	acceptable_actions.extend(["enable", "disable"])
	else:
	acceptable_actions.extend(["reboot"])

	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"

	## automatic detection and set of valid UUID from --plug
	if (0 == options.has_key("--username")) and \
	device_opt.count("login") and (device_opt.count("no_login") == 0):
	fail_usage("Failed: You have to set login name")

	if device_opt.count("ipaddr") and 0 == options.has_key("--ip") and 0 == options.has_key("--managed"):
	fail_usage("Failed: You have to enter fence address")

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

	if 0 == options.has_key("--ssh") and 1 == options.has_key("--identity-file"):
	fail_usage("Failed: You have to use identity file together with ssh connection (-x)")

	if 1 == options.has_key("--identity-file"):
	if 0 == os.path.isfile(options["--identity-file"]):
	fail_usage("Failed: Identity file " + options["--identity-file"] + " does not exist")

	if (0 == ["list", "monitor"].count(options["--action"].lower())) and \
	0 == options.has_key("--plug") and device_opt.count("port") and device_opt.count("no_port") == 0:
	fail_usage("Failed: You have to enter plug number or machine identification")

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

	if options.has_key("--debug-file"):
	try:
	fh = logging.FileHandler(options["--debug-file"])
	fh.setLevel(logging.DEBUG)
	logging.getLogger().addHandler(fh)
	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("--ipport") == False:
	if options.has_key("--ssh"):
	options["--ipport"] = 22
	elif options.has_key("--ssl"):
	options["--ipport"] = 443
	elif device_opt.count("web"):
	options["--ipport"] = 80
	else:
	options["--ipport"] = 23

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

	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:
	fail_usage("Failed: You have to enter a valid choice " + \
	"for %s from the valid values: %s" % \
	("--" + all_opt[opt]["longopt"] , str(all_opt[opt]["choices"])))

	return options

	def wait_power_status(tn, options, get_power_fn):
	for dummy in xrange(int(options["--power-timeout"])):
	if get_multi_power_fn(tn, options, get_power_fn) != options["--action"]:
	time.sleep(1)
	else:
	return 1
	return 0

	## 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(tn, options, get_power_fn):
	status = "off"

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

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

	return status

	def set_multi_power_fn(tn, options, set_power_fn):
	if options.has_key("--plugs"):
	for plug in options["--plugs"]:
	try:
	options["--uuid"] = str(uuid.UUID(plug))
	except ValueError:
	pass
	except KeyError:
	pass
	options["--plug"] = plug
	set_power_fn(tn, options)
	else:
	set_power_fn(tn, options)

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

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

	## Process special options (and exit)
	#####
	if options.has_key("--help"):
	usage(device_opt)
	sys.exit(0)

	if options.has_key("--action") and options["--action"].lower() == "metadata":
	metadata(device_opt, options, 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(tn, 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"] == "list" and 0 == options["device_opt"].count("port"):
	print "N/A"
	return
	elif options["--action"] == "list" and 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"
	return
	elif (options["--action"] == "list") or \
	((options["--action"] == "monitor") and 1 == options["device_opt"].count("port")):
	outlets = get_outlet_list(tn, options)
	## keys can be numbers (port numbers) or strings (names of VM)
	for outlet_id in outlets.keys():
	(alias, status) = outlets[outlet_id]
	if options["--action"] != "monitor":
	print outlet_id + options["--separator"] + alias
	return

	status = get_multi_power_fn(tn, options, get_power_fn)

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

	if options["--action"] == "on":
	if status == "on":
	print "Success: Already ON"
	else:
	power_on = False
	for _ in range(1, 1 + int(options["--retry-on"])):
	set_multi_power_fn(tn, options, set_power_fn)
	time.sleep(int(options["--power-wait"]))
	if wait_power_status(tn, options, get_power_fn):
	power_on = True
	break

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

	if not power_on:
	fail(EC_TIMED_OUT)

	else:
	if status != "off":
	options["--action"] = "off"
	set_multi_power_fn(tn, options, set_power_fn)
	time.sleep(int(options["--power-wait"]))
	if wait_power_status(tn, options, get_power_fn) == 0:
	fail(EC_WAITING_OFF)
	options["--action"] = "on"

	try:
	for _ in range(1, 1 + int(options["--retry-on"])):
	set_multi_power_fn(tn, options, set_power_fn)
	time.sleep(int(options["--power-wait"]))
	if wait_power_status(tn, options, get_power_fn) == 1:
	power_on = True
	break
	except Exception, ex:
	# an error occured during power ON phase in reboot
	# fence action was completed succesfully even in that case
	logging.error("%s\n", str(ex))
	syslog.syslog(syslog.LOG_NOTICE, str(ex))

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

	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))
	syslog.syslog(syslog.LOG_ERR, ex[1])
	fail(EC_TIMED_OUT)

	return result

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

	if options.has_key("--inet6-only"):
	force_ipvx = "-6 "

	if options.has_key("--inet4-only"):
	force_ipvx = "-4 "

	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"] ]

	## Do the delay of the fence device before logging in
	## 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"]))

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

	if options.has_key("--ssl"):
	gnutls_opts = ""
	if options.has_key("--notls"):
	gnutls_opts = "--priority \"NORMAL:-VERS-TLS1.2:-VERS-TLS1.1:-VERS-TLS1.0:+VERS-SSL3.0\""

	command = '%s %s --insecure --crlf -p %s %s' % \
	(SSL_PATH, gnutls_opts, options["--ipport"], options["--ip"])
	try:
	conn = fspawn(options, command)
	except pexpect.ExceptionPexpect, ex:
	logging.error("%s\n" % str(ex))
	syslog.syslog(syslog.LOG_ERR, str(ex))
	sys.exit(EC_GENERIC_ERROR)
	elif options.has_key("--ssh") and 0 == options.has_key("--identity-file"):
	command = '%s %s %s@%s -p %s -o PubkeyAuthentication=no' % \
	(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(options, \
	[ 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(options, re_login, int(options["--login-timeout"]))

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

	conn.sendline(options["--password"])
	conn.log_expect(options, options["--command-prompt"], int(options["--login-timeout"]))
	elif options.has_key("--ssh") and options.has_key("--identity-file"):
	command = '%s %s %s@%s -i %s -p %s' % \
	(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(options, [ "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(options,
	[ "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, options["--command-prompt"], int(options["--login-timeout"]))
	else:
	fail_usage("Failed: You have to enter passphrase (-p) for identity file")
	else:
	conn = fspawn(options, TELNET_PATH)
	conn.send("set binary\n")
	conn.send("open %s -%s\n"%(options["--ip"], options["--ipport"]))

	result = conn.log_expect(options, 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"])
	result = conn.log_expect(options, re_pass, int(options["--login-timeout"]))
	elif re_pass.search(screen) != None:
	conn.log_expect(options, re_pass, int(options["--shell-timeout"]))

	try:
	conn.send_eol(options["--password"])
	valid_password = conn.log_expect(options, [ 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(options, re_pass, int(options["--login-timeout"]))
	conn.send_eol(options["--password"])
	conn.log_expect(options, options["--command-prompt"], int(options["--login-timeout"]))
	except KeyError:
	fail(EC_PASSWORD_MISSING)
	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, ex:
	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)
	diff --git a/tests/data/metadata/fence_apc.xml b/tests/data/metadata/fence_apc.xml
	index 0e6b2658..441de616 100644
	--- a/tests/data/metadata/fence_apc.xml
	+++ b/tests/data/metadata/fence_apc.xml
	@@ -1,142 +1,141 @@
	<?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="ipport" unique="0" required="0">
	- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
	- (default 23, 22 if --ssh" />
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP Address or Hostname</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>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	<shortdesc lang="en">SSH connection</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="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="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file 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="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to retrieve password</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="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="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing Action</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login Name</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>
	</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="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="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="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="monitor" />
	<action name="metadata" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_bladecenter.xml b/tests/data/metadata/fence_bladecenter.xml
	index 8ab7939c..ec1b0110 100644
	--- a/tests/data/metadata/fence_bladecenter.xml
	+++ b/tests/data/metadata/fence_bladecenter.xml
	@@ -1,142 +1,141 @@
	<?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="ipport" unique="0" required="0">
	- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
	- (default 23, 22 if --ssh" />
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP Address or Hostname</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>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	<shortdesc lang="en">SSH connection</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="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="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file 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="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to retrieve password</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="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="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing Action</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login Name</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>
	</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="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="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="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="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="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="monitor" />
	<action name="metadata" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_brocade.xml b/tests/data/metadata/fence_brocade.xml
	index 4670da87..5373d0e2 100644
	--- a/tests/data/metadata/fence_brocade.xml
	+++ b/tests/data/metadata/fence_brocade.xml
	@@ -1,136 +1,135 @@
	<?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="ipport" unique="0" required="0">
	- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
	- (default 23, 22 if --ssh" />
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP Address or Hostname</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>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	<shortdesc lang="en">SSH connection</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="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="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file 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="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to retrieve password</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="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="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="off" />
	<shortdesc lang="en">Fencing Action</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login Name</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>
	</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="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="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="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="1"/>
	<action name="off" />
	<action name="status" />
	<action name="list" />
	<action name="monitor" />
	<action name="metadata" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_cisco_ucs.xml b/tests/data/metadata/fence_cisco_ucs.xml
	index c5b6b370..30a3cb45 100644
	--- a/tests/data/metadata/fence_cisco_ucs.xml
	+++ b/tests/data/metadata/fence_cisco_ucs.xml
	@@ -1,132 +1,131 @@
	<?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="ipport" unique="0" required="0">
	- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
	- (default 80, 443 if --ssl" />
	+ <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="notls" unique="0" required="0">
	<getopt mixed="-t, --notls" />
	<content type="boolean" />
	<shortdesc lang="en">Disable TLS negotiation</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>
	</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>
	</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="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to retrieve password</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="ssl" unique="0" required="0">
	<getopt mixed="-z, --ssl" />
	<content type="boolean" />
	<shortdesc lang="en">SSL connection</shortdesc>
	</parameter>
	<parameter name="suborg" unique="0" required="0">
	<getopt mixed="--suborg=[path]" />
	<content type="string" />
	<shortdesc lang="en">Additional path needed to access suborganization</shortdesc>
	</parameter>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing Action</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login Name</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>
	</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="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="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="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="monitor" />
	<action name="metadata" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_drac5.xml b/tests/data/metadata/fence_drac5.xml
	index a461cb6e..d96484cd 100644
	--- a/tests/data/metadata/fence_drac5.xml
	+++ b/tests/data/metadata/fence_drac5.xml
	@@ -1,146 +1,145 @@
	<?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="ipport" unique="0" required="0">
	- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
	- (default 23, 22 if --ssh" />
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP Address or Hostname</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>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	<shortdesc lang="en">SSH connection</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="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="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file 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="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to retrieve password</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="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="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="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing Action</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login Name</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>
	</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="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="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="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="monitor" />
	<action name="metadata" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_hds_cb.xml b/tests/data/metadata/fence_hds_cb.xml
	index c1bb5b97..8f5279a9 100644
	--- a/tests/data/metadata/fence_hds_cb.xml
	+++ b/tests/data/metadata/fence_hds_cb.xml
	@@ -1,142 +1,141 @@
	<?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="ipport" unique="0" required="0">
	- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
	- (default 23, 22 if --ssh" />
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP Address or Hostname</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>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	<shortdesc lang="en">SSH connection</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="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="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file 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="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to retrieve password</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="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="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing Action</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login Name</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>
	</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="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="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="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="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="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="monitor" />
	<action name="metadata" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_hpblade.xml b/tests/data/metadata/fence_hpblade.xml
	index 255f7f3b..4f0976b2 100644
	--- a/tests/data/metadata/fence_hpblade.xml
	+++ b/tests/data/metadata/fence_hpblade.xml
	@@ -1,142 +1,141 @@
	<?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="ipport" unique="0" required="0">
	- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
	- (default 23, 22 if --ssh" />
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP Address or Hostname</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>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	<shortdesc lang="en">SSH connection</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="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="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file 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="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to retrieve password</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="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="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing Action</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login Name</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>
	</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="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="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="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="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="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="monitor" />
	<action name="metadata" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo_mp.xml b/tests/data/metadata/fence_ilo_mp.xml
	index 8960349f..93503a01 100644
	--- a/tests/data/metadata/fence_ilo_mp.xml
	+++ b/tests/data/metadata/fence_ilo_mp.xml
	@@ -1,127 +1,126 @@
	<?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="ipport" unique="0" required="0">
	- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
	- (default 23, 22 if --ssh" />
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP Address or Hostname</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	<shortdesc lang="en">SSH connection</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="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="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file 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="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to retrieve password</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="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="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing Action</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login Name</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="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="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="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="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="monitor" />
	<action name="metadata" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_rhevm.xml b/tests/data/metadata/fence_rhevm.xml
	index 13248395..a47f0250 100644
	--- a/tests/data/metadata/fence_rhevm.xml
	+++ b/tests/data/metadata/fence_rhevm.xml
	@@ -1,127 +1,126 @@
	<?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="ipport" unique="0" required="0">
	- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
	- (default 80, 443 if --ssl" />
	+ <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="notls" unique="0" required="0">
	<getopt mixed="-t, --notls" />
	<content type="boolean" />
	<shortdesc lang="en">Disable TLS negotiation</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>
	</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>
	</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="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to retrieve password</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="ssl" unique="0" required="0">
	<getopt mixed="-z, --ssl" />
	<content type="boolean" />
	<shortdesc lang="en">SSL connection</shortdesc>
	</parameter>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing Action</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login Name</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>
	</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="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="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="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="monitor" />
	<action name="metadata" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_rsa.xml b/tests/data/metadata/fence_rsa.xml
	index ee0421a4..749b21da 100644
	--- a/tests/data/metadata/fence_rsa.xml
	+++ b/tests/data/metadata/fence_rsa.xml
	@@ -1,127 +1,126 @@
	<?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="ipport" unique="0" required="0">
	- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
	- (default 23, 22 if --ssh" />
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP Address or Hostname</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	<shortdesc lang="en">SSH connection</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="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="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file 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="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to retrieve password</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="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="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing Action</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login Name</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="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="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="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="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="monitor" />
	<action name="metadata" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_vmware_soap.xml b/tests/data/metadata/fence_vmware_soap.xml
	index 52dedfae..97d8fc61 100644
	--- a/tests/data/metadata/fence_vmware_soap.xml
	+++ b/tests/data/metadata/fence_vmware_soap.xml
	@@ -1,129 +1,128 @@
	<?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="ipport" unique="0" required="0">
	- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
	- (default 80, 443 if --ssl" />
	+ <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="notls" unique="0" required="0">
	<getopt mixed="-t, --notls" />
	<content type="boolean" />
	<shortdesc lang="en">Disable TLS negotiation</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>
	</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>
	</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="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to retrieve password</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="ssl" unique="0" required="0">
	<getopt mixed="-z, --ssl" />
	<content type="boolean" />
	<shortdesc lang="en">SSL connection</shortdesc>
	</parameter>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing Action</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login Name</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>
	</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="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="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="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="monitor" />
	<action name="metadata" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_wti.xml b/tests/data/metadata/fence_wti.xml
	index 0c05620c..c7cb9d15 100644
	--- a/tests/data/metadata/fence_wti.xml
	+++ b/tests/data/metadata/fence_wti.xml
	@@ -1,137 +1,136 @@
	<?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="ipport" unique="0" required="0">
	- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
	- (default 23, 22 if --ssh" />
	+ <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="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP Address or Hostname</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>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	<shortdesc lang="en">SSH connection</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="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="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file 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="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to retrieve password</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="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="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing Action</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login Name</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>
	</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="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="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="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="monitor" />
	<action name="metadata" />
	</actions>
	</resource-agent>

File Metadata

Mime Type: text/x-diff
Expires: Wed, Feb 26, 4:42 PM (2 h, 47 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1465570
Default Alt Text: (112 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions