diff --git a/tests/data/metadata/fence_nova.xml b/tests/data/metadata/fence_nova.xml
index d2825eda..30172fb9 100644
--- a/tests/data/metadata/fence_nova.xml
+++ b/tests/data/metadata/fence_nova.xml
@@ -1,59 +1,157 @@
 <?xml version="1.0" ?>
-<resource-agent name="fence_nova" shortdesc="Fence agent for OpenStack's Nova service" >
-<longdesc>fence_nova is a Fencing agent which can be used with machines controlled by the Openstack Nova service. This agent calls the openstack API through python-novaclient and python-keystoneclient </longdesc>
+<resource-agent name="fence_nova.py" shortdesc="Fence agent for OpenStack's Nova service" >
+<longdesc>fence_nova is a Fencing agent which can be used with machines controlled by the Nova service. This agent calls the python-novaclient and it is mandatory to be installed </longdesc>
 <vendor-url>https://wiki.openstack.org/wiki/Nova</vendor-url>
 <parameters>
 	<parameter name="action" unique="0" required="1">
 		<getopt mixed="-o, --action=[action]" />
 		<content type="string" default="reboot"  />
 		<shortdesc lang="en">Fencing action</shortdesc>
 	</parameter>
-	<parameter name="auth-url" unique="0" required="1">
+	<parameter name="auth-url" unique="0" required="1" deprecated="1">
 		<getopt mixed="--auth-url=[authurl]" />
 		<content type="string"  />
 		<shortdesc lang="en">Keystone Auth URL</shortdesc>
 	</parameter>
-	<parameter name="login" unique="0" required="1">
+	<parameter name="auth_url" unique="0" required="1" obsoletes="auth-url">
+		<getopt mixed="--auth-url=[authurl]" />
+		<content type="string"  />
+		<shortdesc lang="en">Keystone Auth URL</shortdesc>
+	</parameter>
+	<parameter name="login" unique="0" required="1" deprecated="1">
 		<getopt mixed="-l, --username=[name]" />
 		<content type="string"  />
-		<shortdesc lang="en">Openstack Login name</shortdesc>
+		<shortdesc lang="en">Login name</shortdesc>
 	</parameter>
-	<parameter name="passwd" unique="0" required="1">
+	<parameter name="passwd" unique="0" required="0" deprecated="1">
 		<getopt mixed="-p, --password=[password]" />
 		<content type="string"  />
-		<shortdesc lang="en">Openstack Login password</shortdesc>
+		<shortdesc lang="en">Login password or passphrase</shortdesc>
+	</parameter>
+	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
+		<getopt mixed="-S, --password-script=[script]" />
+		<content type="string"  />
+		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+	</parameter>
+	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+		<getopt mixed="-p, --password=[password]" />
+		<content type="string"  />
+		<shortdesc lang="en">Login password or passphrase</shortdesc>
+	</parameter>
+	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+		<getopt mixed="-S, --password-script=[script]" />
+		<content type="string"  />
+		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
 	</parameter>
-	<parameter name="project-name" unique="0" required="1">
+	<parameter name="project-domain-name" unique="0" required="0" deprecated="1">
+		<getopt mixed="--project-domain-name=[project-domain]" />
+		<content type="string" default="Default"  />
+		<shortdesc lang="en">Keystone Project Domain Name</shortdesc>
+	</parameter>
+	<parameter name="project-name" unique="0" required="1" deprecated="1">
+		<getopt mixed="--project-name=[project]" />
+		<content type="string" default="admin"  />
+		<shortdesc lang="en">Keystone Project</shortdesc>
+	</parameter>
+	<parameter name="project_domain_name" unique="0" required="0" obsoletes="project-domain-name">
+		<getopt mixed="--project-domain-name=[project-domain]" />
+		<content type="string" default="Default"  />
+		<shortdesc lang="en">Keystone Project Domain Name</shortdesc>
+	</parameter>
+	<parameter name="project_name" unique="0" required="1" obsoletes="project-name">
 		<getopt mixed="--project-name=[project]" />
-		<content type="string" />
+		<content type="string" default="admin"  />
 		<shortdesc lang="en">Keystone Project</shortdesc>
 	</parameter>
-	<parameter name="user-domain-name" unique="0" required="0">
+	<parameter name="user-domain-name" unique="0" required="0" deprecated="1">
 		<getopt mixed="--user-domain-name=[user-domain]" />
 		<content type="string" default="Default"  />
 		<shortdesc lang="en">Keystone User Domain Name</shortdesc>
 	</parameter>
-	<parameter name="project-domain-name" unique="0" required="0">
-		<getopt mixed="--user-domain-name=[project-domain]" />
+	<parameter name="user_domain_name" unique="0" required="0" obsoletes="user-domain-name">
+		<getopt mixed="--user-domain-name=[user-domain]" />
 		<content type="string" default="Default"  />
-		<shortdesc lang="en">Keystone Project Domain Name</shortdesc>
+		<shortdesc lang="en">Keystone User Domain Name</shortdesc>
+	</parameter>
+	<parameter name="username" unique="0" required="1" obsoletes="login">
+		<getopt mixed="-l, --username=[name]" />
+		<content type="string"  />
+		<shortdesc lang="en">Login name</shortdesc>
 	</parameter>
 	<parameter name="uuid" unique="0" required="1">
 		<getopt mixed="--uuid=[uuid]" />
-		<content type="string" />
+		<content type="string"  />
 		<shortdesc lang="en">UUID of the nova instance</shortdesc>
 	</parameter>
+	<parameter name="quiet" unique="0" required="0">
+		<getopt mixed="-q, --quiet" />
+		<content type="boolean"  />
+		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
+	</parameter>
+	<parameter name="verbose" unique="0" required="0">
+		<getopt mixed="-v, --verbose" />
+		<content type="boolean"  />
+		<shortdesc lang="en">Verbose mode</shortdesc>
+	</parameter>
+	<parameter name="debug" unique="0" required="0" deprecated="1">
+		<getopt mixed="-D, --debug-file=[debugfile]" />
+		<content type="string"  />
+		<shortdesc lang="en">Write debug information to given file</shortdesc>
+	</parameter>
+	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+		<getopt mixed="-D, --debug-file=[debugfile]" />
+		<content type="string"  />
+		<shortdesc lang="en">Write debug information to given file</shortdesc>
+	</parameter>
+	<parameter name="version" unique="0" required="0">
+		<getopt mixed="-V, --version" />
+		<content type="boolean"  />
+		<shortdesc lang="en">Display version information and exit</shortdesc>
+	</parameter>
+	<parameter name="help" unique="0" required="0">
+		<getopt mixed="-h, --help" />
+		<content type="boolean"  />
+		<shortdesc lang="en">Display help and exit</shortdesc>
+	</parameter>
+	<parameter name="delay" unique="0" required="0">
+		<getopt mixed="--delay=[seconds]" />
+		<content type="second" default="0"  />
+		<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
+	</parameter>
+	<parameter name="login_timeout" unique="0" required="0">
+		<getopt mixed="--login-timeout=[seconds]" />
+		<content type="second" default="5"  />
+		<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
+	</parameter>
+	<parameter name="power_timeout" unique="0" required="0">
+		<getopt mixed="--power-timeout=[seconds]" />
+		<content type="second" default="20"  />
+		<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
+	</parameter>
+	<parameter name="power_wait" unique="0" required="0">
+		<getopt mixed="--power-wait=[seconds]" />
+		<content type="second" default="0"  />
+		<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
+	</parameter>
+	<parameter name="shell_timeout" unique="0" required="0">
+		<getopt mixed="--shell-timeout=[seconds]" />
+		<content type="second" default="3"  />
+		<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
+	</parameter>
+	<parameter name="retry_on" unique="0" required="0">
+		<getopt mixed="--retry-on=[attempts]" />
+		<content type="integer" default="1"  />
+		<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
+	</parameter>
 </parameters>
 <actions>
 	<action name="on" automatic="0"/>
 	<action name="off" />
 	<action name="reboot" />
 	<action name="status" />
-	<action name="list" />
-	<action name="list-status" />
 	<action name="monitor" />
 	<action name="metadata" />
 	<action name="manpage" />
 	<action name="validate-all" />
 </actions>
 </resource-agent>