diff --git a/fence/agents/dummy/fence_dummy.py b/fence/agents/dummy/fence_dummy.py
index 7f95b8f7..661c7ca4 100644
--- a/fence/agents/dummy/fence_dummy.py
+++ b/fence/agents/dummy/fence_dummy.py
@@ -1,142 +1,143 @@
 #!/usr/bin/python -tt
 
 import sys, random
 import logging
 import time
 import atexit
 sys.path.append("@FENCEAGENTSLIBDIR@")
 from fencing import *
 from fencing import fail_usage
 
 #BEGIN_VERSION_GENERATION
 RELEASE_VERSION="New Dummy Agent - test release on steroids"
 REDHAT_COPYRIGHT=""
 BUILD_DATE=""
 #END_VERSION_GENERATION
 
 plug_status = "on"
 
 def get_power_status_file(conn, options):
 	del conn
 
 	try:
 		status_file = open(options["--status-file"], 'r')
 	except Exception:
 		return "off"
 
 	status = status_file.read()
 	status_file.close()
 
 	return status.lower()
 
 def set_power_status_file(conn, options):
 	del conn
 
 	if not (options["--action"] in ["on", "off"]):
 		return
 
 	status_file = open(options["--status-file"], 'w')
 	status_file.write(options["--action"])
 	status_file.close()
 
 def get_power_status_fail(conn, options):
 	outlets = get_outlets_fail(conn, options)
 
 	if len(outlets) == 0 or not options.has_key("--plug"):
 		fail_usage("Failed: You have to enter existing machine!")
 	else:
 		return outlets[options["--plug"]][0]
 
 def set_power_status_fail(conn, options):
 	global plug_status
 	del conn
 
 	plug_status = "unknown"
 	if options["--action"] == "on":
 		plug_status = "off"
 
 def get_outlets_fail(conn, options):
 	del conn
 
 	result = {}
 	global plug_status
 
 	if options["--action"] == "on":
 		plug_status = "off"
 
 	# This fake agent has no port data to list, so we have to make
 	# something up for the list action.
 	if options.get("--action", None) == "list":
 		result["fake_port_1"] = [plug_status, "fake"]
 		result["fake_port_2"] = [plug_status, "fake"]
 	elif not options.has_key("--plug"):
 		fail_usage("Failed: You have to enter existing machine!")
 	else:
 		port = options["--plug"]
 		result[port] = [plug_status, "fake"]
 
 	return result
 
 def main():
 	device_opt = ["no_password", "status_file", "random_sleep_range", "type", "port"]
 
 	atexit.register(atexit_handler)
 
 	all_opt["status_file"] = {
 		"getopt" : ":",
 		"longopt" : "status-file",
 		"help":"--status-file=[file]           Name of file that holds current status",
 		"required" : "0",
 		"shortdesc" : "File with status",
 		"default" : "/tmp/fence_dummy.status",
 		"order": 1
 		}
 
 	all_opt["random_sleep_range"] = {
 		"getopt" : ":",
 		"longopt" : "random_sleep_range",
 		"help":"--random_sleep_range=[seconds] Issue a sleep between 1 and [seconds]",
 		"required" : "0",
 		"shortdesc" : "Issue a sleep between 1 and X seconds. Used for testing.",
 		"order": 1
 		}
 
 	all_opt["type"] = {
 		"getopt" : ":",
 		"longopt" : "type",
 		"help":"--type=[type]                  Possible types are: file and fail",
 		"required" : "0",
 		"shortdesc" : "Type of the dummy fence agent",
 		"default" : "file",
 		"order": 1
 		}
 
 	pinput = process_input(device_opt)
 	if (pinput.has_key("--type") and pinput["--type"] == "file") or (pinput.has_key("--type") == False):
 		# hack to have fence agents that require ports 'fail' and one that do not 'file'
 		device_opt.remove("port")
+		device_opt.remove("separator")
 
 	options = check_input(device_opt, process_input(device_opt))
 
 	docs = {}
 	docs["shortdesc"] = "Dummy fence agent"
 	docs["longdesc"] = "fence_dummy"
 	docs["vendorurl"] = "http://www.example.com"
 	show_docs(options, docs)
 
 	# random sleep for testing
 	if options.has_key("--random_sleep_range"):
 		val = int(options["--random_sleep_range"])
 		ran = random.randint(1, val)
 		logging.info("Random sleep for %d seconds\n", ran)
 		time.sleep(ran)
 
 	if options["--type"] == "fail":
 		result = fence_action(None, options, set_power_status_fail, get_power_status_fail, get_outlets_fail)
 	else:
 		result = fence_action(None, options, set_power_status_file, get_power_status_file, None)
 
 	sys.exit(result)
 
 if __name__ == "__main__":
 	main()
