Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=fa09cfcbb... Commit: fa09cfcbb869c93518eacaeb2b37579eaa0eac2c Parent: e51702932b482b8ded91a80d43f6f50e797a6373 Author: Marek 'marx' Grac mgrac@redhat.com AuthorDate: Thu Dec 4 17:04:11 2014 +0100 Committer: Marek 'marx' Grac mgrac@redhat.com CommitterDate: Thu Dec 4 23:00:36 2014 +0100
fence_eps, fence_amt: Fix invalid default port values
--- fence/agents/amt/fence_amt.py | 2 ++ fence/agents/eps/fence_eps.py | 2 +- tests/data/metadata/fence_amt.xml | 2 +- tests/data/metadata/fence_eps.xml | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/fence/agents/amt/fence_amt.py b/fence/agents/amt/fence_amt.py index 7027302..5ec785a 100644 --- a/fence/agents/amt/fence_amt.py +++ b/fence/agents/amt/fence_amt.py @@ -94,6 +94,8 @@ def main():
define_new_opts()
+ all_opt["ipport"]["default"] = "16994" + options = check_input(device_opt, process_input(device_opt))
docs = {} diff --git a/fence/agents/eps/fence_eps.py b/fence/agents/eps/fence_eps.py index 51f4758..9e31207 100644 --- a/fence/agents/eps/fence_eps.py +++ b/fence/agents/eps/fence_eps.py @@ -98,7 +98,7 @@ def eps_define_new_opts(): # Starting point of fence agent def main(): device_opt = ["ipaddr", "login", "passwd", "no_login", "no_password", \ - "port", "hidden_page"] + "port", "hidden_page", "web"]
atexit.register(atexit_handler)
diff --git a/tests/data/metadata/fence_amt.xml b/tests/data/metadata/fence_amt.xml index b7f6e93..2f50a4c 100644 --- a/tests/data/metadata/fence_amt.xml +++ b/tests/data/metadata/fence_amt.xml @@ -36,7 +36,7 @@ </parameter> <parameter name="ipport" unique="0" required="0"> <getopt mixed="-u, --ipport=[port]" /> - <content type="string" default="23" /> + <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"> diff --git a/tests/data/metadata/fence_eps.xml b/tests/data/metadata/fence_eps.xml index be4fed6..5f047cf 100644 --- a/tests/data/metadata/fence_eps.xml +++ b/tests/data/metadata/fence_eps.xml @@ -32,7 +32,7 @@ Agent basically works by connecting to hidden page and pass appropriate argument </parameter> <parameter name="ipport" unique="0" required="0"> <getopt mixed="-u, --ipport=[port]" /> - <content type="string" default="23" /> + <content type="string" default="80" /> <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> </parameter> <parameter name="login" unique="0" required="0">