No OneTemporary
Actions

Size

221 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/fence/agents/drac5/fence_drac5.py b/fence/agents/drac5/fence_drac5.py
	index 070fe416..76dc97dd 100644
	--- a/fence/agents/drac5/fence_drac5.py
	+++ b/fence/agents/drac5/fence_drac5.py
	@@ -1,153 +1,153 @@
	#!/usr/bin/python -tt

	#####
	##
	## The Following Agent Has Been Tested On:
	##
	## DRAC Version Firmware
	## +-----------------+---------------------------+
	## DRAC 5 1.0 (Build 06.05.12)
	## DRAC 5 1.21 (Build 07.05.04)
	##
	## @note: drac_version was removed
	#####

	import sys, re, time
	import atexit
	sys.path.append("@FENCEAGENTSLIBDIR@")
	from fencing import *
	from fencing import fail_usage

	#BEGIN_VERSION_GENERATION
	RELEASE_VERSION="New Drac5 Agent - test release on steroids"
	REDHAT_COPYRIGHT=""
	BUILD_DATE="March, 2008"
	#END_VERSION_GENERATION

	def get_power_status(conn, options):
	if options["--drac-version"] == "DRAC MC":
	(_, status) = get_list_devices(conn, options)[options["--plug"]]
	else:
	if options["--drac-version"] == "DRAC CMC":
	conn.send_eol("racadm serveraction powerstatus -m " + options["--plug"])
	elif options["--drac-version"] == "DRAC 5":
	conn.send_eol("racadm serveraction powerstatus")

	conn.log_expect(options["--command-prompt"], int(options["--shell-timeout"]))

	status = re.compile(r"(^\|: )(ON\|OFF\|Powering ON\|Powering OFF)\s*$",
	re.IGNORECASE \| re.MULTILINE).search(conn.before).group(2)

	if status.lower().strip() in ["on", "powering on", "powering off"]:
	return "on"
	else:
	return "off"

	def set_power_status(conn, options):
	action = {
	'on' : "powerup",
	'off': "powerdown"
	}[options["--action"]]

	if options["--drac-version"] == "DRAC CMC":
	conn.send_eol("racadm serveraction " + action + " -m " + options["--plug"])
	elif options["--drac-version"] == "DRAC 5":
	conn.send_eol("racadm serveraction " + action)
	elif options["--drac-version"] == "DRAC MC":
	conn.send_eol("racadm serveraction -s " + options["--plug"] + " " + action)

	## Fix issue with double-enter [CR/LF]
	## We need to read two additional command prompts (one from get + one from set command)
	conn.log_expect(options["--command-prompt"], int(options["--power-timeout"]))
	if len(conn.before.strip()) == 0:
	options["eol"] = options["eol"][:-1]
	conn.log_expect(options["--command-prompt"], int(options["--power-timeout"]))
	conn.log_expect(options["--command-prompt"], int(options["--power-timeout"]))

	def get_list_devices(conn, options):
	outlets = {}

	if options["--drac-version"] == "DRAC CMC":
	conn.send_eol("getmodinfo")

	list_re = re.compile(r"^([^\s]?)\s+Present\s(ON\|OFF)\s.$")
	conn.log_expect(options["--command-prompt"], int(options["--power-timeout"]))
	for line in conn.before.splitlines():
	if list_re.search(line):
	outlets[list_re.search(line).group(1)] = ("", list_re.search(line).group(2))
	elif options["--drac-version"] == "DRAC MC":
	conn.send_eol("getmodinfo")

	list_re = re.compile(r"^\s([^\s])\s---->\s(.?)\s+Present\s(ON\|OFF)\s.$")
	conn.log_expect(options["--command-prompt"], int(options["--power-timeout"]))
	for line in conn.before.splitlines():
	if list_re.search(line):
	outlets[list_re.search(line).group(2)] = ("", list_re.search(line).group(3))
	elif options["--drac-version"] == "DRAC 5":
	## DRAC 5 can be used only for one computer
	## standard fence library can't handle correctly situation
	## when some fence devices supported by fence agent
	## works with 'list' and other should returns 'N/A'
	print "N/A"

	return outlets

	def define_new_opts():
	all_opt["drac_version"] = {
	"getopt" : "d:",
	"longopt" : "drac-version",
	- "help" : "-d, --drac-version=[version] Force DRAC version to use (DRAC 5, DRAC CMC, DRAC MC)",
	+ "help" : "-d, --drac-version=[version] Force DRAC version to use (DRAC 5\|DRAC CMC\|DRAC MC)",
	"required" : "0",
	- "shortdesc" : "Force DRAC version to use (DRAC 5, DRAC CMC, DRAC MC)",
	+ "shortdesc" : "Force DRAC version to use",
	"choices" : ["DRAC CMC", "DRAC MC", "DRAC 5"],
	"order" : 1}

	def main():
	device_opt = ["ipaddr", "login", "passwd", "cmd_prompt", "secure", \
	"drac_version", "port", "no_port", "telnet"]

	atexit.register(atexit_handler)

	define_new_opts()

	all_opt["cmd_prompt"]["default"] = [r"\$", r"DRAC\/MC:"]

	options = check_input(device_opt, process_input(device_opt))

	docs = {}
	docs["shortdesc"] = "Fence agent for Dell DRAC CMC/5"
	docs["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."
	docs["vendorurl"] = "http://www.dell.com"
	show_docs(options, docs)

	##
	## Operate the fencing device
	######
	conn = fence_login(options)

	if not options.has_key("--drac-version"):
	## autodetect from text issued by fence device
	if conn.before.find("CMC") >= 0:
	options["--drac-version"] = "DRAC CMC"
	elif conn.before.find("DRAC 5") >= 0:
	options["--drac-version"] = "DRAC 5"
	elif conn.after.find("DRAC/MC") >= 0:
	options["--drac-version"] = "DRAC MC"
	else:
	## Assume this is DRAC 5 by default as we don't want to break anything
	options["--drac-version"] = "DRAC 5"

	if options["--drac-version"] in ["DRAC MC", "DRAC CMC"]:
	if not options.has_key("--plug") and 0 == ["monitor", "list"].count(options["--action"]):
	fail_usage("Failed: You have to enter module name (-n)")

	result = fence_action(conn, options, set_power_status, get_power_status, get_list_devices)
	fence_logout(conn, "exit", 1)
	sys.exit(result)

	if __name__ == "__main__":
	main()
	diff --git a/fence/agents/eps/fence_eps.py b/fence/agents/eps/fence_eps.py
	index 9e312076..e4fb1e94 100644
	--- a/fence/agents/eps/fence_eps.py
	+++ b/fence/agents/eps/fence_eps.py
	@@ -1,129 +1,129 @@
	#!/usr/bin/python -tt

	# The Following Agent Has Been Tested On:
	# ePowerSwitch 8M+ version 1.0.0.4

	import sys, re
	import httplib, base64, string, socket
	import logging
	import atexit
	sys.path.append("@FENCEAGENTSLIBDIR@")
	from fencing import *
	from fencing import fail, fail_usage, EC_LOGIN_DENIED, EC_TIMED_OUT, run_delay

	#BEGIN_VERSION_GENERATION
	RELEASE_VERSION="ePowerSwitch 8M+ (eps)"
	REDHAT_COPYRIGHT=""
	BUILD_DATE=""
	#END_VERSION_GENERATION

	# Run command on EPS device.
	# @param options Device options
	# @param params HTTP GET parameters (without ?)
	def eps_run_command(options, params):
	try:
	# New http connection
	conn = httplib.HTTPConnection(options["--ip"])

	request_str = "/"+options["--page"]

	if params != "":
	request_str += "?"+params

	logging.debug("GET %s\n", request_str)
	conn.putrequest('GET', request_str)

	if options.has_key("--username"):
	if not options.has_key("--password"):
	options["--password"] = "" # Default is empty password

	# String for Authorization header
	auth_str = 'Basic ' + string.strip(base64.encodestring(options["--username"]+':'+options["--password"]))
	logging.debug("Authorization: %s\n", auth_str)
	conn.putheader('Authorization', auth_str)

	conn.endheaders()

	response = conn.getresponse()

	logging.debug("%d %s\n", response.status, response.reason)

	#Response != OK -> couldn't login
	if response.status != 200:
	fail(EC_LOGIN_DENIED)

	result = response.read()
	logging.debug("%s \n", result)
	conn.close()
	except socket.timeout:
	fail(EC_TIMED_OUT)
	except socket.error:
	fail(EC_LOGIN_DENIED)

	return result

	def get_power_status(conn, options):
	del conn
	ret_val = eps_run_command(options, "")

	result = {}
	status = re.findall(r"p(\d{2})=(0\|1)\s*\<br\>", ret_val.lower())
	for out_num, out_stat in status:
	result[out_num] = ("", (out_stat == "1" and "on" or "off"))

	if not options["--action"] in ['monitor', 'list']:
	if not options["--plug"] in result:
	fail_usage("Failed: You have to enter existing physical plug!")
	else:
	return result[options["--plug"]][1]
	else:
	return result

	def set_power_status(conn, options):
	del conn
	eps_run_command(options, "P%s=%s"%(options["--plug"], (options["--action"] == "on" and "1" or "0")))

	# Define new option
	def eps_define_new_opts():
	all_opt["hidden_page"] = {
	"getopt" : "c:",
	"longopt" : "page",
	- "help":"-c, --page=[page] Name of hidden page (default hidden.htm)",
	+ "help":"-c, --page=[page] Name of hidden page (default: hidden.htm)",
	"required" : "0",
	"shortdesc" : "Name of hidden page",
	"default" : "hidden.htm",
	"order": 1
	}

	# Starting point of fence agent
	def main():
	device_opt = ["ipaddr", "login", "passwd", "no_login", "no_password", \
	"port", "hidden_page", "web"]

	atexit.register(atexit_handler)

	eps_define_new_opts()

	options = check_input(device_opt, process_input(device_opt))

	docs = {}
	docs["shortdesc"] = "Fence agent for ePowerSwitch"
	docs["longdesc"] = "fence_eps is an I/O Fencing agent \
	which can be used with the ePowerSwitch 8M+ power switch to fence \
	connected machines. Fence agent works ONLY on 8M+ device, because \
	this is only one, which has support for hidden page feature. \
	\n.TP\n\
	Agent basically works by connecting to hidden page and pass \
	appropriate arguments to GET request. This means, that hidden \
	page feature must be enabled and properly configured."
	docs["vendorurl"] = "http://www.epowerswitch.com"
	show_docs(options, docs)

	run_delay(options)
	#Run fence action. Conn is None, beacause we always need open new http connection
	result = fence_action(None, options, set_power_status, get_power_status, get_power_status)

	sys.exit(result)

	if __name__ == "__main__":
	main()
	diff --git a/fence/agents/lib/fence2man.xsl b/fence/agents/lib/fence2man.xsl
	index 13e24da1..97786eac 100644
	--- a/fence/agents/lib/fence2man.xsl
	+++ b/fence/agents/lib/fence2man.xsl
	@@ -1,59 +1,69 @@
	<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
	<xsl:output method="text" indent="no"/>
	<xsl:template match="parameter">
	<xsl:param name="show" />
	.TP
	<xsl:if test="$show = 'getopt'">.B <xsl:value-of select="getopt/@mixed" /></xsl:if>
	<xsl:if test="$show = 'stdin'">.B <xsl:value-of select="@name"/></xsl:if>
	.
	<xsl:value-of select="normalize-space(shortdesc)"/>
	+<xsl:if test="count(content/option) > 1">
	+ <xsl:text> (</xsl:text>
	+ <xsl:for-each select="content/option">
	+ <xsl:value-of select="@value" />
	+ <xsl:if test="position() < last()">
	+ <xsl:text>\|</xsl:text>
	+ </xsl:if>
	+ </xsl:for-each>
	+ <xsl:text>)</xsl:text>
	+</xsl:if>
	<xsl:if test="not(content/@default)"><xsl:if test="@required = 1"> This parameter is always required.</xsl:if></xsl:if>
	<xsl:if test="content/@default"> (Default Value: <xsl:value-of select="content/@default"/>)</xsl:if>
	</xsl:template>

	<xsl:template match="action">
	.TP
	\fB<xsl:value-of select="@name"/> \fP
	<xsl:choose>
	<xsl:when test="@name = 'on'">Power on machine.</xsl:when>
	<xsl:when test="@name = 'off'">Power off machine.</xsl:when>
	<xsl:when test="@name = 'enable'">Enable fabric access.</xsl:when>
	<xsl:when test="@name = 'disable'">Disable fabric access.</xsl:when>
	<xsl:when test="@name = 'reboot'">Reboot machine.</xsl:when>
	<xsl:when test="@name = 'monitor'">Check the health of fence device</xsl:when>
	<xsl:when test="@name = 'metadata'">Display the XML metadata describing this resource.</xsl:when>
	<xsl:when test="@name = 'list'">List available plugs with aliases/virtual machines if there is support for more then one device. Returns N/A otherwise.</xsl:when>
	<xsl:when test="@name = 'status'">This returns the status of the plug/virtual machine.</xsl:when>
	<!-- Ehhh -->
	<xsl:otherwise> The operational behavior of this is not known.</xsl:otherwise>
	</xsl:choose>
	</xsl:template>

	<xsl:template match="/resource-agent">
	.TH FENCE_AGENT 8 2009-10-20 "<xsl:value-of select="@name"/> (Fence Agent)"
	.SH NAME
	<xsl:value-of select="@name" /> - <xsl:value-of select="@shortdesc" />
	<xsl:for-each select="symlink">
	.P
	<xsl:value-of select="@name" /> - <xsl:value-of select="@shortdesc" /> (symlink)
	</xsl:for-each>
	.SH DESCRIPTION
	.P
	<xsl:value-of select="longdesc"/>
	.P
	<xsl:value-of select="@name" /> accepts options on the command line as well
	as from stdin. Fenced sends parameters through stdin when it execs the
	agent. <xsl:value-of select="@name" /> can be run by itself with command
	line options. This is useful for testing and for turning outlets on or off
	from scripts.
	<xsl:if test="vendor-url">
	Vendor URL: <xsl:value-of select="vendor-url" />
	</xsl:if>
	.SH PARAMETERS
	<xsl:apply-templates select="parameters"><xsl:with-param name="show">getopt</xsl:with-param></xsl:apply-templates>
	.SH ACTIONS
	<xsl:apply-templates select="actions"/>
	.SH STDIN PARAMETERS
	<xsl:apply-templates select="parameters"><xsl:with-param name="show">stdin</xsl:with-param></xsl:apply-templates>
	</xsl:template>
	</xsl:stylesheet>
	diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
	index 60e9fc17..fb495c30 100644
	--- a/fence/agents/lib/fencing.py.py
	+++ b/fence/agents/lib/fencing.py.py
	@@ -1,1324 +1,1324 @@
	#!/usr/bin/python -tt

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

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

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

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

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

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

	class fspawn(pexpect.spawn):
	def __init__(self, options, command):
	logging.info("Running command: %s", command)
	pexpect.spawn.__init__(self, command)
	self.opt = options

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

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

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

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

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

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

	def fail(error_code):
	message = {
	EC_LOGIN_DENIED : "Unable to connect/login to fencing device",
	EC_CONNECTION_LOST : "Connection lost",
	EC_TIMED_OUT : "Connection timed out",
	EC_WAITING_ON : "Failed: Timed out waiting to power ON",
	EC_WAITING_OFF : "Failed: Timed out waiting to power OFF",
	EC_STATUS : "Failed: Unable to obtain correct plug status or plug is not available",
	EC_STATUS_HMC : "Failed: Either unable to obtain correct plug status, "
	"partition is not available or incorrect HMC version used",
	EC_PASSWORD_MISSING : "Failed: You have to set login password",
	EC_INVALID_PRIVILEGES : "Failed: The user does not have the correct privileges to do the requested action."
	}[error_code] + "\n"
	logging.error("%s\n", message)
	sys.exit(EC_GENERIC_ERROR)

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

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

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

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

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

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

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

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

	print "\t\t<getopt mixed=\"" + mixed + "\" />"
	if all_opt[option].has_key("choices"):
	print "\t\t<content type=\"select\" "+default+" >"
	for choice in all_opt[option]["choices"]:
	print "\t\t\t<option value=\"%s\" />" % (choice)
	print "\t\t</content>"
	elif all_opt[option]["getopt"].count(":") > 0:
	print "\t\t<content type=\"string\" "+default+" />"
	else:
	print "\t\t<content type=\"boolean\" "+default+" />"
	print "\t\t<shortdesc lang=\"en\">" + shortdesc + "</shortdesc>"
	print "\t</parameter>"
	print "</parameters>"
	print "<actions>"

	(available_actions, _) = _get_available_actions(avail_opt)

	if "on" in available_actions:
	available_actions.remove("on")

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

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

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

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

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

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

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

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

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

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

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

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

	(acceptable_actions, _) = _get_available_actions(device_opt)

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

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

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


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

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

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

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

	return options

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

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

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

	return status

	def set_multi_power_fn(connection, options, set_power_fn, get_power_fn, retry_attempts=1):
	plugs = options["--plugs"] if options.has_key("--plugs") else [""]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	return

	status = get_multi_power_fn(connection, options, get_power_fn)

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

	if options["--action"] == status:
	print "Success: Already %s" % (status.upper())
	return 0

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

	if not power_on:
	fail(EC_TIMED_OUT)

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

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

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

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

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

	return result

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

	if not options.has_key("eol"):
	options["eol"] = "\r\n"

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

	try:
	if options.has_key("--ssl"):
	conn = _open_ssl_connection(options)
	elif options.has_key("--ssh") and not options.has_key("--identity-file"):
	conn = _login_ssh_with_password(options, re_login_string)
	elif options.has_key("--ssh") and options.has_key("--identity-file"):
	conn = _login_ssh_with_identity_file(options)
	else:
	conn = _login_telnet(options, re_login_string)
	except pexpect.EOF:
	fail(EC_LOGIN_DENIED)
	except pexpect.TIMEOUT:
	fail(EC_LOGIN_DENIED)
	return conn

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

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

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

	try:
	process = subprocess.Popen(shlex.split(command), stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
	except OSError:
	fail_usage("Unable to run %s\n" % command)

	thread = threading.Thread(target=process.wait)
	thread.start()
	thread.join(timeout)
	if thread.is_alive():
	process.kill()
	fail(EC_TIMED_OUT)

	status = process.wait()

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

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

	return (status, pipe_stdout, pipe_stderr)

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

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

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

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

	msg = self.format(record)

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

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

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

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

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

	return conn

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

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

	conn = fspawn(options, command)

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

	return conn

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

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

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

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

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

	return conn

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

	if options.has_key("--inet6-only"):
	force_ipvx = "-6 "
	elif options.has_key("--inet4-only"):
	force_ipvx = "-4 "
	else:
	force_ipvx = ""

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

	conn = fspawn(options, command)

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

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

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

	return conn

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

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

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

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

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

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

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

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

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

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

	return options

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

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

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

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

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

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

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

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

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

	return valid_input

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

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

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

	return (getopt_string, longopt_list)

	def _parse_input_stdin(avail_opt):
	opt = {}
	name = ""
	for line in sys.stdin.readlines():
	line = line.strip()
	if (line.startswith("#")) or (len(line) == 0):
	continue

	(name, value) = (line + "=").split("=", 1)
	value = value[:-1]

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

	if all_opt[name]["getopt"].endswith(":"):
	opt["--"+all_opt[name]["longopt"].rstrip(":")] = value
	elif value.lower() in ["1", "yes", "on", "true"]:
	opt["--"+all_opt[name]["longopt"]] = "1"
	return opt

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

	try:
	entered_opt = getopt.gnu_getopt(sys.argv[1:], getopt_string, longopt_list)[0]
	except getopt.GetoptError, error:
	fail_usage("Parse error: " + error.msg)

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

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

	return long_opts

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

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

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

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

	def _verify_unique_getopt(avail_opt):
	used_getopt = set()

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

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

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

	return (available_actions, default_value)
	diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py
	index 2af3bd66..c1bf7d7e 100644
	--- a/fence/agents/lpar/fence_lpar.py
	+++ b/fence/agents/lpar/fence_lpar.py
	@@ -1,159 +1,159 @@
	#!/usr/bin/python -tt

	#####
	##
	## The Following Agent Has Been Tested On:
	##
	## Version
	## +---------------------------------------------+
	## Tested on HMC
	##
	#####

	import sys, re
	import atexit
	sys.path.append("@FENCEAGENTSLIBDIR@")
	from fencing import *
	from fencing import fail, fail_usage, EC_STATUS_HMC

	#BEGIN_VERSION_GENERATION
	RELEASE_VERSION=""
	REDHAT_COPYRIGHT=""
	BUILD_DATE=""
	#END_VERSION_GENERATION

	def get_power_status(conn, options):
	if options["--hmc-version"] == "3":
	conn.send("lssyscfg -r lpar -m " + options["--managed"] + " -n " + options["--plug"] + " -F name,state\n")
	conn.log_expect(options["--command-prompt"], int(options["--power-timeout"]))

	try:
	status = re.compile("^" + options["--plug"] + ",(.?),.$",
	re.IGNORECASE \| re.MULTILINE).search(conn.before).group(1)
	except AttributeError:
	fail(EC_STATUS_HMC)
	elif options["--hmc-version"] == "4":
	conn.send("lssyscfg -r lpar -m "+ options["--managed"] +
	" --filter 'lpar_names=" + options["--plug"] + "'\n")
	conn.log_expect(options["--command-prompt"], int(options["--power-timeout"]))

	try:
	status = re.compile(",state=(.*?),", re.IGNORECASE).search(conn.before).group(1)
	except AttributeError:
	fail(EC_STATUS_HMC)

	##
	## Transformation to standard ON/OFF status if possible
	if status in ["Running", "Open Firmware", "Shutting Down", "Starting"]:
	status = "on"
	else:
	status = "off"

	return status

	def set_power_status(conn, options):
	if options["--hmc-version"] == "3":
	conn.send("chsysstate -o " + options["--action"] + " -r lpar -m " + options["--managed"]
	+ " -n " + options["--plug"] + "\n")
	conn.log_expect(options["--command-prompt"], int(options["--power-timeout"]))
	elif options["--hmc-version"] == "4":
	if options["--action"] == "on":
	conn.send("chsysstate -o on -r lpar -m " + options["--managed"] +
	" -n " + options["--plug"] +
	" -f `lssyscfg -r lpar -F curr_profile " +
	" -m " + options["--managed"] +
	" --filter \"lpar_names=" + options["--plug"] + "\"`\n")
	else:
	conn.send("chsysstate -o shutdown -r lpar --immed" +
	" -m " + options["--managed"] + " -n " + options["--plug"] + "\n")
	conn.log_expect(options["--command-prompt"], int(options["--power-timeout"]))

	def get_lpar_list(conn, options):
	outlets = {}
	if options["--hmc-version"] == "3":
	conn.send("query_partition_names -m " + options["--managed"] + "\n")
	conn.log_expect(options["--command-prompt"], int(options["--power-timeout"]))

	## We have to remove first 3 lines (command + header) and last line (part of new prompt)
	####
	res = re.search("^.+?\n(.+?\n){2}(.)\n.$", conn.before, re.S)

	if res == None:
	fail_usage("Unable to parse output of list command")

	lines = res.group(2).split("\n")
	for outlet_line in lines:
	outlets[outlet_line.rstrip()] = ("", "")
	elif options["--hmc-version"] == "4":
	conn.send("lssyscfg -r lpar -m " + options["--managed"] +
	" -F name:state\n")
	conn.log_expect(options["--command-prompt"], int(options["--power-timeout"]))

	## We have to remove first line (command) and last line (part of new prompt)
	####
	res = re.search("^.+?\n(.)\n.$", conn.before, re.S)

	if res == None:
	fail_usage("Unable to parse output of list command")

	lines = res.group(1).split("\n")
	for outlet_line in lines:
	(port, status) = outlet_line.split(":")
	outlets[port] = ("", status)

	return outlets

	def define_new_opts():
	all_opt["managed"] = {
	"getopt" : "s:",
	"longopt" : "managed",
	"help" : "-s, --managed=[id] Name of the managed system",
	"required" : "0",
	"shortdesc" : "Managed system name",
	"order" : 1}
	all_opt["hmc_version"] = {
	"getopt" : "H:",
	"longopt" : "hmc-version",
	- "help" : "-H, --hmc-version=[version] Force HMC version to use: 3, 4 (default)",
	+ "help" : "-H, --hmc-version=[version] Force HMC version to use: (3\|4) (default: 4)",
	"required" : "0",
	- "shortdesc" : "Force HMC version to use (3 or 4)",
	+ "shortdesc" : "Force HMC version to use",
	"default" : "4",
	"choices" : ["3", "4"],
	"order" : 1}

	def main():
	device_opt = ["ipaddr", "login", "passwd", "secure", "cmd_prompt", \
	"port", "managed", "hmc_version"]

	atexit.register(atexit_handler)

	define_new_opts()

	all_opt["login_timeout"]["default"] = "15"
	all_opt["secure"]["default"] = "1"
	all_opt["cmd_prompt"]["default"] = [r":~>", r"]\$", r"\$ "]

	options = check_input(device_opt, process_input(device_opt), other_conditions = True)

	docs = {}
	docs["shortdesc"] = "Fence agent for IBM LPAR"
	docs["longdesc"] = ""
	docs["vendorurl"] = "http://www.ibm.com"
	show_docs(options, docs)

	if not options.has_key("--managed"):
	fail_usage("Failed: You have to enter name of managed system")

	if options["--action"] == "validate-all":
	sys.exit(0)

	##
	## Operate the fencing device
	####
	conn = fence_login(options)
	result = fence_action(conn, options, set_power_status, get_power_status, get_lpar_list)
	fence_logout(conn, "quit\r\n")
	sys.exit(result)

	if __name__ == "__main__":
	main()
	diff --git a/tests/data/metadata/fence_amt.xml b/tests/data/metadata/fence_amt.xml
	index 97bd35ec..6791123e 100644
	--- a/tests/data/metadata/fence_amt.xml
	+++ b/tests/data/metadata/fence_amt.xml
	@@ -1,135 +1,135 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_amt" shortdesc="Fence agent for AMT" >
	<longdesc>fence_amt is an I/O Fencing agent which can be used with Intel AMT. This agent calls support software amttool(http://www.kraxel.org/cgit/amtterm/).</longdesc>
	<vendor-url>http://www.intel.com/</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="boot_option" unique="0" required="0">
	<getopt mixed="-b, --boot-option=[option]" />
	<content type="select" >
	<option value="pxe" />
	<option value="hd" />
	<option value="hdsafe" />
	<option value="cd" />
	<option value="diag" />
	</content>
	<shortdesc lang="en">Change the default boot behavior of the machine.</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<parameter name="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="string" default="16994" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	- <shortdesc lang="en">Method to fence (onoff\|cycle)</shortdesc>
	+ <shortdesc lang="en">Method to fence</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<getopt mixed="-p, --password=[password]" />
	<content type="string" />
	<shortdesc lang="en">Login password or passphrase</shortdesc>
	</parameter>
	<parameter name="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<getopt mixed="-D, --debug-file=[debugfile]" />
	<content type="string" />
	<shortdesc lang="en">Write debug information to given file</shortdesc>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="amttool_path" unique="0" required="0">
	<getopt mixed="--amttool-path=[path]" />
	<content type="string" default="/usr/bin/amttool" />
	<shortdesc lang="en">Path to amttool binary</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="string" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="string" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="sudo" unique="0" required="0">
	<getopt mixed="--use-sudo" />
	<content type="boolean" />
	<shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc>
	</parameter>
	<parameter name="sudo_path" unique="0" required="0">
	<getopt mixed="--sudo-path=[path]" />
	<content type="string" default="/usr/bin/sudo" />
	<shortdesc lang="en">Path to sudo binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_apc_snmp.xml b/tests/data/metadata/fence_apc_snmp.xml
	index b458b9bf..8f2bb4df 100644
	--- a/tests/data/metadata/fence_apc_snmp.xml
	+++ b/tests/data/metadata/fence_apc_snmp.xml
	@@ -1,182 +1,182 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_apc_snmp" shortdesc="Fence agent for APC, Tripplite PDU over SNMP" >
	<longdesc>fence_apc_snmp is an I/O Fencing agent which can be used with the APC network power switch or Tripplite PDU devices.It logs into a device via SNMP and reboots a specified outlet. It supports SNMP v1, v2c, v3 with all combinations of authenticity/privacy settings.</longdesc>
	<vendor-url>http://www.apc.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="community" unique="0" required="0">
	<getopt mixed="-c, --community=[community]" />
	<content type="string" default="private" />
	<shortdesc lang="en">Set the community string</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<parameter name="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="string" default="161" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<getopt mixed="-p, --password=[password]" />
	<content type="string" />
	<shortdesc lang="en">Login password or passphrase</shortdesc>
	</parameter>
	<parameter name="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
	</parameter>
	<parameter name="snmp_auth_prot" unique="0" required="0">
	<getopt mixed="-b, --snmp-auth-prot=[prot]" />
	<content type="select" >
	<option value="MD5" />
	<option value="SHA" />
	</content>
	- <shortdesc lang="en">Set authentication protocol (MD5\|SHA)</shortdesc>
	+ <shortdesc lang="en">Set authentication protocol</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd" unique="0" required="0">
	<getopt mixed="-P, --snmp-priv-passwd=[pass]" />
	<content type="string" />
	<shortdesc lang="en">Set privacy protocol password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd_script" unique="0" required="0">
	<getopt mixed="-R, --snmp-priv-passwd-script" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve privacy password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_prot" unique="0" required="0">
	<getopt mixed="-B, --snmp-priv-prot=[prot]" />
	<content type="select" >
	<option value="DES" />
	<option value="AES" />
	</content>
	- <shortdesc lang="en">Set privacy protocol (DES\|AES)</shortdesc>
	+ <shortdesc lang="en">Set privacy protocol</shortdesc>
	</parameter>
	<parameter name="snmp_sec_level" unique="0" required="0">
	<getopt mixed="-E, --snmp-sec-level=[level]" />
	<content type="select" >
	<option value="noAuthNoPriv" />
	<option value="authNoPriv" />
	<option value="authPriv" />
	</content>
	- <shortdesc lang="en">Set security level (noAuthNoPriv\|authNoPriv\|authPriv)</shortdesc>
	+ <shortdesc lang="en">Set security level</shortdesc>
	</parameter>
	<parameter name="snmp_version" unique="0" required="0">
	<getopt mixed="-d, --snmp-version=[version]" />
	<content type="select" default="1" >
	<option value="1" />
	<option value="2c" />
	<option value="3" />
	</content>
	- <shortdesc lang="en">Specifies SNMP version to use (1,2c,3)</shortdesc>
	+ <shortdesc lang="en">Specifies SNMP version to use</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<getopt mixed="-D, --debug-file=[debugfile]" />
	<content type="string" />
	<shortdesc lang="en">Write debug information to given file</shortdesc>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="string" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="string" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="snmpget_path" unique="0" required="0">
	<getopt mixed="--snmpget-path=[path]" />
	<content type="string" default="/usr/bin/snmpget" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<content type="string" default="/usr/bin/snmpset" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<content type="string" default="/usr/bin/snmpwalk" />
	<shortdesc lang="en">Path to snmpwalk binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_cisco_mds.xml b/tests/data/metadata/fence_cisco_mds.xml
	index cf1da3a5..915d2e8f 100644
	--- a/tests/data/metadata/fence_cisco_mds.xml
	+++ b/tests/data/metadata/fence_cisco_mds.xml
	@@ -1,181 +1,181 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_cisco_mds" shortdesc="Fence agent for Cisco MDS" >
	<longdesc>fence_cisco_mds is an I/O Fencing agent which can be used with any Cisco MDS 9000 series with SNMP enabled device.</longdesc>
	<vendor-url>http://www.cisco.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="off" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="community" unique="0" required="0">
	<getopt mixed="-c, --community=[community]" />
	<content type="string" />
	<shortdesc lang="en">Set the community string</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<parameter name="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="string" default="161" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<getopt mixed="-p, --password=[password]" />
	<content type="string" />
	<shortdesc lang="en">Login password or passphrase</shortdesc>
	</parameter>
	<parameter name="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
	</parameter>
	<parameter name="snmp_auth_prot" unique="0" required="0">
	<getopt mixed="-b, --snmp-auth-prot=[prot]" />
	<content type="select" >
	<option value="MD5" />
	<option value="SHA" />
	</content>
	- <shortdesc lang="en">Set authentication protocol (MD5\|SHA)</shortdesc>
	+ <shortdesc lang="en">Set authentication protocol</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd" unique="0" required="0">
	<getopt mixed="-P, --snmp-priv-passwd=[pass]" />
	<content type="string" />
	<shortdesc lang="en">Set privacy protocol password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd_script" unique="0" required="0">
	<getopt mixed="-R, --snmp-priv-passwd-script" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve privacy password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_prot" unique="0" required="0">
	<getopt mixed="-B, --snmp-priv-prot=[prot]" />
	<content type="select" >
	<option value="DES" />
	<option value="AES" />
	</content>
	- <shortdesc lang="en">Set privacy protocol (DES\|AES)</shortdesc>
	+ <shortdesc lang="en">Set privacy protocol</shortdesc>
	</parameter>
	<parameter name="snmp_sec_level" unique="0" required="0">
	<getopt mixed="-E, --snmp-sec-level=[level]" />
	<content type="select" >
	<option value="noAuthNoPriv" />
	<option value="authNoPriv" />
	<option value="authPriv" />
	</content>
	- <shortdesc lang="en">Set security level (noAuthNoPriv\|authNoPriv\|authPriv)</shortdesc>
	+ <shortdesc lang="en">Set security level</shortdesc>
	</parameter>
	<parameter name="snmp_version" unique="0" required="0">
	<getopt mixed="-d, --snmp-version=[version]" />
	<content type="select" >
	<option value="1" />
	<option value="2c" />
	<option value="3" />
	</content>
	- <shortdesc lang="en">Specifies SNMP version to use (1,2c,3)</shortdesc>
	+ <shortdesc lang="en">Specifies SNMP version to use</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<getopt mixed="-D, --debug-file=[debugfile]" />
	<content type="string" />
	<shortdesc lang="en">Write debug information to given file</shortdesc>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="string" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="string" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="snmpget_path" unique="0" required="0">
	<getopt mixed="--snmpget-path=[path]" />
	<content type="string" default="/usr/bin/snmpget" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<content type="string" default="/usr/bin/snmpset" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<content type="string" default="/usr/bin/snmpwalk" />
	<shortdesc lang="en">Path to snmpwalk binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="1"/>
	<action name="off" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_docker.xml b/tests/data/metadata/fence_docker.xml
	index e1a8032f..f51d12da 100644
	--- a/tests/data/metadata/fence_docker.xml
	+++ b/tests/data/metadata/fence_docker.xml
	@@ -1,146 +1,146 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_docker" shortdesc="Fence agent for Docker" >
	<longdesc>fence_docker is I/O fencing agent which can be used with the Docker Engine containers. You can use this fence-agent without any authentication, or you can use TLS authentication (use --ssl option, more info about TLS authentication in docker: http://docs.docker.com/examples/https/).</longdesc>
	<vendor-url>www.docker.io</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<parameter name="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="string" default="80" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	- <shortdesc lang="en">Method to fence (onoff\|cycle)</shortdesc>
	+ <shortdesc lang="en">Method to fence</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
	</parameter>
	<parameter name="ssl" unique="0" required="0">
	<getopt mixed="-z, --ssl" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
	</parameter>
	<parameter name="ssl_insecure" unique="0" required="0">
	<getopt mixed="--ssl-insecure" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection without verifying certificate</shortdesc>
	</parameter>
	<parameter name="ssl_secure" unique="0" required="0">
	<getopt mixed="--ssl-secure" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
	</parameter>
	<parameter name="tlscacert" unique="0" required="0">
	<getopt mixed="--tlscacert" />
	<content type="string" />
	<shortdesc lang="en">Path to CA certificate (PEM format) for TLS authentication. Required if --ssl option is used.</shortdesc>
	</parameter>
	<parameter name="tlscert" unique="0" required="0">
	<getopt mixed="--tlscert" />
	<content type="string" />
	<shortdesc lang="en">Path to client certificate (PEM format) for TLS authentication. Required if --ssl option is used.</shortdesc>
	</parameter>
	<parameter name="tlskey" unique="0" required="0">
	<getopt mixed="--tlskey" />
	<content type="string" />
	<shortdesc lang="en">Path to client key (PEM format) for TLS authentication. Required if --ssl option is used.</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<getopt mixed="-D, --debug-file=[debugfile]" />
	<content type="string" />
	<shortdesc lang="en">Write debug information to given file</shortdesc>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="string" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="string" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="gnutlscli_path" unique="0" required="0">
	<getopt mixed="--gnutlscli-path=[path]" />
	<content type="string" default="/usr/bin/gnutls-cli" />
	<shortdesc lang="en">Path to gnutls-cli binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_drac5.xml b/tests/data/metadata/fence_drac5.xml
	index d72e7a6f..9d3f1a46 100644
	--- a/tests/data/metadata/fence_drac5.xml
	+++ b/tests/data/metadata/fence_drac5.xml
	@@ -1,157 +1,157 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_drac5" shortdesc="Fence agent for Dell DRAC CMC/5" >
	<longdesc>fence_drac5 is an I/O Fencing agent which can be used with the Dell Remote Access Card v5 or CMC (DRAC). This device provides remote access to controlling power to a server. It logs into the DRAC through the telnet/ssh interface of the card. By default, the telnet interface is not enabled.</longdesc>
	<vendor-url>http://www.dell.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<getopt mixed="-c, --command-prompt=[prompt]" />
	<content type="string" default="['\\$', 'DRAC\\/MC:']" />
	<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
	</parameter>
	<parameter name="drac_version" unique="0" required="0">
	<getopt mixed="-d, --drac-version=[version]" />
	<content type="select" >
	<option value="DRAC CMC" />
	<option value="DRAC MC" />
	<option value="DRAC 5" />
	</content>
	- <shortdesc lang="en">Force DRAC version to use (DRAC 5, DRAC CMC, DRAC MC)</shortdesc>
	+ <shortdesc lang="en">Force DRAC version to use</shortdesc>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<parameter name="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="string" default="23" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<getopt mixed="-p, --password=[password]" />
	<content type="string" />
	<shortdesc lang="en">Login password or passphrase</shortdesc>
	</parameter>
	<parameter name="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSH connection</shortdesc>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<content type="string" />
	<shortdesc lang="en">SSH options to use</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<getopt mixed="-D, --debug-file=[debugfile]" />
	<content type="string" />
	<shortdesc lang="en">Write debug information to given file</shortdesc>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="string" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="string" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<content type="string" default="/usr/bin/ssh" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<content type="string" default="/usr/bin/telnet" />
	<shortdesc lang="en">Path to telnet binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_eaton_snmp.xml b/tests/data/metadata/fence_eaton_snmp.xml
	index 6bc025fb..dce58481 100644
	--- a/tests/data/metadata/fence_eaton_snmp.xml
	+++ b/tests/data/metadata/fence_eaton_snmp.xml
	@@ -1,182 +1,182 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_eaton_snmp" shortdesc="Fence agent for Eaton over SNMP" >
	<longdesc>fence_eaton_snmp is an I/O Fencing agent which can be used with the Eaton network power switch. It logs into a device via SNMP and reboots a specified outlet. It supports SNMP v1 and v3 with all combinations of authenticity/privacy settings.</longdesc>
	<vendor-url>http://powerquality.eaton.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="community" unique="0" required="0">
	<getopt mixed="-c, --community=[community]" />
	<content type="string" default="private" />
	<shortdesc lang="en">Set the community string</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<parameter name="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="string" default="161" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<getopt mixed="-p, --password=[password]" />
	<content type="string" />
	<shortdesc lang="en">Login password or passphrase</shortdesc>
	</parameter>
	<parameter name="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
	</parameter>
	<parameter name="snmp_auth_prot" unique="0" required="0">
	<getopt mixed="-b, --snmp-auth-prot=[prot]" />
	<content type="select" >
	<option value="MD5" />
	<option value="SHA" />
	</content>
	- <shortdesc lang="en">Set authentication protocol (MD5\|SHA)</shortdesc>
	+ <shortdesc lang="en">Set authentication protocol</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd" unique="0" required="0">
	<getopt mixed="-P, --snmp-priv-passwd=[pass]" />
	<content type="string" />
	<shortdesc lang="en">Set privacy protocol password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd_script" unique="0" required="0">
	<getopt mixed="-R, --snmp-priv-passwd-script" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve privacy password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_prot" unique="0" required="0">
	<getopt mixed="-B, --snmp-priv-prot=[prot]" />
	<content type="select" >
	<option value="DES" />
	<option value="AES" />
	</content>
	- <shortdesc lang="en">Set privacy protocol (DES\|AES)</shortdesc>
	+ <shortdesc lang="en">Set privacy protocol</shortdesc>
	</parameter>
	<parameter name="snmp_sec_level" unique="0" required="0">
	<getopt mixed="-E, --snmp-sec-level=[level]" />
	<content type="select" >
	<option value="noAuthNoPriv" />
	<option value="authNoPriv" />
	<option value="authPriv" />
	</content>
	- <shortdesc lang="en">Set security level (noAuthNoPriv\|authNoPriv\|authPriv)</shortdesc>
	+ <shortdesc lang="en">Set security level</shortdesc>
	</parameter>
	<parameter name="snmp_version" unique="0" required="0">
	<getopt mixed="-d, --snmp-version=[version]" />
	<content type="select" default="1" >
	<option value="1" />
	<option value="2c" />
	<option value="3" />
	</content>
	- <shortdesc lang="en">Specifies SNMP version to use (1,2c,3)</shortdesc>
	+ <shortdesc lang="en">Specifies SNMP version to use</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<getopt mixed="-D, --debug-file=[debugfile]" />
	<content type="string" />
	<shortdesc lang="en">Write debug information to given file</shortdesc>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="string" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="string" default="2" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="string" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="snmpget_path" unique="0" required="0">
	<getopt mixed="--snmpget-path=[path]" />
	<content type="string" default="/usr/bin/snmpget" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<content type="string" default="/usr/bin/snmpset" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<content type="string" default="/usr/bin/snmpwalk" />
	<shortdesc lang="en">Path to snmpwalk binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_emerson.xml b/tests/data/metadata/fence_emerson.xml
	index a3e17ef8..9d0c85e3 100644
	--- a/tests/data/metadata/fence_emerson.xml
	+++ b/tests/data/metadata/fence_emerson.xml
	@@ -1,182 +1,182 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_emerson" shortdesc="Fence agent for Emerson over SNMP" >
	<longdesc>fence_emerson is an I/O Fencing agent which can be used with MPX and MPH2 managed rack PDU.</longdesc>
	<vendor-url>http://www.emersonnetworkpower.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="community" unique="0" required="0">
	<getopt mixed="-c, --community=[community]" />
	<content type="string" />
	<shortdesc lang="en">Set the community string</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<parameter name="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="string" default="161" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<getopt mixed="-p, --password=[password]" />
	<content type="string" />
	<shortdesc lang="en">Login password or passphrase</shortdesc>
	</parameter>
	<parameter name="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
	</parameter>
	<parameter name="snmp_auth_prot" unique="0" required="0">
	<getopt mixed="-b, --snmp-auth-prot=[prot]" />
	<content type="select" >
	<option value="MD5" />
	<option value="SHA" />
	</content>
	- <shortdesc lang="en">Set authentication protocol (MD5\|SHA)</shortdesc>
	+ <shortdesc lang="en">Set authentication protocol</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd" unique="0" required="0">
	<getopt mixed="-P, --snmp-priv-passwd=[pass]" />
	<content type="string" />
	<shortdesc lang="en">Set privacy protocol password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd_script" unique="0" required="0">
	<getopt mixed="-R, --snmp-priv-passwd-script" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve privacy password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_prot" unique="0" required="0">
	<getopt mixed="-B, --snmp-priv-prot=[prot]" />
	<content type="select" >
	<option value="DES" />
	<option value="AES" />
	</content>
	- <shortdesc lang="en">Set privacy protocol (DES\|AES)</shortdesc>
	+ <shortdesc lang="en">Set privacy protocol</shortdesc>
	</parameter>
	<parameter name="snmp_sec_level" unique="0" required="0">
	<getopt mixed="-E, --snmp-sec-level=[level]" />
	<content type="select" >
	<option value="noAuthNoPriv" />
	<option value="authNoPriv" />
	<option value="authPriv" />
	</content>
	- <shortdesc lang="en">Set security level (noAuthNoPriv\|authNoPriv\|authPriv)</shortdesc>
	+ <shortdesc lang="en">Set security level</shortdesc>
	</parameter>
	<parameter name="snmp_version" unique="0" required="0">
	<getopt mixed="-d, --snmp-version=[version]" />
	<content type="select" >
	<option value="1" />
	<option value="2c" />
	<option value="3" />
	</content>
	- <shortdesc lang="en">Specifies SNMP version to use (1,2c,3)</shortdesc>
	+ <shortdesc lang="en">Specifies SNMP version to use</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<getopt mixed="-D, --debug-file=[debugfile]" />
	<content type="string" />
	<shortdesc lang="en">Write debug information to given file</shortdesc>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="string" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="string" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="snmpget_path" unique="0" required="0">
	<getopt mixed="--snmpget-path=[path]" />
	<content type="string" default="/usr/bin/snmpget" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<content type="string" default="/usr/bin/snmpset" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<content type="string" default="/usr/bin/snmpwalk" />
	<shortdesc lang="en">Path to snmpwalk binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ibmblade.xml b/tests/data/metadata/fence_ibmblade.xml
	index eb92e651..e854ad42 100644
	--- a/tests/data/metadata/fence_ibmblade.xml
	+++ b/tests/data/metadata/fence_ibmblade.xml
	@@ -1,182 +1,182 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ibmblade" shortdesc="Fence agent for IBM BladeCenter over SNMP" >
	<longdesc>fence_ibmblade is an I/O Fencing agent which can be used with IBM BladeCenter chassis. It issues SNMP Set request to BladeCenter chassis, rebooting, powering up or down the specified Blade Server.</longdesc>
	<vendor-url>http://www.ibm.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="community" unique="0" required="0">
	<getopt mixed="-c, --community=[community]" />
	<content type="string" />
	<shortdesc lang="en">Set the community string</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<parameter name="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="string" default="161" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<getopt mixed="-p, --password=[password]" />
	<content type="string" />
	<shortdesc lang="en">Login password or passphrase</shortdesc>
	</parameter>
	<parameter name="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
	</parameter>
	<parameter name="snmp_auth_prot" unique="0" required="0">
	<getopt mixed="-b, --snmp-auth-prot=[prot]" />
	<content type="select" >
	<option value="MD5" />
	<option value="SHA" />
	</content>
	- <shortdesc lang="en">Set authentication protocol (MD5\|SHA)</shortdesc>
	+ <shortdesc lang="en">Set authentication protocol</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd" unique="0" required="0">
	<getopt mixed="-P, --snmp-priv-passwd=[pass]" />
	<content type="string" />
	<shortdesc lang="en">Set privacy protocol password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd_script" unique="0" required="0">
	<getopt mixed="-R, --snmp-priv-passwd-script" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve privacy password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_prot" unique="0" required="0">
	<getopt mixed="-B, --snmp-priv-prot=[prot]" />
	<content type="select" >
	<option value="DES" />
	<option value="AES" />
	</content>
	- <shortdesc lang="en">Set privacy protocol (DES\|AES)</shortdesc>
	+ <shortdesc lang="en">Set privacy protocol</shortdesc>
	</parameter>
	<parameter name="snmp_sec_level" unique="0" required="0">
	<getopt mixed="-E, --snmp-sec-level=[level]" />
	<content type="select" >
	<option value="noAuthNoPriv" />
	<option value="authNoPriv" />
	<option value="authPriv" />
	</content>
	- <shortdesc lang="en">Set security level (noAuthNoPriv\|authNoPriv\|authPriv)</shortdesc>
	+ <shortdesc lang="en">Set security level</shortdesc>
	</parameter>
	<parameter name="snmp_version" unique="0" required="0">
	<getopt mixed="-d, --snmp-version=[version]" />
	<content type="select" default="1" >
	<option value="1" />
	<option value="2c" />
	<option value="3" />
	</content>
	- <shortdesc lang="en">Specifies SNMP version to use (1,2c,3)</shortdesc>
	+ <shortdesc lang="en">Specifies SNMP version to use</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<getopt mixed="-D, --debug-file=[debugfile]" />
	<content type="string" />
	<shortdesc lang="en">Write debug information to given file</shortdesc>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="string" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="string" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="snmpget_path" unique="0" required="0">
	<getopt mixed="--snmpget-path=[path]" />
	<content type="string" default="/usr/bin/snmpget" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<content type="string" default="/usr/bin/snmpset" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<content type="string" default="/usr/bin/snmpwalk" />
	<shortdesc lang="en">Path to snmpwalk binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_idrac.xml b/tests/data/metadata/fence_idrac.xml
	index 22dc05f8..33251afe 100644
	--- a/tests/data/metadata/fence_idrac.xml
	+++ b/tests/data/metadata/fence_idrac.xml
	@@ -1,162 +1,162 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_idrac" shortdesc="Fence agent for IPMI" >
	<symlink name="fence_ilo3" shortdesc="Fence agent for HP iLO3"/>
	<symlink name="fence_ilo4" shortdesc="Fence agent for HP iLO4"/>
	<symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/>
	<symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/>
	<longdesc>fence_ipmilan is an I/O Fencing agentwhich can be used with machines controlled by IPMI.This agent calls support software ipmitool (http://ipmitool.sf.net/).</longdesc>
	<vendor-url></vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="auth" unique="0" required="0">
	<getopt mixed="-A, --auth=[auth]" />
	<content type="select" >
	<option value="md5" />
	<option value="password" />
	<option value="none" />
	</content>
	<shortdesc lang="en">IPMI Lan Auth type.</shortdesc>
	</parameter>
	<parameter name="cipher" unique="0" required="0">
	<getopt mixed="-C, --cipher=[cipher]" />
	<content type="string" />
	<shortdesc lang="en">Ciphersuite to use (same as ipmitool -C parameter)</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<parameter name="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="string" default="623" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="lanplus" unique="0" required="0">
	<getopt mixed="-P, --lanplus" />
	<content type="boolean" default="0" />
	<shortdesc lang="en">Use Lanplus to improve security of connection</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	- <shortdesc lang="en">Method to fence (onoff\|cycle)</shortdesc>
	+ <shortdesc lang="en">Method to fence</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<getopt mixed="-p, --password=[password]" />
	<content type="string" />
	<shortdesc lang="en">Login password or passphrase</shortdesc>
	</parameter>
	<parameter name="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="privlvl" unique="0" required="0">
	<getopt mixed="-L, --privlvl=[level]" />
	<content type="select" default="administrator" >
	<option value="callback" />
	<option value="user" />
	<option value="operator" />
	<option value="administrator" />
	</content>
	<shortdesc lang="en">Privilege level on IPMI device</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<getopt mixed="-D, --debug-file=[debugfile]" />
	<content type="string" />
	<shortdesc lang="en">Write debug information to given file</shortdesc>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="ipmitool_path" unique="0" required="0">
	<getopt mixed="--ipmitool-path=[path]" />
	<content type="string" default="/usr/bin/ipmitool" />
	<shortdesc lang="en">Path to ipmitool binary</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="string" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="string" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="sudo" unique="0" required="0">
	<getopt mixed="--use-sudo" />
	<content type="boolean" />
	<shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc>
	</parameter>
	<parameter name="sudo_path" unique="0" required="0">
	<getopt mixed="--sudo-path=[path]" />
	<content type="string" default="/usr/bin/sudo" />
	<shortdesc lang="en">Path to sudo binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ifmib.xml b/tests/data/metadata/fence_ifmib.xml
	index 3e3c3f77..9310ee67 100644
	--- a/tests/data/metadata/fence_ifmib.xml
	+++ b/tests/data/metadata/fence_ifmib.xml
	@@ -1,183 +1,183 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ifmib" shortdesc="Fence agent for IF MIB" >
	<longdesc>fence_ifmib is an I/O Fencing agent which can be used with any SNMP IF-MIB capable device.
	.P
	It was written with managed ethernet switches in mind, in order to fence iSCSI SAN connections. However, there are many devices that support the IF-MIB interface. The agent uses IF-MIB::ifAdminStatus to control the state of an interface.</longdesc>
	<vendor-url>http://www.ietf.org/wg/concluded/ifmib.html</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="off" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="community" unique="0" required="0">
	<getopt mixed="-c, --community=[community]" />
	<content type="string" />
	<shortdesc lang="en">Set the community string</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<parameter name="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="string" default="161" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<getopt mixed="-p, --password=[password]" />
	<content type="string" />
	<shortdesc lang="en">Login password or passphrase</shortdesc>
	</parameter>
	<parameter name="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
	</parameter>
	<parameter name="snmp_auth_prot" unique="0" required="0">
	<getopt mixed="-b, --snmp-auth-prot=[prot]" />
	<content type="select" >
	<option value="MD5" />
	<option value="SHA" />
	</content>
	- <shortdesc lang="en">Set authentication protocol (MD5\|SHA)</shortdesc>
	+ <shortdesc lang="en">Set authentication protocol</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd" unique="0" required="0">
	<getopt mixed="-P, --snmp-priv-passwd=[pass]" />
	<content type="string" />
	<shortdesc lang="en">Set privacy protocol password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd_script" unique="0" required="0">
	<getopt mixed="-R, --snmp-priv-passwd-script" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve privacy password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_prot" unique="0" required="0">
	<getopt mixed="-B, --snmp-priv-prot=[prot]" />
	<content type="select" >
	<option value="DES" />
	<option value="AES" />
	</content>
	- <shortdesc lang="en">Set privacy protocol (DES\|AES)</shortdesc>
	+ <shortdesc lang="en">Set privacy protocol</shortdesc>
	</parameter>
	<parameter name="snmp_sec_level" unique="0" required="0">
	<getopt mixed="-E, --snmp-sec-level=[level]" />
	<content type="select" >
	<option value="noAuthNoPriv" />
	<option value="authNoPriv" />
	<option value="authPriv" />
	</content>
	- <shortdesc lang="en">Set security level (noAuthNoPriv\|authNoPriv\|authPriv)</shortdesc>
	+ <shortdesc lang="en">Set security level</shortdesc>
	</parameter>
	<parameter name="snmp_version" unique="0" required="0">
	<getopt mixed="-d, --snmp-version=[version]" />
	<content type="select" default="2c" >
	<option value="1" />
	<option value="2c" />
	<option value="3" />
	</content>
	- <shortdesc lang="en">Specifies SNMP version to use (1,2c,3)</shortdesc>
	+ <shortdesc lang="en">Specifies SNMP version to use</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<getopt mixed="-D, --debug-file=[debugfile]" />
	<content type="string" />
	<shortdesc lang="en">Write debug information to given file</shortdesc>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="string" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="string" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="snmpget_path" unique="0" required="0">
	<getopt mixed="--snmpget-path=[path]" />
	<content type="string" default="/usr/bin/snmpget" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<content type="string" default="/usr/bin/snmpset" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<content type="string" default="/usr/bin/snmpwalk" />
	<shortdesc lang="en">Path to snmpwalk binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="1"/>
	<action name="off" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo3.xml b/tests/data/metadata/fence_ilo3.xml
	index c948cffb..5de0caef 100644
	--- a/tests/data/metadata/fence_ilo3.xml
	+++ b/tests/data/metadata/fence_ilo3.xml
	@@ -1,162 +1,162 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ilo3" shortdesc="Fence agent for IPMI" >
	<symlink name="fence_ilo3" shortdesc="Fence agent for HP iLO3"/>
	<symlink name="fence_ilo4" shortdesc="Fence agent for HP iLO4"/>
	<symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/>
	<symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/>
	<longdesc>fence_ipmilan is an I/O Fencing agentwhich can be used with machines controlled by IPMI.This agent calls support software ipmitool (http://ipmitool.sf.net/).</longdesc>
	<vendor-url></vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="auth" unique="0" required="0">
	<getopt mixed="-A, --auth=[auth]" />
	<content type="select" >
	<option value="md5" />
	<option value="password" />
	<option value="none" />
	</content>
	<shortdesc lang="en">IPMI Lan Auth type.</shortdesc>
	</parameter>
	<parameter name="cipher" unique="0" required="0">
	<getopt mixed="-C, --cipher=[cipher]" />
	<content type="string" />
	<shortdesc lang="en">Ciphersuite to use (same as ipmitool -C parameter)</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<parameter name="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="string" default="623" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="lanplus" unique="0" required="0">
	<getopt mixed="-P, --lanplus" />
	<content type="boolean" default="1" />
	<shortdesc lang="en">Use Lanplus to improve security of connection</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="cycle" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	- <shortdesc lang="en">Method to fence (onoff\|cycle)</shortdesc>
	+ <shortdesc lang="en">Method to fence</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<getopt mixed="-p, --password=[password]" />
	<content type="string" />
	<shortdesc lang="en">Login password or passphrase</shortdesc>
	</parameter>
	<parameter name="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="privlvl" unique="0" required="0">
	<getopt mixed="-L, --privlvl=[level]" />
	<content type="select" default="administrator" >
	<option value="callback" />
	<option value="user" />
	<option value="operator" />
	<option value="administrator" />
	</content>
	<shortdesc lang="en">Privilege level on IPMI device</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<getopt mixed="-D, --debug-file=[debugfile]" />
	<content type="string" />
	<shortdesc lang="en">Write debug information to given file</shortdesc>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="ipmitool_path" unique="0" required="0">
	<getopt mixed="--ipmitool-path=[path]" />
	<content type="string" default="/usr/bin/ipmitool" />
	<shortdesc lang="en">Path to ipmitool binary</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="string" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="string" default="4" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="string" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="sudo" unique="0" required="0">
	<getopt mixed="--use-sudo" />
	<content type="boolean" />
	<shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc>
	</parameter>
	<parameter name="sudo_path" unique="0" required="0">
	<getopt mixed="--sudo-path=[path]" />
	<content type="string" default="/usr/bin/sudo" />
	<shortdesc lang="en">Path to sudo binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo3_ssh.xml b/tests/data/metadata/fence_ilo3_ssh.xml
	index 4a3d0a90..9a637b10 100644
	--- a/tests/data/metadata/fence_ilo3_ssh.xml
	+++ b/tests/data/metadata/fence_ilo3_ssh.xml
	@@ -1,146 +1,146 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ilo3_ssh" shortdesc="Fence agent for HP iLO over SSH" >
	<symlink name="fence_ilo3_ssh" shortdesc="Fence agent for HP iLO3 over SSH"/>
	<symlink name="fence_ilo4_ssh" shortdesc="Fence agent for HP iLO4 over SSH"/>
	<longdesc>fence_ilo_ssh is a fence agent that connects to iLO device. It logs into device via ssh and reboot a specified outlet. </longdesc>
	<vendor-url>http://www.hp.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<getopt mixed="-c, --command-prompt=[prompt]" />
	<content type="string" default="['MP>', 'hpiLO->']" />
	<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<parameter name="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="string" default="23" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	- <shortdesc lang="en">Method to fence (onoff\|cycle)</shortdesc>
	+ <shortdesc lang="en">Method to fence</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<getopt mixed="-p, --password=[password]" />
	<content type="string" />
	<shortdesc lang="en">Login password or passphrase</shortdesc>
	</parameter>
	<parameter name="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSH connection</shortdesc>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<content type="string" />
	<shortdesc lang="en">SSH options to use</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<getopt mixed="-D, --debug-file=[debugfile]" />
	<content type="string" />
	<shortdesc lang="en">Write debug information to given file</shortdesc>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="string" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="string" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<content type="string" default="/usr/bin/ssh" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<content type="string" default="/usr/bin/telnet" />
	<shortdesc lang="en">Path to telnet binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo4.xml b/tests/data/metadata/fence_ilo4.xml
	index fc241fd2..2af4fdfd 100644
	--- a/tests/data/metadata/fence_ilo4.xml
	+++ b/tests/data/metadata/fence_ilo4.xml
	@@ -1,162 +1,162 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ilo4" shortdesc="Fence agent for IPMI" >
	<symlink name="fence_ilo3" shortdesc="Fence agent for HP iLO3"/>
	<symlink name="fence_ilo4" shortdesc="Fence agent for HP iLO4"/>
	<symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/>
	<symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/>
	<longdesc>fence_ipmilan is an I/O Fencing agentwhich can be used with machines controlled by IPMI.This agent calls support software ipmitool (http://ipmitool.sf.net/).</longdesc>
	<vendor-url></vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="auth" unique="0" required="0">
	<getopt mixed="-A, --auth=[auth]" />
	<content type="select" >
	<option value="md5" />
	<option value="password" />
	<option value="none" />
	</content>
	<shortdesc lang="en">IPMI Lan Auth type.</shortdesc>
	</parameter>
	<parameter name="cipher" unique="0" required="0">
	<getopt mixed="-C, --cipher=[cipher]" />
	<content type="string" />
	<shortdesc lang="en">Ciphersuite to use (same as ipmitool -C parameter)</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<parameter name="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="string" default="623" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="lanplus" unique="0" required="0">
	<getopt mixed="-P, --lanplus" />
	<content type="boolean" default="1" />
	<shortdesc lang="en">Use Lanplus to improve security of connection</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	- <shortdesc lang="en">Method to fence (onoff\|cycle)</shortdesc>
	+ <shortdesc lang="en">Method to fence</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<getopt mixed="-p, --password=[password]" />
	<content type="string" />
	<shortdesc lang="en">Login password or passphrase</shortdesc>
	</parameter>
	<parameter name="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="privlvl" unique="0" required="0">
	<getopt mixed="-L, --privlvl=[level]" />
	<content type="select" default="administrator" >
	<option value="callback" />
	<option value="user" />
	<option value="operator" />
	<option value="administrator" />
	</content>
	<shortdesc lang="en">Privilege level on IPMI device</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<getopt mixed="-D, --debug-file=[debugfile]" />
	<content type="string" />
	<shortdesc lang="en">Write debug information to given file</shortdesc>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="ipmitool_path" unique="0" required="0">
	<getopt mixed="--ipmitool-path=[path]" />
	<content type="string" default="/usr/bin/ipmitool" />
	<shortdesc lang="en">Path to ipmitool binary</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="string" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="string" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="sudo" unique="0" required="0">
	<getopt mixed="--use-sudo" />
	<content type="boolean" />
	<shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc>
	</parameter>
	<parameter name="sudo_path" unique="0" required="0">
	<getopt mixed="--sudo-path=[path]" />
	<content type="string" default="/usr/bin/sudo" />
	<shortdesc lang="en">Path to sudo binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo4_ssh.xml b/tests/data/metadata/fence_ilo4_ssh.xml
	index 7eb49987..7cabdefa 100644
	--- a/tests/data/metadata/fence_ilo4_ssh.xml
	+++ b/tests/data/metadata/fence_ilo4_ssh.xml
	@@ -1,146 +1,146 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ilo4_ssh" shortdesc="Fence agent for HP iLO over SSH" >
	<symlink name="fence_ilo3_ssh" shortdesc="Fence agent for HP iLO3 over SSH"/>
	<symlink name="fence_ilo4_ssh" shortdesc="Fence agent for HP iLO4 over SSH"/>
	<longdesc>fence_ilo_ssh is a fence agent that connects to iLO device. It logs into device via ssh and reboot a specified outlet. </longdesc>
	<vendor-url>http://www.hp.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<getopt mixed="-c, --command-prompt=[prompt]" />
	<content type="string" default="['MP>', 'hpiLO->']" />
	<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<parameter name="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="string" default="23" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	- <shortdesc lang="en">Method to fence (onoff\|cycle)</shortdesc>
	+ <shortdesc lang="en">Method to fence</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<getopt mixed="-p, --password=[password]" />
	<content type="string" />
	<shortdesc lang="en">Login password or passphrase</shortdesc>
	</parameter>
	<parameter name="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSH connection</shortdesc>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<content type="string" />
	<shortdesc lang="en">SSH options to use</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<getopt mixed="-D, --debug-file=[debugfile]" />
	<content type="string" />
	<shortdesc lang="en">Write debug information to given file</shortdesc>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="string" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="string" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<content type="string" default="/usr/bin/ssh" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<content type="string" default="/usr/bin/telnet" />
	<shortdesc lang="en">Path to telnet binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ilo_ssh.xml b/tests/data/metadata/fence_ilo_ssh.xml
	index c02ca8c8..d5ec60b0 100644
	--- a/tests/data/metadata/fence_ilo_ssh.xml
	+++ b/tests/data/metadata/fence_ilo_ssh.xml
	@@ -1,146 +1,146 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ilo_ssh" shortdesc="Fence agent for HP iLO over SSH" >
	<symlink name="fence_ilo3_ssh" shortdesc="Fence agent for HP iLO3 over SSH"/>
	<symlink name="fence_ilo4_ssh" shortdesc="Fence agent for HP iLO4 over SSH"/>
	<longdesc>fence_ilo_ssh is a fence agent that connects to iLO device. It logs into device via ssh and reboot a specified outlet. </longdesc>
	<vendor-url>http://www.hp.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<getopt mixed="-c, --command-prompt=[prompt]" />
	<content type="string" default="['MP>', 'hpiLO->']" />
	<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<parameter name="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="string" default="23" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	- <shortdesc lang="en">Method to fence (onoff\|cycle)</shortdesc>
	+ <shortdesc lang="en">Method to fence</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<getopt mixed="-p, --password=[password]" />
	<content type="string" />
	<shortdesc lang="en">Login password or passphrase</shortdesc>
	</parameter>
	<parameter name="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" />
	<shortdesc lang="en">Use SSH connection</shortdesc>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<content type="string" />
	<shortdesc lang="en">SSH options to use</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<getopt mixed="-D, --debug-file=[debugfile]" />
	<content type="string" />
	<shortdesc lang="en">Write debug information to given file</shortdesc>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="string" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="string" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<content type="string" default="/usr/bin/ssh" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	<parameter name="telnet_path" unique="0" required="0">
	<getopt mixed="--telnet-path=[path]" />
	<content type="string" default="/usr/bin/telnet" />
	<shortdesc lang="en">Path to telnet binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_imm.xml b/tests/data/metadata/fence_imm.xml
	index 0ff5c088..7798fdde 100644
	--- a/tests/data/metadata/fence_imm.xml
	+++ b/tests/data/metadata/fence_imm.xml
	@@ -1,162 +1,162 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_imm" shortdesc="Fence agent for IPMI" >
	<symlink name="fence_ilo3" shortdesc="Fence agent for HP iLO3"/>
	<symlink name="fence_ilo4" shortdesc="Fence agent for HP iLO4"/>
	<symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/>
	<symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/>
	<longdesc>fence_ipmilan is an I/O Fencing agentwhich can be used with machines controlled by IPMI.This agent calls support software ipmitool (http://ipmitool.sf.net/).</longdesc>
	<vendor-url></vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="auth" unique="0" required="0">
	<getopt mixed="-A, --auth=[auth]" />
	<content type="select" >
	<option value="md5" />
	<option value="password" />
	<option value="none" />
	</content>
	<shortdesc lang="en">IPMI Lan Auth type.</shortdesc>
	</parameter>
	<parameter name="cipher" unique="0" required="0">
	<getopt mixed="-C, --cipher=[cipher]" />
	<content type="string" />
	<shortdesc lang="en">Ciphersuite to use (same as ipmitool -C parameter)</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<parameter name="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="string" default="623" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="lanplus" unique="0" required="0">
	<getopt mixed="-P, --lanplus" />
	<content type="boolean" default="0" />
	<shortdesc lang="en">Use Lanplus to improve security of connection</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	- <shortdesc lang="en">Method to fence (onoff\|cycle)</shortdesc>
	+ <shortdesc lang="en">Method to fence</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<getopt mixed="-p, --password=[password]" />
	<content type="string" />
	<shortdesc lang="en">Login password or passphrase</shortdesc>
	</parameter>
	<parameter name="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="privlvl" unique="0" required="0">
	<getopt mixed="-L, --privlvl=[level]" />
	<content type="select" default="administrator" >
	<option value="callback" />
	<option value="user" />
	<option value="operator" />
	<option value="administrator" />
	</content>
	<shortdesc lang="en">Privilege level on IPMI device</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<getopt mixed="-D, --debug-file=[debugfile]" />
	<content type="string" />
	<shortdesc lang="en">Write debug information to given file</shortdesc>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="ipmitool_path" unique="0" required="0">
	<getopt mixed="--ipmitool-path=[path]" />
	<content type="string" default="/usr/bin/ipmitool" />
	<shortdesc lang="en">Path to ipmitool binary</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="string" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="string" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="sudo" unique="0" required="0">
	<getopt mixed="--use-sudo" />
	<content type="boolean" />
	<shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc>
	</parameter>
	<parameter name="sudo_path" unique="0" required="0">
	<getopt mixed="--sudo-path=[path]" />
	<content type="string" default="/usr/bin/sudo" />
	<shortdesc lang="en">Path to sudo binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_intelmodular.xml b/tests/data/metadata/fence_intelmodular.xml
	index 1d4e1e0a..df3d333f 100644
	--- a/tests/data/metadata/fence_intelmodular.xml
	+++ b/tests/data/metadata/fence_intelmodular.xml
	@@ -1,184 +1,184 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_intelmodular" shortdesc="Fence agent for Intel Modular" >
	<longdesc>fence_intelmodular is an I/O Fencing agent which can be used with Intel Modular device (tested on Intel MFSYS25, should work with MFSYS35 as well).
	.P
	Note: Since firmware update version 2.7, SNMP v2 write support is removed, and replaced by SNMP v3 support. So agent now has default SNMP version 3. If you are using older firmware, please supply -d for command line and snmp_version option for your cluster.conf.</longdesc>
	<vendor-url>http://www.intel.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="community" unique="0" required="0">
	<getopt mixed="-c, --community=[community]" />
	<content type="string" />
	<shortdesc lang="en">Set the community string</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<parameter name="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="string" default="161" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<getopt mixed="-p, --password=[password]" />
	<content type="string" />
	<shortdesc lang="en">Login password or passphrase</shortdesc>
	</parameter>
	<parameter name="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
	</parameter>
	<parameter name="snmp_auth_prot" unique="0" required="0">
	<getopt mixed="-b, --snmp-auth-prot=[prot]" />
	<content type="select" >
	<option value="MD5" />
	<option value="SHA" />
	</content>
	- <shortdesc lang="en">Set authentication protocol (MD5\|SHA)</shortdesc>
	+ <shortdesc lang="en">Set authentication protocol</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd" unique="0" required="0">
	<getopt mixed="-P, --snmp-priv-passwd=[pass]" />
	<content type="string" />
	<shortdesc lang="en">Set privacy protocol password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd_script" unique="0" required="0">
	<getopt mixed="-R, --snmp-priv-passwd-script" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve privacy password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_prot" unique="0" required="0">
	<getopt mixed="-B, --snmp-priv-prot=[prot]" />
	<content type="select" >
	<option value="DES" />
	<option value="AES" />
	</content>
	- <shortdesc lang="en">Set privacy protocol (DES\|AES)</shortdesc>
	+ <shortdesc lang="en">Set privacy protocol</shortdesc>
	</parameter>
	<parameter name="snmp_sec_level" unique="0" required="0">
	<getopt mixed="-E, --snmp-sec-level=[level]" />
	<content type="select" >
	<option value="noAuthNoPriv" />
	<option value="authNoPriv" />
	<option value="authPriv" />
	</content>
	- <shortdesc lang="en">Set security level (noAuthNoPriv\|authNoPriv\|authPriv)</shortdesc>
	+ <shortdesc lang="en">Set security level</shortdesc>
	</parameter>
	<parameter name="snmp_version" unique="0" required="0">
	<getopt mixed="-d, --snmp-version=[version]" />
	<content type="select" >
	<option value="1" />
	<option value="2c" />
	<option value="3" />
	</content>
	- <shortdesc lang="en">Specifies SNMP version to use (1,2c,3)</shortdesc>
	+ <shortdesc lang="en">Specifies SNMP version to use</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<getopt mixed="-D, --debug-file=[debugfile]" />
	<content type="string" />
	<shortdesc lang="en">Write debug information to given file</shortdesc>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="string" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="string" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="snmpget_path" unique="0" required="0">
	<getopt mixed="--snmpget-path=[path]" />
	<content type="string" default="/usr/bin/snmpget" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<content type="string" default="/usr/bin/snmpset" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<content type="string" default="/usr/bin/snmpwalk" />
	<shortdesc lang="en">Path to snmpwalk binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ipdu.xml b/tests/data/metadata/fence_ipdu.xml
	index 6fcea423..03411de3 100644
	--- a/tests/data/metadata/fence_ipdu.xml
	+++ b/tests/data/metadata/fence_ipdu.xml
	@@ -1,182 +1,182 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ipdu" shortdesc="Fence agent for iPDU over SNMP" >
	<longdesc>fence_ipdu is an I/O Fencing agent which can be used with the IBM iPDU network power switch. It logs into a device via SNMP and reboots a specified outlet. It supports SNMP v3 with all combinations of authenticity/privacy settings.</longdesc>
	<vendor-url>http://www.ibm.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="community" unique="0" required="0">
	<getopt mixed="-c, --community=[community]" />
	<content type="string" default="private" />
	<shortdesc lang="en">Set the community string</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<parameter name="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="string" default="161" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<getopt mixed="-p, --password=[password]" />
	<content type="string" />
	<shortdesc lang="en">Login password or passphrase</shortdesc>
	</parameter>
	<parameter name="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
	</parameter>
	<parameter name="snmp_auth_prot" unique="0" required="0">
	<getopt mixed="-b, --snmp-auth-prot=[prot]" />
	<content type="select" >
	<option value="MD5" />
	<option value="SHA" />
	</content>
	- <shortdesc lang="en">Set authentication protocol (MD5\|SHA)</shortdesc>
	+ <shortdesc lang="en">Set authentication protocol</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd" unique="0" required="0">
	<getopt mixed="-P, --snmp-priv-passwd=[pass]" />
	<content type="string" />
	<shortdesc lang="en">Set privacy protocol password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd_script" unique="0" required="0">
	<getopt mixed="-R, --snmp-priv-passwd-script" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve privacy password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_prot" unique="0" required="0">
	<getopt mixed="-B, --snmp-priv-prot=[prot]" />
	<content type="select" >
	<option value="DES" />
	<option value="AES" />
	</content>
	- <shortdesc lang="en">Set privacy protocol (DES\|AES)</shortdesc>
	+ <shortdesc lang="en">Set privacy protocol</shortdesc>
	</parameter>
	<parameter name="snmp_sec_level" unique="0" required="0">
	<getopt mixed="-E, --snmp-sec-level=[level]" />
	<content type="select" >
	<option value="noAuthNoPriv" />
	<option value="authNoPriv" />
	<option value="authPriv" />
	</content>
	- <shortdesc lang="en">Set security level (noAuthNoPriv\|authNoPriv\|authPriv)</shortdesc>
	+ <shortdesc lang="en">Set security level</shortdesc>
	</parameter>
	<parameter name="snmp_version" unique="0" required="0">
	<getopt mixed="-d, --snmp-version=[version]" />
	<content type="select" default="3" >
	<option value="1" />
	<option value="2c" />
	<option value="3" />
	</content>
	- <shortdesc lang="en">Specifies SNMP version to use (1,2c,3)</shortdesc>
	+ <shortdesc lang="en">Specifies SNMP version to use</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<getopt mixed="-D, --debug-file=[debugfile]" />
	<content type="string" />
	<shortdesc lang="en">Write debug information to given file</shortdesc>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="string" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="string" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="snmpget_path" unique="0" required="0">
	<getopt mixed="--snmpget-path=[path]" />
	<content type="string" default="/usr/bin/snmpget" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<content type="string" default="/usr/bin/snmpset" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<content type="string" default="/usr/bin/snmpwalk" />
	<shortdesc lang="en">Path to snmpwalk binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_ipmilan.xml b/tests/data/metadata/fence_ipmilan.xml
	index c7bfefba..733cfa4c 100644
	--- a/tests/data/metadata/fence_ipmilan.xml
	+++ b/tests/data/metadata/fence_ipmilan.xml
	@@ -1,162 +1,162 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_ipmilan" shortdesc="Fence agent for IPMI" >
	<symlink name="fence_ilo3" shortdesc="Fence agent for HP iLO3"/>
	<symlink name="fence_ilo4" shortdesc="Fence agent for HP iLO4"/>
	<symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/>
	<symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/>
	<longdesc>fence_ipmilan is an I/O Fencing agentwhich can be used with machines controlled by IPMI.This agent calls support software ipmitool (http://ipmitool.sf.net/).</longdesc>
	<vendor-url></vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="auth" unique="0" required="0">
	<getopt mixed="-A, --auth=[auth]" />
	<content type="select" >
	<option value="md5" />
	<option value="password" />
	<option value="none" />
	</content>
	<shortdesc lang="en">IPMI Lan Auth type.</shortdesc>
	</parameter>
	<parameter name="cipher" unique="0" required="0">
	<getopt mixed="-C, --cipher=[cipher]" />
	<content type="string" />
	<shortdesc lang="en">Ciphersuite to use (same as ipmitool -C parameter)</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<parameter name="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="string" default="623" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="lanplus" unique="0" required="0">
	<getopt mixed="-P, --lanplus" />
	<content type="boolean" default="0" />
	<shortdesc lang="en">Use Lanplus to improve security of connection</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	- <shortdesc lang="en">Method to fence (onoff\|cycle)</shortdesc>
	+ <shortdesc lang="en">Method to fence</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<getopt mixed="-p, --password=[password]" />
	<content type="string" />
	<shortdesc lang="en">Login password or passphrase</shortdesc>
	</parameter>
	<parameter name="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="privlvl" unique="0" required="0">
	<getopt mixed="-L, --privlvl=[level]" />
	<content type="select" default="administrator" >
	<option value="callback" />
	<option value="user" />
	<option value="operator" />
	<option value="administrator" />
	</content>
	<shortdesc lang="en">Privilege level on IPMI device</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<getopt mixed="-D, --debug-file=[debugfile]" />
	<content type="string" />
	<shortdesc lang="en">Write debug information to given file</shortdesc>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="ipmitool_path" unique="0" required="0">
	<getopt mixed="--ipmitool-path=[path]" />
	<content type="string" default="/usr/bin/ipmitool" />
	<shortdesc lang="en">Path to ipmitool binary</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="string" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="string" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="sudo" unique="0" required="0">
	<getopt mixed="--use-sudo" />
	<content type="boolean" />
	<shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc>
	</parameter>
	<parameter name="sudo_path" unique="0" required="0">
	<getopt mixed="--sudo-path=[path]" />
	<content type="string" default="/usr/bin/sudo" />
	<shortdesc lang="en">Path to sudo binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_lpar.xml b/tests/data/metadata/fence_lpar.xml
	index 545e45f4..1dceaca7 100644
	--- a/tests/data/metadata/fence_lpar.xml
	+++ b/tests/data/metadata/fence_lpar.xml
	@@ -1,156 +1,156 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_lpar" shortdesc="Fence agent for IBM LPAR" >
	<longdesc></longdesc>
	<vendor-url>http://www.ibm.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="cmd_prompt" unique="0" required="0">
	<getopt mixed="-c, --command-prompt=[prompt]" />
	<content type="string" default="[':~>', ']\\$', '\\$ ']" />
	<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
	</parameter>
	<parameter name="hmc_version" unique="0" required="0">
	<getopt mixed="-H, --hmc-version=[version]" />
	<content type="select" default="4" >
	<option value="3" />
	<option value="4" />
	</content>
	- <shortdesc lang="en">Force HMC version to use (3 or 4)</shortdesc>
	+ <shortdesc lang="en">Force HMC version to use</shortdesc>
	</parameter>
	<parameter name="identity_file" unique="0" required="0">
	<getopt mixed="-k, --identity-file=[filename]" />
	<content type="string" />
	<shortdesc lang="en">Identity file (private key) for SSH</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<parameter name="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="string" default="22" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="managed" unique="0" required="0">
	<getopt mixed="-s, --managed=[id]" />
	<content type="string" />
	<shortdesc lang="en">Managed system name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<getopt mixed="-p, --password=[password]" />
	<content type="string" />
	<shortdesc lang="en">Login password or passphrase</shortdesc>
	</parameter>
	<parameter name="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
	</parameter>
	<parameter name="secure" unique="0" required="0">
	<getopt mixed="-x, --ssh" />
	<content type="boolean" default="1" />
	<shortdesc lang="en">Use SSH connection</shortdesc>
	</parameter>
	<parameter name="ssh_options" unique="0" required="0">
	<getopt mixed="--ssh-options=[options]" />
	<content type="string" />
	<shortdesc lang="en">SSH options to use</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<getopt mixed="-D, --debug-file=[debugfile]" />
	<content type="string" />
	<shortdesc lang="en">Write debug information to given file</shortdesc>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" default="15" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="string" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="string" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="ssh_path" unique="0" required="0">
	<getopt mixed="--ssh-path=[path]" />
	<content type="string" default="/usr/bin/ssh" />
	<shortdesc lang="en">Path to ssh binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_tripplite_snmp.xml b/tests/data/metadata/fence_tripplite_snmp.xml
	index 56991886..64d332c3 100644
	--- a/tests/data/metadata/fence_tripplite_snmp.xml
	+++ b/tests/data/metadata/fence_tripplite_snmp.xml
	@@ -1,182 +1,182 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_tripplite_snmp" shortdesc="Fence agent for APC, Tripplite PDU over SNMP" >
	<longdesc>fence_apc_snmp is an I/O Fencing agent which can be used with the APC network power switch or Tripplite PDU devices.It logs into a device via SNMP and reboots a specified outlet. It supports SNMP v1, v2c, v3 with all combinations of authenticity/privacy settings.</longdesc>
	<vendor-url>http://www.apc.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="community" unique="0" required="0">
	<getopt mixed="-c, --community=[community]" />
	<content type="string" default="private" />
	<shortdesc lang="en">Set the community string</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<parameter name="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="string" default="161" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="0">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<getopt mixed="-p, --password=[password]" />
	<content type="string" />
	<shortdesc lang="en">Login password or passphrase</shortdesc>
	</parameter>
	<parameter name="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
	</parameter>
	<parameter name="snmp_auth_prot" unique="0" required="0">
	<getopt mixed="-b, --snmp-auth-prot=[prot]" />
	<content type="select" >
	<option value="MD5" />
	<option value="SHA" />
	</content>
	- <shortdesc lang="en">Set authentication protocol (MD5\|SHA)</shortdesc>
	+ <shortdesc lang="en">Set authentication protocol</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd" unique="0" required="0">
	<getopt mixed="-P, --snmp-priv-passwd=[pass]" />
	<content type="string" />
	<shortdesc lang="en">Set privacy protocol password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_passwd_script" unique="0" required="0">
	<getopt mixed="-R, --snmp-priv-passwd-script" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve privacy password</shortdesc>
	</parameter>
	<parameter name="snmp_priv_prot" unique="0" required="0">
	<getopt mixed="-B, --snmp-priv-prot=[prot]" />
	<content type="select" >
	<option value="DES" />
	<option value="AES" />
	</content>
	- <shortdesc lang="en">Set privacy protocol (DES\|AES)</shortdesc>
	+ <shortdesc lang="en">Set privacy protocol</shortdesc>
	</parameter>
	<parameter name="snmp_sec_level" unique="0" required="0">
	<getopt mixed="-E, --snmp-sec-level=[level]" />
	<content type="select" >
	<option value="noAuthNoPriv" />
	<option value="authNoPriv" />
	<option value="authPriv" />
	</content>
	- <shortdesc lang="en">Set security level (noAuthNoPriv\|authNoPriv\|authPriv)</shortdesc>
	+ <shortdesc lang="en">Set security level</shortdesc>
	</parameter>
	<parameter name="snmp_version" unique="0" required="0">
	<getopt mixed="-d, --snmp-version=[version]" />
	<content type="select" default="1" >
	<option value="1" />
	<option value="2c" />
	<option value="3" />
	</content>
	- <shortdesc lang="en">Specifies SNMP version to use (1,2c,3)</shortdesc>
	+ <shortdesc lang="en">Specifies SNMP version to use</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<getopt mixed="-D, --debug-file=[debugfile]" />
	<content type="string" />
	<shortdesc lang="en">Write debug information to given file</shortdesc>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="string" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="string" default="3" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	<parameter name="snmpget_path" unique="0" required="0">
	<getopt mixed="--snmpget-path=[path]" />
	<content type="string" default="/usr/bin/snmpget" />
	<shortdesc lang="en">Path to snmpget binary</shortdesc>
	</parameter>
	<parameter name="snmpset_path" unique="0" required="0">
	<getopt mixed="--snmpset-path=[path]" />
	<content type="string" default="/usr/bin/snmpset" />
	<shortdesc lang="en">Path to snmpset binary</shortdesc>
	</parameter>
	<parameter name="snmpwalk_path" unique="0" required="0">
	<getopt mixed="--snmpwalk-path=[path]" />
	<content type="string" default="/usr/bin/snmpwalk" />
	<shortdesc lang="en">Path to snmpwalk binary</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="validate-all" />
	</actions>
	</resource-agent>
	diff --git a/tests/data/metadata/fence_zvmip.xml b/tests/data/metadata/fence_zvmip.xml
	index 0260c982..b46ce106 100644
	--- a/tests/data/metadata/fence_zvmip.xml
	+++ b/tests/data/metadata/fence_zvmip.xml
	@@ -1,140 +1,140 @@
	<?xml version="1.0" ?>
	<resource-agent name="fence_zvmip" shortdesc="Fence agent for use with z/VM Virtual Machines" >
	<longdesc>The fence_zvm agent is intended to be used with with z/VM SMAPI service via TCP/IP

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

	Column 1 Column 66 Column 131

	\| \| \|
	V V V

	XXXXXXXX ALL IMAGE_OPERATIONS

	Where XXXXXXX is the name of the virtual machine used in the authuser field of the request.
	</longdesc>
	<vendor-url>http://www.ibm.com</vendor-url>
	<parameters>
	<parameter name="action" unique="0" required="1">
	<getopt mixed="-o, --action=[action]" />
	<content type="string" default="reboot" />
	<shortdesc lang="en">Fencing action</shortdesc>
	</parameter>
	<parameter name="inet4_only" unique="0" required="0">
	<getopt mixed="-4, --inet4-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
	</parameter>
	<parameter name="inet6_only" unique="0" required="0">
	<getopt mixed="-6, --inet6-only" />
	<content type="boolean" />
	<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
	</parameter>
	<parameter name="ipaddr" unique="0" required="1">
	<getopt mixed="-a, --ip=[ip]" />
	<content type="string" />
	<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
	</parameter>
	<parameter name="ipport" unique="0" required="0">
	<getopt mixed="-u, --ipport=[port]" />
	<content type="string" default="44444" />
	<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
	</parameter>
	<parameter name="login" unique="0" required="1">
	<getopt mixed="-l, --username=[name]" />
	<content type="string" />
	<shortdesc lang="en">Login name</shortdesc>
	</parameter>
	<parameter name="method" unique="0" required="0">
	<getopt mixed="-m, --method=[method]" />
	<content type="select" default="onoff" >
	<option value="onoff" />
	<option value="cycle" />
	</content>
	- <shortdesc lang="en">Method to fence (onoff\|cycle)</shortdesc>
	+ <shortdesc lang="en">Method to fence</shortdesc>
	</parameter>
	<parameter name="passwd" unique="0" required="0">
	<getopt mixed="-p, --password=[password]" />
	<content type="string" />
	<shortdesc lang="en">Login password or passphrase</shortdesc>
	</parameter>
	<parameter name="passwd_script" unique="0" required="0">
	<getopt mixed="-S, --password-script=[script]" />
	<content type="string" />
	<shortdesc lang="en">Script to run to retrieve password</shortdesc>
	</parameter>
	<parameter name="port" unique="0" required="1">
	<getopt mixed="-n, --plug=[id]" />
	<content type="string" />
	<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
	</parameter>
	<parameter name="verbose" unique="0" required="0">
	<getopt mixed="-v, --verbose" />
	<content type="boolean" />
	<shortdesc lang="en">Verbose mode</shortdesc>
	</parameter>
	<parameter name="debug" unique="0" required="0">
	<getopt mixed="-D, --debug-file=[debugfile]" />
	<content type="string" />
	<shortdesc lang="en">Write debug information to given file</shortdesc>
	</parameter>
	<parameter name="version" unique="0" required="0">
	<getopt mixed="-V, --version" />
	<content type="boolean" />
	<shortdesc lang="en">Display version information and exit</shortdesc>
	</parameter>
	<parameter name="help" unique="0" required="0">
	<getopt mixed="-h, --help" />
	<content type="boolean" />
	<shortdesc lang="en">Display help and exit</shortdesc>
	</parameter>
	<parameter name="separator" unique="0" required="0">
	<getopt mixed="-C, --separator=[char]" />
	<content type="string" default="," />
	<shortdesc lang="en">Separator for CSV created by 'list' operation</shortdesc>
	</parameter>
	<parameter name="delay" unique="0" required="0">
	<getopt mixed="--delay=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
	</parameter>
	<parameter name="login_timeout" unique="0" required="0">
	<getopt mixed="--login-timeout=[seconds]" />
	<content type="string" default="5" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
	</parameter>
	<parameter name="power_timeout" unique="0" required="0">
	<getopt mixed="--power-timeout=[seconds]" />
	<content type="string" default="20" />
	<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
	</parameter>
	<parameter name="power_wait" unique="0" required="0">
	<getopt mixed="--power-wait=[seconds]" />
	<content type="string" default="0" />
	<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
	</parameter>
	<parameter name="shell_timeout" unique="0" required="0">
	<getopt mixed="--shell-timeout=[seconds]" />
	<content type="string" default="5.0" />
	<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
	</parameter>
	<parameter name="retry_on" unique="0" required="0">
	<getopt mixed="--retry-on=[attempts]" />
	<content type="string" default="1" />
	<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
	</parameter>
	</parameters>
	<actions>
	<action name="on" automatic="0"/>
	<action name="off" />
	<action name="reboot" />
	<action name="status" />
	<action name="list" />
	<action name="list-status" />
	<action name="monitor" />
	<action name="metadata" />
	<action name="validate-all" />
	</actions>
	</resource-agent>

File Metadata

Mime Type: text/x-diff
Expires: Thu, Feb 27, 12:03 AM (11 h, 2 m ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1465917
Default Alt Text: (221 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions