cluster-commits February 2013

cluster-commits@lists.fedorahosted.org

7 participants
50 discussions

dlm: master - dlm_controld: retry processing lockspace for ringid
by David Teigland 05 Feb '13

05 Feb '13

Gitweb: http://git.fedorahosted.org/git/?p=dlm.git;a=commitdiff;h=6368f44ec16c9ce8a… Commit: 6368f44ec16c9ce8a61c2304729930cbae55388d Parent: cbc0685865996ced65f5b52f037d32d838d63570 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Thu Jan 31 11:41:13 2013 -0600 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Thu Jan 31 11:41:13 2013 -0600 dlm_controld: retry processing lockspace for ringid When waiting for ringids to match, we should set poll_lockspaces so that we'll go back to attempt ls recovery once the ringids do match. Signed-off-by: David Teigland <teigland(a)redhat.com> --- dlm_controld/cpg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlm_controld/cpg.c b/dlm_controld/cpg.c index 487887c..f2582a8 100644 --- a/dlm_controld/cpg.c +++ b/dlm_controld/cpg.c @@ -608,6 +608,7 @@ static int wait_conditions_done(struct lockspace *ls) ls->wait_retry++; /* the check function logs a message */ + poll_lockspaces++; return 0; }

1 0

fence-agents: master - fence agents: Text in help is changed from foo=<value> to foo=[value]
by Marek Grác 04 Feb '13

04 Feb '13

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=110e74e7… Commit: 110e74e711d1a341d4f40dc3f253170bd6cb7651 Parent: 141d2e6d8310e22fa5f678d46089146dfa4691b0 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Feb 4 16:48:49 2013 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Feb 4 16:48:49 2013 +0100 fence agents: Text in help is changed from foo=<value> to foo=[value] Unlike previous patch, this focus on fixing specif fence agents. --- fence/agents/baytech/fence_baytech.pl | 12 ++++++------ fence/agents/brocade/fence_brocade.pl | 12 ++++++------ fence/agents/bullpap/fence_bullpap.pl | 12 ++++++------ fence/agents/cisco_ucs/fence_cisco_ucs.py | 2 +- fence/agents/cpint/fence_cpint.pl | 2 +- fence/agents/drac/fence_drac.pl | 20 ++++++++++---------- fence/agents/drac5/fence_drac5.py | 2 +- fence/agents/egenera/fence_egenera.pl | 12 ++++++------ fence/agents/eps/fence_eps.py | 2 +- fence/agents/ilo/fence_ilo.py | 2 +- fence/agents/lpar/fence_lpar.py | 4 ++-- fence/agents/mcdata/fence_mcdata.pl | 12 ++++++------ fence/agents/rackswitch/do_rack.c | 8 ++++---- fence/agents/vixel/fence_vixel.pl | 10 +++++----- fence/agents/xcat/fence_xcat.pl | 6 +++--- fence/agents/zvm/fence_zvm.pl | 8 ++++---- 16 files changed, 63 insertions(+), 63 deletions(-) diff --git a/fence/agents/baytech/fence_baytech.pl b/fence/agents/baytech/fence_baytech.pl index e218b78..bb7f42e 100644 --- a/fence/agents/baytech/fence_baytech.pl +++ b/fence/agents/baytech/fence_baytech.pl @@ -108,32 +108,32 @@ The other assumption that is made is that Outlet names do not end in space. The <vendor-url>http://www.baytech.net</vendor-url> <parameters> <parameter name="action" unique="1" required="1"> - <getopt mixed="-o <action>" /> + <getopt mixed="-o [action]" /> <content type="string" default="disable" /> <shortdesc lang="en">Fencing Action</shortdesc> </parameter> <parameter name="ipaddr" unique="1" required="1"> - <getopt mixed="-a <ip>" /> + <getopt mixed="-a [ip]" /> <content type="string" /> <shortdesc lang="en">IP Address or Hostname</shortdesc> </parameter> <parameter name="login" unique="1" required="1"> - <getopt mixed="-l <name>" /> + <getopt mixed="-l [name]" /> <content type="string" /> <shortdesc lang="en">Login Name</shortdesc> </parameter> <parameter name="passwd" unique="1" required="0"> - <getopt mixed="-p <password>" /> + <getopt mixed="-p [password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> <parameter name="passwd_script" unique="1" required="0"> - <getopt mixed="-S <script>" /> + <getopt mixed="-S [script]" /> <content type="string" /> <shortdesc lang="en">Script to retrieve password</shortdesc> </parameter> <parameter name="port" unique="1" required="1"> - <getopt mixed="-n <id>" /> + <getopt mixed="-n [id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number or name of virtual machine</shortdesc> </parameter> diff --git a/fence/agents/brocade/fence_brocade.pl b/fence/agents/brocade/fence_brocade.pl index e3f7290..4be0436 100644 --- a/fence/agents/brocade/fence_brocade.pl +++ b/fence/agents/brocade/fence_brocade.pl @@ -85,32 +85,32 @@ After a fence operation has taken place the fenced machine can no longer connec <vendor-url>http://www.brocade.com</vendor-url> <parameters> <parameter name="action" unique="0" required="1"> - <getopt mixed="-o <action>" /> + <getopt mixed="-o [action]" /> <content type="string" default="disable" /> <shortdesc lang="en">Fencing Action</shortdesc> </parameter> <parameter name="ipaddr" unique="0" required="1"> - <getopt mixed="-a <ip>" /> + <getopt mixed="-a [ip]" /> <content type="string" /> <shortdesc lang="en">IP Address or Hostname</shortdesc> </parameter> <parameter name="login" unique="0" required="1"> - <getopt mixed="-l <name>" /> + <getopt mixed="-l [name]" /> <content type="string" /> <shortdesc lang="en">Login Name</shortdesc> </parameter> <parameter name="passwd" unique="0" required="0"> - <getopt mixed="-p <password>" /> + <getopt mixed="-p [password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> <parameter name="passwd_script" unique="0" required="0"> - <getopt mixed="-S <script>" /> + <getopt mixed="-S [script]" /> <content type="string" /> <shortdesc lang="en">Script to retrieve password</shortdesc> </parameter> <parameter name="port" unique="0" required="1"> - <getopt mixed="-n <id>" /> + <getopt mixed="-n [id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number or name of virtual machine</shortdesc> </parameter> diff --git a/fence/agents/bullpap/fence_bullpap.pl b/fence/agents/bullpap/fence_bullpap.pl index e31ab6d..3012fa2 100644 --- a/fence/agents/bullpap/fence_bullpap.pl +++ b/fence/agents/bullpap/fence_bullpap.pl @@ -94,32 +94,32 @@ fence_bullpap is an I/O Fencing agent which can be used with Bull\'s NovaScale m <vendor-url>http://www.bull.com</vendor-url> <parameters> <parameter name="action" unique="1" required="1"> - <getopt mixed="-o <action>" /> + <getopt mixed="-o [action]" /> <content type="string" default="reboot" /> <shortdesc lang="en">Fencing Action</shortdesc> </parameter> <parameter name="ipaddr" unique="1" required="1"> - <getopt mixed="-a <ip>" /> + <getopt mixed="-a [ip]" /> <content type="string" /> <shortdesc lang="en">IP Address or Hostname</shortdesc> </parameter> <parameter name="login" unique="1" required="1"> - <getopt mixed="-l <name>" /> + <getopt mixed="-l [name]" /> <content type="string" /> <shortdesc lang="en">Login Name</shortdesc> </parameter> <parameter name="passwd" unique="1" required="0"> - <getopt mixed="-p <password>" /> + <getopt mixed="-p [password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> <parameter name="passwd_script" unique="1" required="0"> - <getopt mixed="-S <script>" /> + <getopt mixed="-S [script]" /> <content type="string" /> <shortdesc lang="en">Script to retrieve password</shortdesc> </parameter> <parameter name="domain" unique="1" required="1"> - <getopt mixed="-d <domain>" /> + <getopt mixed="-d [domain]" /> <content type="string" /> <shortdesc lang="en">Domain name of the Bull machine to power-cycle</shortdesc> </parameter> diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py b/fence/agents/cisco_ucs/fence_cisco_ucs.py index 92c29eb..e66130e 100644 --- a/fence/agents/cisco_ucs/fence_cisco_ucs.py +++ b/fence/agents/cisco_ucs/fence_cisco_ucs.py @@ -100,7 +100,7 @@ def define_new_opts(): all_opt["suborg"] = { "getopt" : "s:", "longopt" : "suborg", - "help" : "--suborg=<path> Additional path needed to access suborganization", + "help" : "--suborg=[path] Additional path needed to access suborganization", "required" : "0", "shortdesc" : "Additional path needed to access suborganization", "default" : "", diff --git a/fence/agents/cpint/fence_cpint.pl b/fence/agents/cpint/fence_cpint.pl index eb2ad3a..7a7a5f5 100644 --- a/fence/agents/cpint/fence_cpint.pl +++ b/fence/agents/cpint/fence_cpint.pl @@ -79,7 +79,7 @@ NOTE: for fence_cpint to send a command to another virtual machine, the machine <vendor-url>http://www.ibm.com</vendor-url> <parameters> <parameter name="userid" unique="1" required="1"> - <getopt mixed="-u <userid>" /> + <getopt mixed="-u [userid]" /> <content type="string" /> <shortdesc lang="en">Userid of the virtual machine to fence</shortdesc> </parameter> diff --git a/fence/agents/drac/fence_drac.pl b/fence/agents/drac/fence_drac.pl index b26fbcb..536badd 100644 --- a/fence/agents/drac/fence_drac.pl +++ b/fence/agents/drac/fence_drac.pl @@ -144,52 +144,52 @@ fence_drac is an I/O Fencing agent which can be used with the Dell Remote Access <vendor-url>http://www.dell.com</vendor-url> <parameters> <parameter name="action" unique="0" required="1"> - <getopt mixed="-o <action>" /> + <getopt mixed="-o [action]" /> <content type="string" default="reboot" /> <shortdesc lang="en">Fencing Action</shortdesc> </parameter> <parameter name="ipaddr" unique="0" required="1"> - <getopt mixed="-a <ip>" /> + <getopt mixed="-a [ip]" /> <content type="string" /> <shortdesc lang="en">IP Address or Hostname</shortdesc> </parameter> <parameter name="login" unique="0" required="1"> - <getopt mixed="-l <name>" /> + <getopt mixed="-l [name]" /> <content type="string" /> <shortdesc lang="en">Login Name</shortdesc> </parameter> <parameter name="passwd" unique="0" required="0"> - <getopt mixed="-p <password>" /> + <getopt mixed="-p [password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> <parameter name="passwd_script" unique="0" required="0"> - <getopt mixed="-S <script>" /> + <getopt mixed="-S [script]" /> <content type="string" /> <shortdesc lang="en">Script to retrieve password</shortdesc> </parameter> <parameter name="cmd_prompt" unique="0" required="0"> - <getopt mixed="-c <prompt>" /> + <getopt mixed="-c [prompt]" /> <content type="string" /> <shortdesc lang="en">Force fence_drac to use cmd_prompt as the command prompt</shortdesc> </parameter> <parameter name="drac_version" unique="0" required="0"> - <getopt mixed="-d <version>" /> + <getopt mixed="-d [version]" /> <content type="string" /> <shortdesc lang="en">Force fence_drac to treat the device as though it was for the specified drac version</shortdesc> </parameter> <parameter name="module_name" unique="0" required="0"> - <getopt mixed="-m <modulename>" /> + <getopt mixed="-m [modulename]" /> <content type="string"/> <shortdesc lang="en">The module name of the blade when using DRAC/MC firmware.</shortdesc> </parameter> <parameter name="debug" unique="0" required="0"> - <getopt mixed="-D <dumpfile>" /> + <getopt mixed="-D [dumpfile]" /> <content type="string"/> <shortdesc lang="en">Debug file of the telnet interaction</shortdesc> </parameter> <parameter name="delay" unique="0" required="0"> - <getopt mixed="-f <seconds>" /> + <getopt mixed="-f [seconds]" /> <content type="string" default="0"/> <shortdesc lang="en">Wait X seconds before fencing is started</shortdesc> </parameter> diff --git a/fence/agents/drac5/fence_drac5.py b/fence/agents/drac5/fence_drac5.py index 5af0045..2e9a8d3 100644 --- a/fence/agents/drac5/fence_drac5.py +++ b/fence/agents/drac5/fence_drac5.py @@ -79,7 +79,7 @@ def define_new_opts(): all_opt["drac_version"] = { "getopt" : "d:", "longopt" : "drac-version", - "help" : "-d, --drac-version=<version> Force DRAC version to use", + "help" : "-d, --drac-version=[version] Force DRAC version to use", "required" : "0", "shortdesc" : "Force DRAC version to use", "order" : 1 } diff --git a/fence/agents/egenera/fence_egenera.pl b/fence/agents/egenera/fence_egenera.pl index 308338b..2ea4d0c 100644 --- a/fence/agents/egenera/fence_egenera.pl +++ b/fence/agents/egenera/fence_egenera.pl @@ -84,32 +84,32 @@ fence_egenera is an I/O Fencing agent which can be used with the Egenera Blade <vendor-url>http://www.bull.com</vendor-url> <parameters> <parameter name="action" unique="0" required="1"> - <getopt mixed="-o <action>" /> + <getopt mixed="-o [action]" /> <content type="string" default="reboot" /> <shortdesc lang="en">Fencing Action</shortdesc> </parameter> <parameter name="cserver" unique="0" required="1"> - <getopt mixed="-c <cserver>" /> + <getopt mixed="-c [cserver]" /> <content type="string" /> <shortdesc lang="en">The cserver to ssh to. cserver can be in the form user@hostname to specify a different user to login as.</shortdesc> </parameter> <parameter name="pserver" unique="0" required="1"> - <getopt mixed="-p <pserver>" /> + <getopt mixed="-p [pserver]" /> <content type="string" /> <shortdesc lang="en">The pserver to operate on.</shortdesc> </parameter> <parameter name="user" unique="0" required="1"> - <getopt mixed="-u <name>" /> + <getopt mixed="-u [name]" /> <content type="string" default="root" /> <shortdesc lang="en">Login Name</shortdesc> </parameter> <parameter name="lpan" unique="0" required="1"> - <getopt mixed="-l <lpan>" /> + <getopt mixed="-l [lpan]" /> <content type="string" /> <shortdesc lang="en">The lpan to operate on.</shortdesc> </parameter> <parameter name="delay" unique="0" required="0"> - <getopt mixed="-f <seconds>" /> + <getopt mixed="-f [seconds]" /> <content type="string" default="0"/> <shortdesc lang="en">Wait X seconds before fencing is started</shortdesc> </parameter> diff --git a/fence/agents/eps/fence_eps.py b/fence/agents/eps/fence_eps.py index 245c1a2..dfb0b5b 100644 --- a/fence/agents/eps/fence_eps.py +++ b/fence/agents/eps/fence_eps.py @@ -89,7 +89,7 @@ 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", diff --git a/fence/agents/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py index fc664cc..15e273f 100644 --- a/fence/agents/ilo/fence_ilo.py +++ b/fence/agents/ilo/fence_ilo.py @@ -56,7 +56,7 @@ def define_new_opts(): all_opt["ribcl"] = { "getopt" : "r:", "longopt" : "ribcl-version", - "help" : "-r, --ribcl-version=<version> Force ribcl version to use", + "help" : "-r, --ribcl-version=[version] Force ribcl version to use", "required" : "0", "shortdesc" : "Force ribcl version to use", "order" : 1 } diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py index bf658f0..9dc3e4d 100644 --- a/fence/agents/lpar/fence_lpar.py +++ b/fence/agents/lpar/fence_lpar.py @@ -103,14 +103,14 @@ def define_new_opts(): all_opt["managed"] = { "getopt" : "s:", "longopt" : "managed", - "help" : "-s, --managed=<id> Name of the managed system", + "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)", "required" : "0", "shortdesc" : "Force HMC version to use (3 or 4)", "default" : "4", diff --git a/fence/agents/mcdata/fence_mcdata.pl b/fence/agents/mcdata/fence_mcdata.pl index 5bc9dcf..3148a99 100644 --- a/fence/agents/mcdata/fence_mcdata.pl +++ b/fence/agents/mcdata/fence_mcdata.pl @@ -91,32 +91,32 @@ After a fence operation has taken place the fenced machine can no longer connect <vendor-url>http://www.brocade.com</vendor-url> <parameters> <parameter name="action" unique="1" required="1"> - <getopt mixed="-o <action>" /> + <getopt mixed="-o [action]" /> <content type="string" default="disable" /> <shortdesc lang="en">Fencing Action</shortdesc> </parameter> <parameter name="ipaddr" unique="1" required="1"> - <getopt mixed="-a <ip>" /> + <getopt mixed="-a [ip]" /> <content type="string" /> <shortdesc lang="en">IP Address or Hostname</shortdesc> </parameter> <parameter name="login" unique="1" required="1"> - <getopt mixed="-l <name>" /> + <getopt mixed="-l [name]" /> <content type="string" /> <shortdesc lang="en">Login Name</shortdesc> </parameter> <parameter name="passwd" unique="1" required="0"> - <getopt mixed="-p <password>" /> + <getopt mixed="-p [password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> <parameter name="passwd_script" unique="1" required="0"> - <getopt mixed="-S <script>" /> + <getopt mixed="-S [script]" /> <content type="string" /> <shortdesc lang="en">Script to retrieve password</shortdesc> </parameter> <parameter name="port" unique="1" required="1"> - <getopt mixed="-n <id>" /> + <getopt mixed="-n [id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number or name of virtual machine</shortdesc> </parameter> diff --git a/fence/agents/rackswitch/do_rack.c b/fence/agents/rackswitch/do_rack.c index d8050bf..ee29153 100644 --- a/fence/agents/rackswitch/do_rack.c +++ b/fence/agents/rackswitch/do_rack.c @@ -166,22 +166,22 @@ static void print_metadata(void) "<vendor-url>http://www.bladenetwork.net</vendor-url>\n" "<parameters>\n" "<parameter name=\"ipaddr\" unique=\"1\" required=\"1\">\n" - "\t<getopt mixed=\"-a <ip>\" />\n" + "\t<getopt mixed=\"-a [ip]\" />\n" "\t<content type=\"string\" />\n" "\t<shortdesc lang=\"en\">IP Address or Hostname</shortdesc>\n" "</parameter>\n" "<parameter name=\"login\" unique=\"1\" required=\"1\">\n" - "\t<getopt mixed=\"-l <name>\" />\n" + "\t<getopt mixed=\"-l [name]\" />\n" "\t<content type=\"string\" />\n" "\t<shortdesc lang=\"en\">Login Name</shortdesc>\n" "</parameter>\n" "<parameter name=\"passwd\" unique=\"1\" required=\"0\">\n" - "\t<getopt mixed=\"-p <password>\" />\n" + "\t<getopt mixed=\"-p [password]\" />\n" "\t<content type=\"string\" />\n" "\t<shortdesc lang=\"en\">Login password or passphrase</shortdesc>\n" "</parameter>\n" "<parameter name=\"passwd_script\" unique=\"1\" required=\"0\">\n" - "\t<getopt mixed=\"-S <script>\" />\n" + "\t<getopt mixed=\"-S [script]\" />\n" "\t<content type=\"string\" />\n" "\t<shortdesc lang=\"en\">Script to retrieve password</shortdesc>\n" "</parameter>\n" diff --git a/fence/agents/vixel/fence_vixel.pl b/fence/agents/vixel/fence_vixel.pl index 59b9ff0..2080909 100644 --- a/fence/agents/vixel/fence_vixel.pl +++ b/fence/agents/vixel/fence_vixel.pl @@ -76,29 +76,29 @@ fence_vixel is an I/O Fencing agent which can be used with Vixel FC switches. It After a fence operation has taken place the fenced machine can no longer connect to the Vixel FC switch. When the fenced machine is ready to be brought back into the GFS cluster (after reboot) the port on the Vixel FC switch needs to be enabled. In order to do this, log into the Vixel FC switch. Then go to: -config->zones->config <port> <comma-separated-list-of-ports-in-the-zone> +config->zones->config [port] [comma-separated-list-of-ports-in-the-zone] Then apply. Consult the Vixel manual for details. </longdesc> <vendor-url>http://www.emulex.com</vendor-url> <parameters> <parameter name="ipaddr" unique="1" required="1"> - <getopt mixed="-a <ip>" /> + <getopt mixed="-a [ip]" /> <content type="string" /> <shortdesc lang="en">IP Address or Hostname</shortdesc> </parameter> <parameter name="passwd" unique="1" required="0"> - <getopt mixed="-p <password>" /> + <getopt mixed="-p [password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> <parameter name="passwd_script" unique="1" required="0"> - <getopt mixed="-S <script>" /> + <getopt mixed="-S [script]" /> <content type="string" /> <shortdesc lang="en">Script to retrieve password</shortdesc> </parameter> <parameter name="port" unique="1" required="1"> - <getopt mixed="-n <id>" /> + <getopt mixed="-n [id]" /> <content type="string" /> <shortdesc lang="en">Physical plug number or name of virtual machine</shortdesc> </parameter> diff --git a/fence/agents/xcat/fence_xcat.pl b/fence/agents/xcat/fence_xcat.pl index 3cd16aa..c2937c9 100644 --- a/fence/agents/xcat/fence_xcat.pl +++ b/fence/agents/xcat/fence_xcat.pl @@ -82,17 +82,17 @@ NOTE: It is recommended that fence_bladecenter(8) is used instead of fence_xcat <vendor-url>http://www.xcat.org</vendor-url> <parameters> <parameter name="action" unique="1" required="1"> - <getopt mixed="-o <action>" /> + <getopt mixed="-o [action]" /> <content type="string" default="restart" /> <shortdesc lang="en">Fencing Action</shortdesc> </parameter> <parameter name="nodename" unique="1" required="1"> - <getopt mixed="-n <nodename>" /> + <getopt mixed="-n [nodename]" /> <content type="string" /> <shortdesc lang="en">The nodename as defined in nodelist.tab of the xCAT setup.</shortdesc> </parameter> <parameter name="rpower" unique="1" required="0"> - <getopt mixed="-r <rpower>" /> + <getopt mixed="-r [rpower]" /> <content type="string" /> <shortdesc lang="en">The path to the rpower binary.</shortdesc> </parameter> diff --git a/fence/agents/zvm/fence_zvm.pl b/fence/agents/zvm/fence_zvm.pl index 04a29e2..ca3d600 100644 --- a/fence/agents/zvm/fence_zvm.pl +++ b/fence/agents/zvm/fence_zvm.pl @@ -84,22 +84,22 @@ fence_zvm is an I/O Fencing agent used on a GFS virtual machine in a s390 or zSe <vendor-url>http://www.ibm.com</vendor-url> <parameters> <parameter name="ipaddr" unique="1" required="1"> - <getopt mixed="-a <ip>" /> + <getopt mixed="-a [ip]" /> <content type="string" /> <shortdesc lang="en">IP Address or Hostname</shortdesc> </parameter> <parameter name="userid" unique="1" required="1"> - <getopt mixed="-u <userid>" /> + <getopt mixed="-u [userid]" /> <content type="string" /> <shortdesc lang="en">Userid of the virtual machine to fence</shortdesc> </parameter> <parameter name="passwd" unique="1" required="0"> - <getopt mixed="-p <password>" /> + <getopt mixed="-p [password]" /> <content type="string" /> <shortdesc lang="en">Login password or passphrase</shortdesc> </parameter> <parameter name="passwd_script" unique="1" required="0"> - <getopt mixed="-S <script>" /> + <getopt mixed="-S [script]" /> <content type="string" /> <shortdesc lang="en">Script to retrieve password</shortdesc> </parameter>