diff --git a/tests/data/metadata/fence_dummy.xml b/tests/data/metadata/fence_dummy.xml
index eab98f02..c84481be 100644
--- a/tests/data/metadata/fence_dummy.xml
+++ b/tests/data/metadata/fence_dummy.xml
@@ -1,96 +1,86 @@
 <?xml version="1.0" ?>
 <resource-agent name="fence_dummy" shortdesc="Dummy fence agent" >
 <longdesc>fence_dummy</longdesc>
 <vendor-url>http://www.example.com</vendor-url>
 <parameters>
 	<parameter name="action" unique="0" required="1">
 		<getopt mixed="-o, --action=[action]" />
 		<content type="string" default="reboot"  />
 		<shortdesc lang="en">Fencing action</shortdesc>
 	</parameter>
-	<parameter name="port" unique="0" required="1">
-		<getopt mixed="-n, --plug=[ip]" />
-		<content type="string"  />
-		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
-	</parameter>
 	<parameter name="random_sleep_range" unique="0" required="0">
 		<getopt mixed="--random_sleep_range=[seconds]" />
 		<content type="string"  />
 		<shortdesc lang="en">Issue a sleep between 1 and X seconds. Used for testing.</shortdesc>
 	</parameter>
 	<parameter name="status_file" unique="0" required="0">
 		<getopt mixed="--status-file=[file]" />
 		<content type="string" default="/tmp/fence_dummy.status"  />
 		<shortdesc lang="en">File with status</shortdesc>
 	</parameter>
 	<parameter name="type" unique="0" required="0">
 		<getopt mixed="--type=[type]" />
 		<content type="string" default="file"  />
 		<shortdesc lang="en">Type of the dummy fence agent</shortdesc>
 	</parameter>
 	<parameter name="verbose" unique="0" required="0">
 		<getopt mixed="-v, --verbose" />
 		<content type="boolean"  />
 		<shortdesc lang="en">Verbose mode</shortdesc>
 	</parameter>
 	<parameter name="debug" unique="0" required="0">
 		<getopt mixed="-D, --debug-file=[debugfile]" />
 		<content type="string"  />
 		<shortdesc lang="en">Write debug information to given file</shortdesc>
 	</parameter>
 	<parameter name="version" unique="0" required="0">
 		<getopt mixed="-V, --version" />
 		<content type="boolean"  />
 		<shortdesc lang="en">Display version information and exit</shortdesc>
 	</parameter>
 	<parameter name="help" unique="0" required="0">
 		<getopt mixed="-h, --help" />
 		<content type="boolean"  />
 		<shortdesc lang="en">Display help and exit</shortdesc>
 	</parameter>
 	<parameter name="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="port_as_ip" unique="0" required="0">
-		<getopt mixed="--port-as-ip" />
-		<content type="boolean"  />
-		<shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
-	</parameter>
 	<parameter name="power_timeout" unique="0" required="0">
 		<getopt mixed="--power-timeout=[seconds]" />
 		<content type="string" default="20"  />
 		<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
 	</parameter>
 	<parameter name="power_wait" unique="0" required="0">
 		<getopt mixed="--power-wait=[seconds]" />
 		<content type="string" default="0"  />
 		<shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
 	</parameter>
 	<parameter name="shell_timeout" unique="0" required="0">
 		<getopt mixed="--shell-timeout=[seconds]" />
 		<content type="string" default="3"  />
 		<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
 	</parameter>
 	<parameter name="retry_on" unique="0" required="0">
 		<getopt mixed="--retry-on=[attempts]" />
 		<content type="string" default="1"  />
 		<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
 	</parameter>
 </parameters>
 <actions>
 	<action name="on" automatic="0"/>
 	<action name="off" />
 	<action name="reboot" />
 	<action name="status" />
 	<action name="monitor" />
 	<action name="metadata" />
 	<action name="validate-all" />
 </actions>
 </resource-agent>