1 0

fence-agents: master - fencing: Text in help is changed from foo=<value> to foo=[value]
by Marek Grác 04 Feb '13

04 Feb '13

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=141d2e6d… Commit: 141d2e6d8310e22fa5f678d46089146dfa4691b0 Parent: 9049b8e08dbf93dbaa7507dedb7d36067852c011 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Feb 4 16:30:55 2013 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Feb 4 16:30:55 2013 +0100 fencing: Text in help is changed from foo=<value> to foo=[value] --- fence/agents/lib/fencing.py.py | 58 ++++++++++++++++++++-------------------- 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 5bf98e2..98e8fd2 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -55,14 +55,14 @@ all_opt = { "debug" : { "getopt" : "D:", "longopt" : "debug-file", - "help" : "-D, --debug-file=<debugfile> Debugging to output file", + "help" : "-D, --debug-file=[debugfile] Debugging to output file", "required" : "0", "shortdesc" : "Write debug information to given file", "order" : 52 }, "delay" : { "getopt" : "f:", "longopt" : "delay", - "help" : "--delay <seconds> Wait X seconds before fencing is started", + "help" : "--delay=[seconds] Wait X seconds before fencing is started", "required" : "0", "shortdesc" : "Wait X seconds before fencing is started", "default" : "0", @@ -78,7 +78,7 @@ all_opt = { "action" : { "getopt" : "o:", "longopt" : "action", - "help" : "-o, --action=<action> Action: status, reboot (default), off or on", + "help" : "-o, --action=[action] Action: status, reboot (default), off or on", "required" : "1", "shortdesc" : "Fencing Action", "default" : "reboot", @@ -90,21 +90,21 @@ all_opt = { "ipaddr" : { "getopt" : "a:", "longopt" : "ip", - "help" : "-a, --ip=<ip> IP address or hostname of fencing device", + "help" : "-a, --ip=[ip] IP address or hostname of fencing device", "required" : "1", "shortdesc" : "IP Address or Hostname", "order" : 1 }, "ipport" : { "getopt" : "u:", "longopt" : "ipport", - "help" : "-u, --ipport=<port> TCP/UDP port to use", + "help" : "-u, --ipport=[port] TCP/UDP port to use", "required" : "0", "shortdesc" : "TCP/UDP port to use for connection with device", "order" : 1 }, "login" : { "getopt" : "l:", "longopt" : "username", - "help" : "-l, --username=<name> Login name", + "help" : "-l, --username=[name] Login name", "required" : "?", "shortdesc" : "Login Name", "order" : 1 }, @@ -123,35 +123,35 @@ all_opt = { "passwd" : { "getopt" : "p:", "longopt" : "password", - "help" : "-p, --password=<password> Login password or passphrase", + "help" : "-p, --password=[password] Login password or passphrase", "required" : "0", "shortdesc" : "Login password or passphrase", "order" : 1 }, "passwd_script" : { "getopt" : "S:", "longopt" : "password-script", - "help" : "-S, --password-script=<script> Script to run to retrieve password", + "help" : "-S, --password-script=[script] Script to run to retrieve password", "required" : "0", "shortdesc" : "Script to retrieve password", "order" : 1 }, "identity_file" : { "getopt" : "k:", "longopt" : "identity-file", - "help" : "-k, --identity-file=<filename> Identity file (private key) for ssh ", + "help" : "-k, --identity-file=[filename] Identity file (private key) for ssh ", "required" : "0", "shortdesc" : "Identity file for ssh", "order" : 1 }, "drac_version" : { "getopt" : "d:", "longopt" : "drac-version", - "help" : "-d, --drac-version=<version> Force DRAC version to use", + "help" : "-d, --drac-version=[version] Force DRAC version to use", "required" : "0", "shortdesc" : "Force DRAC version to use", "order" : 1 }, "cmd_prompt" : { "getopt" : "c:", "longopt" : "command-prompt", - "help" : "-c, --command-prompt=<prompt> Force command prompt", + "help" : "-c, --command-prompt=[prompt] Force command prompt", "shortdesc" : "Force command prompt", "required" : "0", "order" : 1 }, @@ -165,7 +165,7 @@ all_opt = { "ssh_options" : { "getopt" : "X:", "longopt" : "ssh-options", - "help" : "--ssh-options=<options> SSH options to use", + "help" : "--ssh-options=[options] SSH options to use", "shortdesc" : "SSH options to use", "required" : "0", "order" : 1 }, @@ -179,7 +179,7 @@ all_opt = { "port" : { "getopt" : "n:", "longopt" : "plug", - "help" : "-n, --plug=<id> Physical plug number on device, UUID or\n" + + "help" : "-n, --plug=[id] Physical plug number on device, UUID or\n" + " identification of machine", "required" : "1", "shortdesc" : "Physical plug number, name of virtual machine or UUID", @@ -187,56 +187,56 @@ all_opt = { "switch" : { "getopt" : "s:", "longopt" : "switch", - "help" : "-s, --switch=<id> Physical switch number on device", + "help" : "-s, --switch=[id] Physical switch number on device", "required" : "0", "shortdesc" : "Physical switch number on device", "order" : 1 }, "exec" : { "getopt" : "e:", "longopt" : "exec", - "help" : "-e, --exec=<command> Command to execute", + "help" : "-e, --exec=[command] Command to execute", "required" : "0", "shortdesc" : "Command to execute", "order" : 1 }, "vmware_type" : { "getopt" : "d:", "longopt" : "vmware_type", - "help" : "-d, --vmware_type=<type> Type of VMware to connect", + "help" : "-d, --vmware_type=[type] Type of VMware to connect", "required" : "0", "shortdesc" : "Type of VMware to connect", "order" : 1 }, "vmware_datacenter" : { "getopt" : "s:", "longopt" : "vmware-datacenter", - "help" : "-s, --vmware-datacenter=<dc> VMWare datacenter filter", + "help" : "-s, --vmware-datacenter=[dc] VMWare datacenter filter", "required" : "0", "shortdesc" : "Show only machines in specified datacenter", "order" : 2 }, "snmp_version" : { "getopt" : "d:", "longopt" : "snmp-version", - "help" : "-d, --snmp-version=<ver> Specifies SNMP version to use", + "help" : "-d, --snmp-version=[version] Specifies SNMP version to use", "required" : "0", "shortdesc" : "Specifies SNMP version to use (1,2c,3)", "order" : 1 }, "community" : { "getopt" : "c:", "longopt" : "community", - "help" : "-c, --community=<community> Set the community string", + "help" : "-c, --community=[community] Set the community string", "required" : "0", "shortdesc" : "Set the community string", "order" : 1}, "snmp_auth_prot" : { "getopt" : "b:", "longopt" : "snmp-auth-prot", - "help" : "-b, --snmp-auth-prot=<prot> Set authentication protocol (MD5|SHA)", + "help" : "-b, --snmp-auth-prot=[prot] Set authentication protocol (MD5|SHA)", "required" : "0", "shortdesc" : "Set authentication protocol (MD5|SHA)", "order" : 1}, "snmp_sec_level" : { "getopt" : "E:", "longopt" : "snmp-sec-level", - "help" : "-E, --snmp-sec-level=<level> Set security level\n"+ + "help" : "-E, --snmp-sec-level=[level] Set security level\n"+ " (noAuthNoPriv|authNoPriv|authPriv)", "required" : "0", "shortdesc" : "Set security level (noAuthNoPriv|authNoPriv|authPriv)", @@ -244,14 +244,14 @@ all_opt = { "snmp_priv_prot" : { "getopt" : "B:", "longopt" : "snmp-priv-prot", - "help" : "-B, --snmp-priv-prot=<prot> Set privacy protocol (DES|AES)", + "help" : "-B, --snmp-priv-prot=[prot] Set privacy protocol (DES|AES)", "required" : "0", "shortdesc" : "Set privacy protocol (DES|AES)", "order" : 1}, "snmp_priv_passwd" : { "getopt" : "P:", "longopt" : "snmp-priv-passwd", - "help" : "-P, --snmp-priv-passwd=<pass> Set privacy protocol password", + "help" : "-P, --snmp-priv-passwd=[pass] Set privacy protocol password", "required" : "0", "shortdesc" : "Set privacy protocol password", "order" : 1}, @@ -279,7 +279,7 @@ all_opt = { "separator" : { "getopt" : "C:", "longopt" : "separator", - "help" : "-C, --separator=<char> Separator for CSV created by 'list' operation", + "help" : "-C, --separator=[char] Separator for CSV created by 'list' operation", "default" : ",", "required" : "0", "shortdesc" : "Separator for CSV created by operation list", @@ -287,7 +287,7 @@ all_opt = { "login_timeout" : { "getopt" : "y:", "longopt" : "login-timeout", - "help" : "--login-timeout <seconds> Wait X seconds for cmd prompt after login", + "help" : "--login-timeout=[seconds] Wait X seconds for cmd prompt after login", "default" : "5", "required" : "0", "shortdesc" : "Wait X seconds for cmd prompt after login", @@ -295,7 +295,7 @@ all_opt = { "shell_timeout" : { "getopt" : "Y:", "longopt" : "shell-timeout", - "help" : "--shell-timeout <seconds> Wait X seconds for cmd prompt after issuing command", + "help" : "--shell-timeout=[seconds] Wait X seconds for cmd prompt after issuing command", "default" : "3", "required" : "0", "shortdesc" : "Wait X seconds for cmd prompt after issuing command", @@ -303,7 +303,7 @@ all_opt = { "power_timeout" : { "getopt" : "g:", "longopt" : "power-timeout", - "help" : "--power-timeout <seconds> Test X seconds for status change after ON/OFF", + "help" : "--power-timeout=[seconds] Test X seconds for status change after ON/OFF", "default" : "20", "required" : "0", "shortdesc" : "Test X seconds for status change after ON/OFF", @@ -311,7 +311,7 @@ all_opt = { "power_wait" : { "getopt" : "G:", "longopt" : "power-wait", - "help" : "--power-wait <seconds> Wait X seconds after issuing ON/OFF", + "help" : "--power-wait=[seconds] Wait X seconds after issuing ON/OFF", "default" : "0", "required" : "0", "shortdesc" : "Wait X seconds after issuing ON/OFF", @@ -326,7 +326,7 @@ all_opt = { "retry_on" : { "getopt" : "F:", "longopt" : "retry-on", - "help" : "--retry-on <attempts> Count of attempts to retry power on", + "help" : "--retry-on=[attempts] Count of attempts to retry power on", "default" : "1", "required" : "0", "shortdesc" : "Count of attempts to retry power on",

1 0

fence-agents: master - COMPATIBILITY BREAK: remove -q / quiet
by Marek Grác 04 Feb '13

04 Feb '13

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=9049b8e0… Commit: 9049b8e08dbf93dbaa7507dedb7d36067852c011 Parent: 8070db91ebf1dd4b9bd6faa03111c003d8dadd6d Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Sun Nov 25 14:18:10 2012 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Feb 4 16:06:39 2013 +0100 COMPATIBILITY BREAK: remove -q / quiet This option was never widely used because fence agents are quite quiet by default. --- fence/agents/lib/fencing.py.py | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 7ccc89e..5bf98e2 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -45,10 +45,6 @@ all_opt = { "required" : "0", "shortdesc" : "Display version information and exit", "order" : 53 }, - "quiet" : { - "getopt" : "q", - "help" : "", - "order" : 50 }, "verbose" : { "getopt" : "v", "longopt" : "verbose", @@ -360,7 +356,7 @@ all_opt = { # options which are added automatically if 'key' is encountered ("default" is always added) DEPENDENCY_OPT = { - "default" : [ "help", "debug", "verbose", "quiet", "version", "action", "agent", \ + "default" : [ "help", "debug", "verbose", "version", "action", "agent", \ "power_timeout", "shell_timeout", "login_timeout", "power_wait", "retry_on", "delay" ], "passwd" : [ "passwd_script" ], "secure" : [ "identity_file", "ssh_options" ],

1 0

fence-agents: master - COMPATIBILITY BREAK: replace udpport with ipport, make ipport dependent on ipaddress
by Marek Grác 04 Feb '13

04 Feb '13

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=8070db91… Commit: 8070db91ebf1dd4b9bd6faa03111c003d8dadd6d Parent: 1eda61c3d1419f6aa5aca6fb2ff273d1ecdbda84 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Sun Nov 25 14:18:09 2012 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Feb 4 16:06:31 2013 +0100 COMPATIBILITY BREAK: replace udpport with ipport, make ipport dependent on ipaddress --- fence/agents/alom/fence_alom.py | 2 +- fence/agents/apc/fence_apc.py | 2 +- fence/agents/apc_snmp/fence_apc_snmp.py | 2 +- fence/agents/bladecenter/fence_bladecenter.py | 2 +- fence/agents/cisco_mds/fence_cisco_mds.py | 2 +- fence/agents/cisco_ucs/fence_cisco_ucs.py | 3 +-- fence/agents/drac5/fence_drac5.py | 2 +- fence/agents/eaton_snmp/fence_eaton_snmp.py | 2 +- fence/agents/hds_cb/fence_hds_cb.py | 2 +- fence/agents/hpblade/fence_hpblade.py | 3 +-- fence/agents/ibmblade/fence_ibmblade.py | 2 +- fence/agents/ifmib/fence_ifmib.py | 2 +- fence/agents/ilo/fence_ilo.py | 2 +- fence/agents/intelmodular/fence_intelmodular.py | 2 +- fence/agents/ipdu/fence_ipdu.py | 2 +- fence/agents/ldom/fence_ldom.py | 3 +-- fence/agents/lib/fencing.py.py | 13 +++---------- fence/agents/lib/fencing_snmp.py.py | 3 +-- fence/agents/lpar/fence_lpar.py | 2 +- fence/agents/rhevm/fence_rhevm.py | 2 +- fence/agents/rsa/fence_rsa.py | 2 +- fence/agents/rsb/fence_rsb.py | 2 +- fence/agents/sanbox2/fence_sanbox2.py | 2 +- fence/agents/virsh/fence_virsh.py | 3 +-- fence/agents/vmware_soap/fence_vmware_soap.py | 2 +- fence/agents/wti/fence_wti.py | 2 +- 26 files changed, 28 insertions(+), 40 deletions(-) diff --git a/fence/agents/alom/fence_alom.py b/fence/agents/alom/fence_alom.py index d5e08e7..ef2db3c 100644 --- a/fence/agents/alom/fence_alom.py +++ b/fence/agents/alom/fence_alom.py @@ -31,7 +31,7 @@ def set_power_status(conn, options): time.sleep(int(options["--power-timeout"])) def main(): - device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure" ] + device_opt = [ "ipaddr", "login", "passwd", "cmd_prompt", "secure" ] atexit.register(atexit_handler) diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py index 46fa0af..1d82957 100644 --- a/fence/agents/apc/fence_apc.py +++ b/fence/agents/apc/fence_apc.py @@ -174,7 +174,7 @@ def set_power_status(conn, options): conn.log_expect(options, options["--command-prompt"], int(options["--shell-timeout"])) def main(): - device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", \ + device_opt = [ "ipaddr", "login", "passwd", "cmd_prompt", "secure", \ "port", "switch" ] atexit.register(atexit_handler) diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py b/fence/agents/apc_snmp/fence_apc_snmp.py index 859b882..f312ebe 100644 --- a/fence/agents/apc_snmp/fence_apc_snmp.py +++ b/fence/agents/apc_snmp/fence_apc_snmp.py @@ -158,7 +158,7 @@ def apc_snmp_define_defaults(): # Main agent method def main(): - device_opt = [ "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \ + device_opt = [ "ipaddr", "login", "passwd", "no_login", "no_password", \ "port", "snmp_version", "community" ] atexit.register(atexit_handler) diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py index 49d7395..ffd3f35 100644 --- a/fence/agents/bladecenter/fence_bladecenter.py +++ b/fence/agents/bladecenter/fence_bladecenter.py @@ -78,7 +78,7 @@ def get_blades_list(conn, options): return outlets def main(): - device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", \ + device_opt = [ "ipaddr", "login", "passwd", "cmd_prompt", "secure", \ "port", "missing_as_off" ] atexit.register(atexit_handler) diff --git a/fence/agents/cisco_mds/fence_cisco_mds.py b/fence/agents/cisco_mds/fence_cisco_mds.py index 0683539..4acce4f 100644 --- a/fence/agents/cisco_mds/fence_cisco_mds.py +++ b/fence/agents/cisco_mds/fence_cisco_mds.py @@ -77,7 +77,7 @@ def get_outlets_status(conn, options): def main(): global PORT_OID - device_opt = [ "fabric_fencing", "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \ + device_opt = [ "fabric_fencing", "ipaddr", "login", "passwd", "no_login", "no_password", \ "port", "snmp_version", "community" ] atexit.register(atexit_handler) diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py b/fence/agents/cisco_ucs/fence_cisco_ucs.py index 53d2a52..92c29eb 100644 --- a/fence/agents/cisco_ucs/fence_cisco_ucs.py +++ b/fence/agents/cisco_ucs/fence_cisco_ucs.py @@ -107,8 +107,7 @@ def define_new_opts(): "order" : 1 } def main(): - device_opt = [ "ipaddr", "ipport", "login", "passwd", "ssl", \ - "port", "web", "suborg" ] + device_opt = [ "ipaddr", "login", "passwd", "ssl", "port", "web", "suborg" ] atexit.register(atexit_handler) diff --git a/fence/agents/drac5/fence_drac5.py b/fence/agents/drac5/fence_drac5.py index efe2ece..5af0045 100644 --- a/fence/agents/drac5/fence_drac5.py +++ b/fence/agents/drac5/fence_drac5.py @@ -85,7 +85,7 @@ def define_new_opts(): "order" : 1 } def main(): - device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", \ + device_opt = [ "ipaddr", "login", "passwd", "cmd_prompt", "secure", \ "drac_version", "port", "no_port" ] atexit.register(atexit_handler) diff --git a/fence/agents/eaton_snmp/fence_eaton_snmp.py b/fence/agents/eaton_snmp/fence_eaton_snmp.py index 0d42224..462d541 100644 --- a/fence/agents/eaton_snmp/fence_eaton_snmp.py +++ b/fence/agents/eaton_snmp/fence_eaton_snmp.py @@ -197,7 +197,7 @@ def get_outlets_status(conn, options): # Main agent method def main(): - device_opt = [ "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \ + device_opt = [ "ipaddr", "login", "passwd", "no_login", "no_password", \ "port", "snmp_version", "community" ] atexit.register(atexit_handler) diff --git a/fence/agents/hds_cb/fence_hds_cb.py b/fence/agents/hds_cb/fence_hds_cb.py index c0dd70c..ed7d678 100755 --- a/fence/agents/hds_cb/fence_hds_cb.py +++ b/fence/agents/hds_cb/fence_hds_cb.py @@ -107,7 +107,7 @@ def get_blades_list(conn, options): return outlets def main(): - device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", \ + device_opt = [ "ipaddr", "login", "passwd", "cmd_prompt", "secure", \ "port", "missing_as_off" ] atexit.register(atexit_handler) diff --git a/fence/agents/hpblade/fence_hpblade.py b/fence/agents/hpblade/fence_hpblade.py index a029d05..7d08e6a 100644 --- a/fence/agents/hpblade/fence_hpblade.py +++ b/fence/agents/hpblade/fence_hpblade.py @@ -57,8 +57,7 @@ def get_blades_list(conn, options): return outlets def main(): - device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", \ - "port", "missing_as_off" ] + device_opt = [ "ipaddr", "login", "passwd", "cmd_prompt", "secure", "port", "missing_as_off" ] atexit.register(atexit_handler) diff --git a/fence/agents/ibmblade/fence_ibmblade.py b/fence/agents/ibmblade/fence_ibmblade.py index 3516617..1787ae2 100644 --- a/fence/agents/ibmblade/fence_ibmblade.py +++ b/fence/agents/ibmblade/fence_ibmblade.py @@ -50,7 +50,7 @@ def get_outlets_status(conn, _): # Main agent method def main(): - device_opt = [ "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \ + device_opt = [ "ipaddr", "login", "passwd", "no_login", "no_password", \ "port", "snmp_version", "community" ] atexit.register(atexit_handler) diff --git a/fence/agents/ifmib/fence_ifmib.py b/fence/agents/ifmib/fence_ifmib.py index 055d6d6..2184a85 100644 --- a/fence/agents/ifmib/fence_ifmib.py +++ b/fence/agents/ifmib/fence_ifmib.py @@ -95,7 +95,7 @@ def get_outlets_status(conn, options): # Main agent method def main(): - device_opt = [ "fabric_fencing", "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \ + device_opt = [ "fabric_fencing", "ipaddr", "login", "passwd", "no_login", "no_password", \ "port", "snmp_version", "community" ] atexit.register(atexit_handler) diff --git a/fence/agents/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py index 82e1c63..fc664cc 100644 --- a/fence/agents/ilo/fence_ilo.py +++ b/fence/agents/ilo/fence_ilo.py @@ -62,7 +62,7 @@ def define_new_opts(): "order" : 1 } def main(): - device_opt = [ "ipaddr", "ipport", "login", "passwd", "ssl", "ribcl" ] + device_opt = [ "ipaddr", "login", "passwd", "ssl", "ribcl" ] atexit.register(atexit_handler) diff --git a/fence/agents/intelmodular/fence_intelmodular.py b/fence/agents/intelmodular/fence_intelmodular.py index 4a0f6f4..192d2e3 100644 --- a/fence/agents/intelmodular/fence_intelmodular.py +++ b/fence/agents/intelmodular/fence_intelmodular.py @@ -61,7 +61,7 @@ def get_outlets_status(conn, options): # Main agent method def main(): - device_opt = [ "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", + device_opt = [ "ipaddr", "login", "passwd", "no_login", "no_password", "port", "snmp_version", "community" ] atexit.register(atexit_handler) diff --git a/fence/agents/ipdu/fence_ipdu.py b/fence/agents/ipdu/fence_ipdu.py index edf4775..7f08656 100644 --- a/fence/agents/ipdu/fence_ipdu.py +++ b/fence/agents/ipdu/fence_ipdu.py @@ -125,7 +125,7 @@ def get_outlets_status(conn, options): # Main agent method def main(): - device_opt = [ "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \ + device_opt = [ "ipaddr", "login", "passwd", "no_login", "no_password", \ "port", "snmp_version", "community" ] atexit.register(atexit_handler) diff --git a/fence/agents/ldom/fence_ldom.py b/fence/agents/ldom/fence_ldom.py index 08a1508..722bfda 100644 --- a/fence/agents/ldom/fence_ldom.py +++ b/fence/agents/ldom/fence_ldom.py @@ -69,8 +69,7 @@ def set_power_status(conn, options): conn.log_expect(options, COMMAND_PROMPT_REG, int(options["--power-timeout"])) def main(): - device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", \ - "port" ] + device_opt = [ "ipaddr", "login", "passwd", "cmd_prompt", "secure", "port" ] atexit.register(atexit_handler) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 538f147..7ccc89e 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -101,9 +101,9 @@ all_opt = { "ipport" : { "getopt" : "u:", "longopt" : "ipport", - "help" : "-u, --ipport=<port> TCP port to use", + "help" : "-u, --ipport=<port> TCP/UDP port to use", "required" : "0", - "shortdesc" : "TCP port to use for connection with device", + "shortdesc" : "TCP/UDP port to use for connection with device", "order" : 1 }, "login" : { "getopt" : "l:", @@ -280,13 +280,6 @@ all_opt = { "required" : "0", "shortdesc" : "Forces agent to use IPv6 addresses only", "order" : 1 }, - "udpport" : { - "getopt" : "u:", - "longopt" : "udpport", - "help" : "-u, --udpport UDP/TCP port to use", - "required" : "0", - "shortdesc" : "UDP/TCP port to use for connection with device", - "order" : 1}, "separator" : { "getopt" : "C:", "longopt" : "separator", @@ -371,7 +364,7 @@ DEPENDENCY_OPT = { "power_timeout", "shell_timeout", "login_timeout", "power_wait", "retry_on", "delay" ], "passwd" : [ "passwd_script" ], "secure" : [ "identity_file", "ssh_options" ], - "ipaddr" : [ "inet4_only", "inet6_only" ], + "ipaddr" : [ "ipport", "inet4_only", "inet6_only" ], "port" : [ "separator" ], "community" : [ "snmp_auth_prot", "snmp_sec_level", "snmp_priv_prot", \ "snmp_priv_passwd", "snmp_priv_passwd_script" ] diff --git a/fence/agents/lib/fencing_snmp.py.py b/fence/agents/lib/fencing_snmp.py.py index 89f8ece..ad549c6 100644 --- a/fence/agents/lib/fencing_snmp.py.py +++ b/fence/agents/lib/fencing_snmp.py.py @@ -14,7 +14,6 @@ BUILD_DATE = "" # Fix for RHBZ#527844 def snmp_define_defaults (): - all_opt["udpport"]["default"] = "161" all_opt["ipport"]["default"] = "161" class FencingSnmp: @@ -82,7 +81,7 @@ class FencingSnmp: force_ipvx = "udp:" cmd += " '%s%s%s'"% (force_ipvx, self.quote_for_run(self.options["--ip"]), - self.options.has_key("--udpport") and self.quote_for_run(":" + str (self.options["--udpport"])) or "") + self.options.has_key("--ipport") and self.quote_for_run(":" + str (self.options["--ipport"])) or "") return cmd def run_command(self, command, additional_timemout=0): diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py index 55b8294..bf658f0 100644 --- a/fence/agents/lpar/fence_lpar.py +++ b/fence/agents/lpar/fence_lpar.py @@ -117,7 +117,7 @@ def define_new_opts(): "order" : 1 } def main(): - device_opt = [ "ipaddr", "ipport", "login", "passwd", "secure", "cmd_prompt", \ + device_opt = [ "ipaddr", "login", "passwd", "secure", "cmd_prompt", \ "port", "managed", "hmc_version" ] atexit.register(atexit_handler) diff --git a/fence/agents/rhevm/fence_rhevm.py b/fence/agents/rhevm/fence_rhevm.py index cb61df5..f4c490f 100644 --- a/fence/agents/rhevm/fence_rhevm.py +++ b/fence/agents/rhevm/fence_rhevm.py @@ -101,7 +101,7 @@ def send_command(opt, command, method = "GET"): return result def main(): - device_opt = [ "ipaddr", "ipport", "login", "passwd", "ssl", "web", "port" ] + device_opt = [ "ipaddr", "login", "passwd", "ssl", "web", "port" ] atexit.register(atexit_handler) diff --git a/fence/agents/rsa/fence_rsa.py b/fence/agents/rsa/fence_rsa.py index 898c6c2..117dd67 100644 --- a/fence/agents/rsa/fence_rsa.py +++ b/fence/agents/rsa/fence_rsa.py @@ -34,7 +34,7 @@ def set_power_status(conn, options): conn.log_expect(options, options["--command-prompt"], int(options["--power-timeout"])) def main(): - device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure" ] + device_opt = [ "ipaddr", "login", "passwd", "cmd_prompt", "secure" ] atexit.register(atexit_handler) diff --git a/fence/agents/rsb/fence_rsb.py b/fence/agents/rsb/fence_rsb.py index 61066ee..5ce3087 100755 --- a/fence/agents/rsb/fence_rsb.py +++ b/fence/agents/rsb/fence_rsb.py @@ -37,7 +37,7 @@ def set_power_status(conn, options): conn.log_expect(options, options["--command-prompt"], int(options["--shell-timeout"])) def main(): - device_opt = [ "ipaddr", "ipport", "login", "passwd", "secure", "cmd_prompt" ] + device_opt = [ "ipaddr", "login", "passwd", "secure", "cmd_prompt" ] atexit.register(atexit_handler) diff --git a/fence/agents/sanbox2/fence_sanbox2.py b/fence/agents/sanbox2/fence_sanbox2.py index 94353fe..5221d49 100644 --- a/fence/agents/sanbox2/fence_sanbox2.py +++ b/fence/agents/sanbox2/fence_sanbox2.py @@ -100,7 +100,7 @@ def get_list_devices(conn, options): return outlets def main(): - device_opt = [ "fabric_fencing", "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "port" ] + device_opt = [ "fabric_fencing", "ipaddr", "login", "passwd", "cmd_prompt", "port" ] atexit.register(atexit_handler) diff --git a/fence/agents/virsh/fence_virsh.py b/fence/agents/virsh/fence_virsh.py index a2577f4..1a38940 100644 --- a/fence/agents/virsh/fence_virsh.py +++ b/fence/agents/virsh/fence_virsh.py @@ -59,8 +59,7 @@ def set_power_status(conn, options): time.sleep(1) def main(): - device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", \ - "port", "sudo" ] + device_opt = [ "ipaddr", "login", "passwd", "cmd_prompt", "secure", "port", "sudo" ] atexit.register(atexit_handler) diff --git a/fence/agents/vmware_soap/fence_vmware_soap.py b/fence/agents/vmware_soap/fence_vmware_soap.py index 2572464..16ce5b2 100644 --- a/fence/agents/vmware_soap/fence_vmware_soap.py +++ b/fence/agents/vmware_soap/fence_vmware_soap.py @@ -156,7 +156,7 @@ def set_power_status(conn, options): conn.service.PowerOffVM_Task(mo_machine) def main(): - device_opt = [ "ipaddr", "ipport", "login", "passwd", "ssl", "port", "uuid" ] + device_opt = [ "ipaddr", "login", "passwd", "ssl", "port", "uuid" ] atexit.register(atexit_handler) diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py index b3d022f..b315061 100644 --- a/fence/agents/wti/fence_wti.py +++ b/fence/agents/wti/fence_wti.py @@ -82,7 +82,7 @@ def set_power_status(conn, options): conn.log_expect(options, options["--command-prompt"], int(options["--power-timeout"])) def main(): - device_opt = [ "ipaddr", "ipport", "login", "passwd", "no_login", "no_password", \ + device_opt = [ "ipaddr", "login", "passwd", "no_login", "no_password", \ "cmd_prompt", "secure", "port" ] atexit.register(atexit_handler)

1 0

fence-agents: master - COMPATIBILITY BREAK: Remove obsolete options from STDIN
by Marek Grác 04 Feb '13

04 Feb '13

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=1eda61c3… Commit: 1eda61c3d1419f6aa5aca6fb2ff273d1ecdbda84 Parent: dbc406ad1c5a2f981c04cd6b6d7ebc02aab1eaf5 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Sun Nov 25 14:18:08 2012 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Feb 4 16:06:24 2013 +0100 COMPATIBILITY BREAK: Remove obsolete options from STDIN For historical reasons and backward compatibility we supported these options blade -> port option -> action fm -> port hostname -> ipaddr These options were not in documentation and are completely removed now. --- fence/agents/lib/fencing.py.py | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index e639931..538f147 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -587,19 +587,6 @@ def process_input(avail_opt): (name, value) = (line + "=").split("=", 1) value = value[:-1] - ## Compatibility Layer - ###### - if name == "blade": - name = "port" - elif name == "option": - name = "action" - elif name == "fm": - name = "port" - elif name == "hostname": - name = "ipaddr" - - ## - ###### if avail_opt.count(name) == 0: sys.stderr.write("Parse error: Ignoring unknown option '"+line+"'\n") continue

1 0

fence-agents: master - COMPATIBILITY BREAK: fence_rsb replace -n / telnet_port with standard --ipport / ipport
by Marek Grác 04 Feb '13

04 Feb '13

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=dbc406ad… Commit: dbc406ad1c5a2f981c04cd6b6d7ebc02aab1eaf5 Parent: ae6ad01adfba06b7d573e674ba71363fac48abe2 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Sun Nov 25 14:18:07 2012 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Feb 4 16:06:15 2013 +0100 COMPATIBILITY BREAK: fence_rsb replace -n / telnet_port with standard --ipport / ipport telnet_port has same functionality as ipport and -n is usually used for port number/UUID --- fence/agents/rsb/fence_rsb.py | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff --git a/fence/agents/rsb/fence_rsb.py b/fence/agents/rsb/fence_rsb.py index a701156..61066ee 100755 --- a/fence/agents/rsb/fence_rsb.py +++ b/fence/agents/rsb/fence_rsb.py @@ -37,27 +37,18 @@ def set_power_status(conn, options): conn.log_expect(options, options["--command-prompt"], int(options["--shell-timeout"])) def main(): - device_opt = [ "ipaddr", "ipport", "telnet_port", "login", "passwd", "secure", "cmd_prompt" ] + device_opt = [ "ipaddr", "ipport", "login", "passwd", "secure", "cmd_prompt" ] atexit.register(atexit_handler) - all_opt["telnet_port"] = { - "getopt" : "n:", - "longopt" : "telnet_port", - "help" : "-n TCP port to use (deprecated, use -u)", - "required" : "0", - "shortdesc" : "TCP port to use for connection with device (default is 3172 for telnet)", - "order" : 1 - } + all_opt["cmd_prompt"]["default"] = "to quit:" opt = process_input(device_opt) - # option -n for backward compatibility (-n is normally port no) - if 1 == opt.has_key("--telnet_port"): - opt["--port"] = opt["--telnet_port"] # set default port for telnet only if 0 == opt.has_key("--ssh") and 0 == opt.has_key("--ipport"): opt["--ipport"] = "3172" + options = check_input(device_opt, opt) docs = { }

1 0

fence-agents: master - COMPATIBILITY BREAK: fence_lpar replace --n / --partition / partition with standard -n / --plug / port
by Marek Grác 04 Feb '13

04 Feb '13

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=ae6ad01a… Commit: ae6ad01adfba06b7d573e674ba71363fac48abe2 Parent: 96f9239fd502d6146e89997b720952f489dbc147 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Sun Nov 25 14:18:06 2012 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Feb 4 16:05:54 2013 +0100 COMPATIBILITY BREAK: fence_lpar replace --n / --partition / partition with standard -n / --plug / port --- fence/agents/lib/fencing.py.py | 3 +-- fence/agents/lpar/fence_lpar.py | 26 ++++++++------------------ 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 920fe50..e639931 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -769,8 +769,7 @@ def fence_action(tn, options, set_power_fn, get_power_fn, get_outlet_list = None try: ## Process options that manipulate fencing device ##### - if (options["--action"] == "list") and \ - 0 == options["device_opt"].count("port") and 0 == options["device_opt"].count("partition"): + if (options["--action"] == "list") and 0 == options["device_opt"].count("port"): print "N/A" return elif (options["--action"] == "list" and get_outlet_list == None): diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py index e8e50c6..55b8294 100644 --- a/fence/agents/lpar/fence_lpar.py +++ b/fence/agents/lpar/fence_lpar.py @@ -22,15 +22,15 @@ BUILD_DATE="" def get_power_status(conn, options): if options["--hmc-version"] == "3": - conn.send("lssyscfg -r lpar -m " + options["--managed"] + " -n " + options["--partition"] + " -F name,state\n") + conn.send("lssyscfg -r lpar -m " + options["--managed"] + " -n " + options["--plug"] + " -F name,state\n") conn.log_expect(options, options["--command-prompt"], int(options["--power-timeout"])) try: - status = re.compile("^" + options["--partition"] + ",(.*?),.*$", re.IGNORECASE | re.MULTILINE).search(conn.before).group(1) + 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["--partition"] + "'\n") + conn.send("lssyscfg -r lpar -m "+ options["--managed"] +" --filter 'lpar_names=" + options["--plug"] + "'\n") conn.log_expect(options, options["--command-prompt"], int(options["--power-timeout"])) try: @@ -50,18 +50,18 @@ def get_power_status(conn, options): def set_power_status(conn, options): if options["--hmc-version"] == "3": conn.send("chsysstate -o " + options["--action"] + " -r lpar -m " + options["--managed"] - + " -n " + options["--partition"] + "\n") + + " -n " + options["--plug"] + "\n") conn.log_expect(options, 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["--partition"] + + " -n " + options["--plug"] + " -f `lssyscfg -r lpar -F curr_profile " + " -m " + options["--managed"] + - " --filter \"lpar_names="+ options["--partition"] +"\"`\n" ) + " --filter \"lpar_names="+ options["--plug"] +"\"`\n" ) else: conn.send("chsysstate -o shutdown -r lpar --immed" + - " -m " + options["--managed"] + " -n " + options["--partition"] + "\n") + " -m " + options["--managed"] + " -n " + options["--plug"] + "\n") conn.log_expect(options, options["--command-prompt"], int(options["--power-timeout"])) def get_lpar_list(conn, options): @@ -115,17 +115,10 @@ def define_new_opts(): "shortdesc" : "Force HMC version to use (3 or 4)", "default" : "4", "order" : 1 } - all_opt["partition"] = { - "getopt" : "n:", - "longopt" : "partition", - "help" : "-n <id> Name of the partition", - "required" : "0", - "shortdesc" : "Partition name", - "order" : 1 } def main(): device_opt = [ "ipaddr", "ipport", "login", "passwd", "secure", "cmd_prompt", \ - "partition", "managed", "hmc_version" ] + "port", "managed", "hmc_version" ] atexit.register(atexit_handler) @@ -145,9 +138,6 @@ def main(): if 0 == options.has_key("--managed"): fail_usage("Failed: You have to enter name of managed system") - if (0 == ["list", "monitor"].count(options["--action"].lower())) and (0 == options.has_key("--partition")): - fail_usage("Failed: You have to enter name of the partition") - if 1 == options.has_key("--hmc-version") and (options["--hmc-version"] != "3" and options["--hmc-version"] != "4"): fail_usage("Failed: You have to enter valid version number: 3 or 4")

1 0

fence-agents: master - COMPATIBILITY BREAK: fence_drac5 replace --m / --modulename / modulename / module_name with standard -n / --plug / port
by Marek Grác 04 Feb '13

04 Feb '13

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=96f9239f… Commit: 96f9239fd502d6146e89997b720952f489dbc147 Parent: f98c726103dc78c0f6c85897f3c06683aa9864d6 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Feb 4 16:05:16 2013 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Feb 4 16:05:16 2013 +0100 COMPATIBILITY BREAK: fence_drac5 replace --m / --modulename / modulename / module_name with standard -n / --plug / port This change apply to you only if you use fence agent against DRAC CMC, other DRACs are bound to one machine, so they do not use this option at all. Device option no_port (no port is needed) was added, previously modulename was optional and this is not true with 'port' option by default. --- fence/agents/drac5/fence_drac5.py | 6 +++--- fence/agents/lib/fencing.py.py | 32 +++++++++----------------------- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/fence/agents/drac5/fence_drac5.py b/fence/agents/drac5/fence_drac5.py index 3ec354e..efe2ece 100644 --- a/fence/agents/drac5/fence_drac5.py +++ b/fence/agents/drac5/fence_drac5.py @@ -24,7 +24,7 @@ BUILD_DATE="March, 2008" def get_power_status(conn, options): if options["model"] == "DRAC CMC": - conn.send_eol("racadm serveraction powerstatus -m " + options["--module-name"]) + conn.send_eol("racadm serveraction powerstatus -m " + options["--plug"]) elif options["model"] == "DRAC 5": conn.send_eol("racadm serveraction powerstatus") @@ -43,7 +43,7 @@ def set_power_status(conn, options): }[options["--action"]] if options["model"] == "DRAC CMC": - conn.send_eol("racadm serveraction " + action + " -m " + options["--module-name"]) + conn.send_eol("racadm serveraction " + action + " -m " + options["--plug"]) elif options["model"] == "DRAC 5": conn.send_eol("racadm serveraction " + action) @@ -86,7 +86,7 @@ def define_new_opts(): def main(): device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", \ - "drac_version", "module_name" ] + "drac_version", "port", "no_port" ] atexit.register(atexit_handler) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index eb5bcd7..920fe50 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -120,6 +120,10 @@ all_opt = { "getopt" : "", "help" : "", "order" : 1 }, + "no_port" : { + "getopt" : "", + "help" : "", + "order" : 1 }, "passwd" : { "getopt" : "p:", "longopt" : "password", @@ -141,13 +145,6 @@ all_opt = { "required" : "0", "shortdesc" : "Identity file for ssh", "order" : 1 }, - "module_name" : { - "getopt" : "m:", - "longopt" : "module-name", - "help" : "-m, --module-name=<module> DRAC/MC module name", - "required" : "0", - "shortdesc" : "DRAC/MC module name", - "order" : 1 }, "drac_version" : { "getopt" : "d:", "longopt" : "drac-version", @@ -186,8 +183,8 @@ all_opt = { "port" : { "getopt" : "n:", "longopt" : "plug", - "help" : "-n, --plug=<id> Physical plug number on device, \n" + - " name of virtual machine or UUID", + "help" : "-n, --plug=<id> Physical plug number on device, UUID or\n" + + " identification of machine", "required" : "1", "shortdesc" : "Physical plug number, name of virtual machine or UUID", "order" : 1 }, @@ -376,7 +373,6 @@ DEPENDENCY_OPT = { "secure" : [ "identity_file", "ssh_options" ], "ipaddr" : [ "inet4_only", "inet6_only" ], "port" : [ "separator" ], - "module_name" : [ "separator" ], "community" : [ "snmp_auth_prot", "snmp_sec_level", "snmp_priv_prot", \ "snmp_priv_passwd", "snmp_priv_passwd_script" ] } @@ -546,11 +542,6 @@ def process_input(avail_opt): else: longopt_list.append(all_opt[k]["longopt"]) - ## Compatibility layer - if avail_opt.count("module_name") == 1: - getopt_string += "n:" - longopt_list.append("plug=") - ## ## Read options from command line or standard input ##### @@ -606,10 +597,6 @@ def process_input(avail_opt): name = "port" elif name == "hostname": name = "ipaddr" - elif name == "modulename": - name = "module_name" - elif name == "port" and 1 == avail_opt.count("drac_version"): - name = "module_name" ## ###### @@ -715,8 +702,8 @@ def check_input(device_opt, opt): fail_usage("Failed: Identity file " + options["--identity-file"] + " does not exist") if (0 == ["list", "monitor"].count(options["--action"].lower())) and \ - 0 == options.has_key("--plug") and device_opt.count("port"): - fail_usage("Failed: You have to enter plug number") + 0 == options.has_key("--plug") and device_opt.count("port") and device_opt.count("no_port") == 0: + fail_usage("Failed: You have to enter plug number or machine identification") if options.has_key("--password-script"): options["--password"] = os.popen(options["--password-script"]).read().rstrip() @@ -783,8 +770,7 @@ def fence_action(tn, options, set_power_fn, get_power_fn, get_outlet_list = None ## Process options that manipulate fencing device ##### if (options["--action"] == "list") and \ - 0 == options["device_opt"].count("port") and 0 == options["device_opt"].count("partition") and \ - 0 == options["device_opt"].count("module_name"): + 0 == options["device_opt"].count("port") and 0 == options["device_opt"].count("partition"): print "N/A" return elif (options["--action"] == "list" and get_outlet_list == None):

1 0

fence-agents: master - COMPATIBILITY BREAK: remove option -T / --test / test
by Marek Grác 04 Feb '13

04 Feb '13

Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=f98c7261… Commit: f98c726103dc78c0f6c85897f3c06683aa9864d6 Parent: f450d953656d61f609d8874f515e9d4c48308d4b Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Sun Nov 25 14:18:04 2012 +0100 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Mon Feb 4 15:45:03 2013 +0100 COMPATIBILITY BREAK: remove option -T / --test / test Option -T was not used in all fence agents and its functionality differs. If you want to know if your fence device is working correctly use '-o monitor / --action monitor / STDIN: action=monitor'. --- fence/agents/alom/fence_alom.py | 2 +- fence/agents/apc/fence_apc.py | 2 +- fence/agents/apc_snmp/fence_apc_snmp.py | 2 +- fence/agents/cisco_mds/fence_cisco_mds.py | 2 +- fence/agents/eaton_snmp/fence_eaton_snmp.py | 2 +- fence/agents/eps/fence_eps.py | 2 +- fence/agents/ibmblade/fence_ibmblade.py | 2 +- fence/agents/ifmib/fence_ifmib.py | 2 +- fence/agents/intelmodular/fence_intelmodular.py | 2 +- fence/agents/ipdu/fence_ipdu.py | 2 +- fence/agents/ldom/fence_ldom.py | 2 +- fence/agents/lib/fencing.py.py | 7 ------- fence/agents/virsh/fence_virsh.py | 2 +- fence/agents/vmware/fence_vmware.py | 2 +- fence/agents/wti/fence_wti.py | 2 +- fence/agents/xenapi/fence_xenapi.py | 2 +- 16 files changed, 15 insertions(+), 22 deletions(-) diff --git a/fence/agents/alom/fence_alom.py b/fence/agents/alom/fence_alom.py index a256da4..d5e08e7 100644 --- a/fence/agents/alom/fence_alom.py +++ b/fence/agents/alom/fence_alom.py @@ -31,7 +31,7 @@ def set_power_status(conn, options): time.sleep(int(options["--power-timeout"])) def main(): - device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", "test" ] + device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure" ] atexit.register(atexit_handler) diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py index ed80c64..46fa0af 100644 --- a/fence/agents/apc/fence_apc.py +++ b/fence/agents/apc/fence_apc.py @@ -175,7 +175,7 @@ def set_power_status(conn, options): def main(): device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", \ - "port", "switch", "test" ] + "port", "switch" ] atexit.register(atexit_handler) diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py b/fence/agents/apc_snmp/fence_apc_snmp.py index 2ca7c1c..859b882 100644 --- a/fence/agents/apc_snmp/fence_apc_snmp.py +++ b/fence/agents/apc_snmp/fence_apc_snmp.py @@ -159,7 +159,7 @@ def apc_snmp_define_defaults(): # Main agent method def main(): device_opt = [ "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \ - "test", "port", "snmp_version", "community" ] + "port", "snmp_version", "community" ] atexit.register(atexit_handler) diff --git a/fence/agents/cisco_mds/fence_cisco_mds.py b/fence/agents/cisco_mds/fence_cisco_mds.py index 650f450..0683539 100644 --- a/fence/agents/cisco_mds/fence_cisco_mds.py +++ b/fence/agents/cisco_mds/fence_cisco_mds.py @@ -78,7 +78,7 @@ def main(): global PORT_OID device_opt = [ "fabric_fencing", "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \ - "test", "port", "snmp_version", "community" ] + "port", "snmp_version", "community" ] atexit.register(atexit_handler) diff --git a/fence/agents/eaton_snmp/fence_eaton_snmp.py b/fence/agents/eaton_snmp/fence_eaton_snmp.py index bf6aa9e..0d42224 100644 --- a/fence/agents/eaton_snmp/fence_eaton_snmp.py +++ b/fence/agents/eaton_snmp/fence_eaton_snmp.py @@ -198,7 +198,7 @@ def get_outlets_status(conn, options): # Main agent method def main(): device_opt = [ "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \ - "test", "port", "snmp_version", "community" ] + "port", "snmp_version", "community" ] atexit.register(atexit_handler) diff --git a/fence/agents/eps/fence_eps.py b/fence/agents/eps/fence_eps.py index 94f862a..245c1a2 100644 --- a/fence/agents/eps/fence_eps.py +++ b/fence/agents/eps/fence_eps.py @@ -99,7 +99,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", "test" ] + "port", "hidden_page" ] atexit.register(atexit_handler) diff --git a/fence/agents/ibmblade/fence_ibmblade.py b/fence/agents/ibmblade/fence_ibmblade.py index 720c691..3516617 100644 --- a/fence/agents/ibmblade/fence_ibmblade.py +++ b/fence/agents/ibmblade/fence_ibmblade.py @@ -51,7 +51,7 @@ def get_outlets_status(conn, _): # Main agent method def main(): device_opt = [ "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \ - "test", "port", "snmp_version", "community" ] + "port", "snmp_version", "community" ] atexit.register(atexit_handler) diff --git a/fence/agents/ifmib/fence_ifmib.py b/fence/agents/ifmib/fence_ifmib.py index ac3ccd3..055d6d6 100644 --- a/fence/agents/ifmib/fence_ifmib.py +++ b/fence/agents/ifmib/fence_ifmib.py @@ -96,7 +96,7 @@ def get_outlets_status(conn, options): # Main agent method def main(): device_opt = [ "fabric_fencing", "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \ - "test", "port", "snmp_version", "community" ] + "port", "snmp_version", "community" ] atexit.register(atexit_handler) diff --git a/fence/agents/intelmodular/fence_intelmodular.py b/fence/agents/intelmodular/fence_intelmodular.py index 99bf6c2..4a0f6f4 100644 --- a/fence/agents/intelmodular/fence_intelmodular.py +++ b/fence/agents/intelmodular/fence_intelmodular.py @@ -62,7 +62,7 @@ def get_outlets_status(conn, options): # Main agent method def main(): device_opt = [ "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", - "test", "port", "snmp_version", "community" ] + "port", "snmp_version", "community" ] atexit.register(atexit_handler) diff --git a/fence/agents/ipdu/fence_ipdu.py b/fence/agents/ipdu/fence_ipdu.py index 8b722e9..edf4775 100644 --- a/fence/agents/ipdu/fence_ipdu.py +++ b/fence/agents/ipdu/fence_ipdu.py @@ -126,7 +126,7 @@ def get_outlets_status(conn, options): # Main agent method def main(): device_opt = [ "ipaddr", "udpport", "login", "passwd", "no_login", "no_password", \ - "test", "port", "snmp_version", "community" ] + "port", "snmp_version", "community" ] atexit.register(atexit_handler) diff --git a/fence/agents/ldom/fence_ldom.py b/fence/agents/ldom/fence_ldom.py index eabdaf4..08a1508 100644 --- a/fence/agents/ldom/fence_ldom.py +++ b/fence/agents/ldom/fence_ldom.py @@ -70,7 +70,7 @@ def set_power_status(conn, options): def main(): device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", \ - "port", "test" ] + "port" ] atexit.register(atexit_handler) diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 12e7be3..eb5bcd7 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -198,11 +198,6 @@ all_opt = { "required" : "0", "shortdesc" : "Physical switch number on device", "order" : 1 }, - "test" : { - "getopt" : "T", - "help" : "", - "order" : 1, - "obsolete" : "use -o status instead" }, "exec" : { "getopt" : "e:", "longopt" : "exec", @@ -584,8 +579,6 @@ def process_input(avail_opt): ## Compatibility Layer ##### z = dict(opt) - if z.has_key("-T") == 1: - z["--action"] = "status" if z.has_key("--plug") == 1: z["-m"] = z["--plug"] diff --git a/fence/agents/virsh/fence_virsh.py b/fence/agents/virsh/fence_virsh.py index d012710..a2577f4 100644 --- a/fence/agents/virsh/fence_virsh.py +++ b/fence/agents/virsh/fence_virsh.py @@ -60,7 +60,7 @@ def set_power_status(conn, options): def main(): device_opt = [ "ipaddr", "ipport", "login", "passwd", "cmd_prompt", "secure", \ - "test", "port", "sudo" ] + "port", "sudo" ] atexit.register(atexit_handler) diff --git a/fence/agents/vmware/fence_vmware.py b/fence/agents/vmware/fence_vmware.py index b92b409..87d0958 100644 --- a/fence/agents/vmware/fence_vmware.py +++ b/fence/agents/vmware/fence_vmware.py @@ -281,7 +281,7 @@ def vmware_check_vmware_type(options): # Main agent method def main(): device_opt = [ "ipaddr", "login", "passwd", "secure", - "test", "exec", "vmware_type", "vmware_datacenter"] + "exec", "vmware_type", "vmware_datacenter"] atexit.register(atexit_handler) diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py index b12648d..b3d022f 100644 --- a/fence/agents/wti/fence_wti.py +++ b/fence/agents/wti/fence_wti.py @@ -83,7 +83,7 @@ def set_power_status(conn, options): def main(): device_opt = [ "ipaddr", "ipport", "login", "passwd", "no_login", "no_password", \ - "cmd_prompt", "secure", "port", "test" ] + "cmd_prompt", "secure", "port" ] atexit.register(atexit_handler) diff --git a/fence/agents/xenapi/fence_xenapi.py b/fence/agents/xenapi/fence_xenapi.py index adec13e..25e6056 100644 --- a/fence/agents/xenapi/fence_xenapi.py +++ b/fence/agents/xenapi/fence_xenapi.py @@ -201,7 +201,7 @@ def return_vm_reference(session, options): def main(): device_opt = [ "login", "passwd", "port", "no_login", "no_password", "session_url", - "test", "uuid" ] + "uuid" ] atexit.register(atexit_handler)

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

cluster-commits February 2013