From 3c377e48d96fbe80a5be5e9fd1a15c4b3a7d25e4 Mon Sep 17 00:00:00 2001

From: Reid wahl <nrwahl@protonmail.com>

Date: Mon, 6 Jul 2020 03:58:42 -0700

Subject: [PATCH 1/2] fencing: Add verbose_level option

Currently, `verbose` is a boolean, all-or-nothing option. It would be

useful to be able to set more granular verbosity levels when debugging

an issue.

This patch adds a `verbose_level` option to allow setting higher

verbosities. This option can be set explicitly (e.g.,

`--verbose-level=3`). Alternatively, multiple `verbose` flags (e.g.,

`-vvv`) can be passed on the command line; `verbose_level` is set to

the number of `-v` flags.

If both an explicit `verbose_level` and one or more `-v` options are

set, the `verbose_level` takes precedence and overrides any `-v` flags.

If `verbose_level > 0` and there are no `-v` flags, the `verbose`

option is enabled implicitly.

Later patches will enable individual fence agents to use the new

verbosity levels.

Related to: RHBZ#1853973

---

 lib/fencing.py.py                             | 58 ++++++++++++++++---

 tests/data/metadata/fence_aliyun.xml          |  7 ++-

 tests/data/metadata/fence_alom.xml            |  7 ++-

 tests/data/metadata/fence_amt.xml             |  7 ++-

 tests/data/metadata/fence_amt_ws.xml          |  7 ++-

 tests/data/metadata/fence_apc.xml             |  7 ++-

 tests/data/metadata/fence_apc_snmp.xml        |  7 ++-

 tests/data/metadata/fence_aws.xml             |  7 ++-

 tests/data/metadata/fence_azure_arm.xml       |  7 ++-

 tests/data/metadata/fence_bladecenter.xml     |  7 ++-

 tests/data/metadata/fence_brocade.xml         |  7 ++-

 tests/data/metadata/fence_cisco_mds.xml       |  7 ++-

 tests/data/metadata/fence_cisco_ucs.xml       |  7 ++-

 tests/data/metadata/fence_compute.xml         |  7 ++-

 tests/data/metadata/fence_docker.xml          |  7 ++-

 tests/data/metadata/fence_drac.xml            |  7 ++-

 tests/data/metadata/fence_drac5.xml           |  7 ++-

 tests/data/metadata/fence_dummy.xml           |  7 ++-

 tests/data/metadata/fence_eaton_snmp.xml      |  7 ++-

 tests/data/metadata/fence_emerson.xml         |  7 ++-

 tests/data/metadata/fence_eps.xml             |  7 ++-

 tests/data/metadata/fence_evacuate.xml        |  7 ++-

 tests/data/metadata/fence_gce.xml             |  7 ++-

 tests/data/metadata/fence_hds_cb.xml          |  7 ++-

 tests/data/metadata/fence_heuristics_ping.xml |  7 ++-

 tests/data/metadata/fence_hpblade.xml         |  7 ++-

 tests/data/metadata/fence_ibmblade.xml        |  7 ++-

 tests/data/metadata/fence_idrac.xml           |  7 ++-

 tests/data/metadata/fence_ifmib.xml           |  7 ++-

 tests/data/metadata/fence_ilo.xml             |  7 ++-

 tests/data/metadata/fence_ilo2.xml            |  7 ++-

 tests/data/metadata/fence_ilo3.xml            |  7 ++-

 tests/data/metadata/fence_ilo3_ssh.xml        |  7 ++-

 tests/data/metadata/fence_ilo4.xml            |  7 ++-

 tests/data/metadata/fence_ilo4_ssh.xml        |  7 ++-

 tests/data/metadata/fence_ilo_moonshot.xml    |  7 ++-

 tests/data/metadata/fence_ilo_mp.xml          |  7 ++-

 tests/data/metadata/fence_ilo_ssh.xml         |  7 ++-

 tests/data/metadata/fence_imm.xml             |  7 ++-

 tests/data/metadata/fence_intelmodular.xml    |  7 ++-

 tests/data/metadata/fence_ipdu.xml            |  7 ++-

 tests/data/metadata/fence_ipmilan.xml         |  7 ++-

 tests/data/metadata/fence_ironic.xml          |  7 ++-

 tests/data/metadata/fence_ldom.xml            |  7 ++-

 tests/data/metadata/fence_lpar.xml            |  7 ++-

 tests/data/metadata/fence_mpath.xml           |  7 ++-

 tests/data/metadata/fence_netio.xml           |  7 ++-

 tests/data/metadata/fence_openstack.xml       |  7 ++-

 tests/data/metadata/fence_ovh.xml             |  7 ++-

 tests/data/metadata/fence_powerman.xml        |  7 ++-

 tests/data/metadata/fence_pve.xml             |  7 ++-

 tests/data/metadata/fence_raritan.xml         |  7 ++-

 tests/data/metadata/fence_rcd_serial.xml      |  7 ++-

 tests/data/metadata/fence_redfish.xml         |  7 ++-

 tests/data/metadata/fence_rhevm.xml           |  7 ++-

 tests/data/metadata/fence_rsa.xml             |  7 ++-

 tests/data/metadata/fence_rsb.xml             |  7 ++-

 tests/data/metadata/fence_sanbox2.xml         |  7 ++-

 tests/data/metadata/fence_sbd.xml             |  7 ++-

 tests/data/metadata/fence_scsi.xml            |  7 ++-

 tests/data/metadata/fence_tripplite_snmp.xml  |  7 ++-

 tests/data/metadata/fence_vbox.xml            |  7 ++-

 tests/data/metadata/fence_virsh.xml           |  7 ++-

 tests/data/metadata/fence_vmware.xml          |  7 ++-

 tests/data/metadata/fence_vmware_rest.xml     |  7 ++-

 tests/data/metadata/fence_vmware_soap.xml     |  7 ++-

 tests/data/metadata/fence_vmware_vcloud.xml   |  7 ++-

 tests/data/metadata/fence_wti.xml             |  7 ++-

 tests/data/metadata/fence_xenapi.xml          |  7 ++-

 tests/data/metadata/fence_zvmip.xml           |  7 ++-

 73 files changed, 482 insertions(+), 80 deletions(-)

diff --git a/lib/fencing.py.py b/lib/fencing.py.py

index 4b54aa7c..63b13036 100644

--- a/lib/fencing.py.py

+++ b/lib/fencing.py.py

@@ -38,27 +38,40 @@

 		"help" : "-h, --help                     Display this help and exit",

 		"required" : "0",

 		"shortdesc" : "Display help and exit",

-		"order" : 54},

+		"order" : 55},

 	"version" : {

 		"getopt" : "V",

 		"longopt" : "version",

 		"help" : "-V, --version                  Display version information and exit",

 		"required" : "0",

 		"shortdesc" : "Display version information and exit",

-		"order" : 53},

+		"order" : 54},

 	"verbose" : {

 		"getopt" : "v",

 		"longopt" : "verbose",

-		"help" : "-v, --verbose                  Verbose mode",

+		"help" : "-v, --verbose                  Verbose mode. "

+			"Multiple -v flags can be stacked on the command line "

+			"(e.g., -vvv) to increase verbosity.",

 		"required" : "0",

 		"order" : 51},

+	"verbose_level" : {

+		"getopt" : ":",

+		"longopt" : "verbose-level",

+		"type" : "integer",

+		"help" : "--verbose-level                "

+			"Level of debugging detail in output. Defaults to the "

+			"number of --verbose flags specified on the command "

+			"line, or to 1 if verbose=1 in a stonith device "

+			"configuration (i.e., on stdin).",

+                "required" : "0",

+		"order" : 52},

 	"debug" : {

 		"getopt" : "D:",

 		"longopt" : "debug-file",

 		"help" : "-D, --debug-file=[debugfile]   Debugging to output file",

 		"required" : "0",

 		"shortdesc" : "Write debug information to given file",

-		"order" : 52},

+		"order" : 53},

 	"delay" : {

 		"getopt" : ":",

 		"longopt" : "delay",

@@ -454,9 +467,10 @@

 # options which are added automatically if 'key' is encountered ("default" is always added)

 DEPENDENCY_OPT = {

-		"default" : ["help", "debug", "verbose", "version", "action", "agent", \

-			"power_timeout", "shell_timeout", "login_timeout", "power_wait", "retry_on", \

-			"delay", "quiet"],

+		"default" : ["help", "debug", "verbose", "verbose_level",

+			 "version", "action", "agent", "power_timeout",

+			 "shell_timeout", "login_timeout", "power_wait",

+			 "retry_on", "delay", "quiet"],

 		"passwd" : ["passwd_script"],

 		"sudo" : ["sudo_path"],

 		"secure" : ["identity_file", "ssh_options", "ssh_path", "inet4_only", "inet6_only"],

@@ -683,6 +697,26 @@ def check_input(device_opt, opt, other_conditions = False):

 	if options["--action"] in ["metadata", "manpage"] or any(k in options for k in ("--help", "--version")):

 		return options

+	try:

+		options["--verbose-level"] = int(options["--verbose-level"])

+	except ValueError:

+		options["--verbose-level"] = -1

+

+	if options["--verbose-level"] < 0:

+		logging.warning("Parse error: Option 'verbose_level' must "

+				"be an integer greater than or equal to 0. "

+				"Setting verbose_level to 0.")

+		options["--verbose-level"] = 0

+

+	if options["--verbose-level"] == 0 and "--verbose" in options:

+		logging.warning("Parse error: Ignoring option 'verbose' "

+				"because it conflicts with verbose_level=0")

+		del options["--verbose"]

+

+	if options["--verbose-level"] > 0:

+		# Ensure verbose key exists

+		options["--verbose"] = 1

+	

 	if "--verbose" in options:

 		logging.getLogger().setLevel(logging.DEBUG)

@@ -1409,6 +1443,9 @@ def _parse_input_stdin(avail_opt):

 			opt["--"+all_opt[name]["longopt"]] = "1"

 		else:

 			logging.warning("Parse error: Ignoring option '%s' because it does not have value\n", name)

+

+	opt.setdefault("--verbose-level", opt.get("--verbose", 0))

+

 	return opt

 def _parse_input_cmdline(avail_opt):

@@ -1428,10 +1465,15 @@ def _parse_input_cmdline(avail_opt):

 	# Short and long getopt names are changed to consistent "--" + long name (e.g. --username)

 	long_opts = {}

-	for arg_name in list(dict(entered_opt).keys()):

+	verbose_count = 0

+	for arg_name in [k for (k, v) in entered_opt]:

 		all_key = [key for (key, value) in list(filtered_opts.items()) \

 			if "--" + value.get("longopt", "") == arg_name or "-" + value.get("getopt", "").rstrip(":") == arg_name][0]

 		long_opts["--" + filtered_opts[all_key]["longopt"]] = dict(entered_opt)[arg_name]

+		if all_key == "verbose":

+			verbose_count += 1

+

+	long_opts.setdefault("--verbose-level", verbose_count)

 	# This test is specific because it does not apply to input on stdin

 	if "port_as_ip" in avail_opt and not "--port-as-ip" in long_opts and "--plug" in long_opts:

diff --git a/tests/data/metadata/fence_aliyun.xml b/tests/data/metadata/fence_aliyun.xml

index 2de3a8aa..8f236806 100644

--- a/tests/data/metadata/fence_aliyun.xml

+++ b/tests/data/metadata/fence_aliyun.xml

@@ -46,7 +46,12 @@

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_alom.xml b/tests/data/metadata/fence_alom.xml

index d6bb3d5b..ef6c06c3 100644

--- a/tests/data/metadata/fence_alom.xml

+++ b/tests/data/metadata/fence_alom.xml

@@ -111,7 +111,12 @@

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_amt.xml b/tests/data/metadata/fence_amt.xml

index 5f0adc98..ee174852 100644

--- a/tests/data/metadata/fence_amt.xml

+++ b/tests/data/metadata/fence_amt.xml

@@ -80,7 +80,12 @@

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_amt_ws.xml b/tests/data/metadata/fence_amt_ws.xml

index 86f36f6c..9c223c8d 100644

--- a/tests/data/metadata/fence_amt_ws.xml

+++ b/tests/data/metadata/fence_amt_ws.xml

@@ -80,7 +80,12 @@

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_apc.xml b/tests/data/metadata/fence_apc.xml

index 7330d8bc..efad9db8 100644

--- a/tests/data/metadata/fence_apc.xml

+++ b/tests/data/metadata/fence_apc.xml

@@ -116,7 +116,12 @@

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_apc_snmp.xml b/tests/data/metadata/fence_apc_snmp.xml

index 7f1c616c..a1947672 100644

--- a/tests/data/metadata/fence_apc_snmp.xml

+++ b/tests/data/metadata/fence_apc_snmp.xml

@@ -121,7 +121,12 @@

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_aws.xml b/tests/data/metadata/fence_aws.xml

index 12f67322..527fc86c 100644

--- a/tests/data/metadata/fence_aws.xml

+++ b/tests/data/metadata/fence_aws.xml

@@ -49,7 +49,12 @@ For instructions see: https://boto3.readthedocs.io/en/latest/guide/quickstart.ht

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_azure_arm.xml b/tests/data/metadata/fence_azure_arm.xml

index 7ea672af..42c9952f 100644

--- a/tests/data/metadata/fence_azure_arm.xml

+++ b/tests/data/metadata/fence_azure_arm.xml

@@ -106,7 +106,12 @@ When using network fencing the reboot-action will cause a quick-return once the

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_bladecenter.xml b/tests/data/metadata/fence_bladecenter.xml

index 0762e43f..f2ee28b1 100644

--- a/tests/data/metadata/fence_bladecenter.xml

+++ b/tests/data/metadata/fence_bladecenter.xml

@@ -111,7 +111,12 @@

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_brocade.xml b/tests/data/metadata/fence_brocade.xml

index ef2b9833..f3287503 100644

--- a/tests/data/metadata/fence_brocade.xml

+++ b/tests/data/metadata/fence_brocade.xml

@@ -111,7 +111,12 @@

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_cisco_mds.xml b/tests/data/metadata/fence_cisco_mds.xml

index 15d7798c..a0e62cba 100644

--- a/tests/data/metadata/fence_cisco_mds.xml

+++ b/tests/data/metadata/fence_cisco_mds.xml

@@ -120,7 +120,12 @@

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_cisco_ucs.xml b/tests/data/metadata/fence_cisco_ucs.xml

index 848e72f8..f4543f4b 100644

--- a/tests/data/metadata/fence_cisco_ucs.xml

+++ b/tests/data/metadata/fence_cisco_ucs.xml

@@ -96,7 +96,12 @@

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_compute.xml b/tests/data/metadata/fence_compute.xml

index 2f183268..a5ce53cd 100644

--- a/tests/data/metadata/fence_compute.xml

+++ b/tests/data/metadata/fence_compute.xml

@@ -131,7 +131,12 @@

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_docker.xml b/tests/data/metadata/fence_docker.xml

index 3285314c..6e3306d4 100644

--- a/tests/data/metadata/fence_docker.xml

+++ b/tests/data/metadata/fence_docker.xml

@@ -84,7 +84,12 @@

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_drac.xml b/tests/data/metadata/fence_drac.xml

index 2184ee0c..451ee504 100644

--- a/tests/data/metadata/fence_drac.xml

+++ b/tests/data/metadata/fence_drac.xml

@@ -81,7 +81,12 @@

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_drac5.xml b/tests/data/metadata/fence_drac5.xml

index 069f7b00..564008ab 100644

--- a/tests/data/metadata/fence_drac5.xml

+++ b/tests/data/metadata/fence_drac5.xml

@@ -120,7 +120,12 @@

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_dummy.xml b/tests/data/metadata/fence_dummy.xml

index 873c565b..ec4d5b46 100644

--- a/tests/data/metadata/fence_dummy.xml

+++ b/tests/data/metadata/fence_dummy.xml

@@ -31,7 +31,12 @@

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_eaton_snmp.xml b/tests/data/metadata/fence_eaton_snmp.xml

index 3dd92dd2..1ec07c68 100644

--- a/tests/data/metadata/fence_eaton_snmp.xml

+++ b/tests/data/metadata/fence_eaton_snmp.xml

@@ -120,7 +120,12 @@

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_emerson.xml b/tests/data/metadata/fence_emerson.xml

index f6886469..fbdcbcde 100644

--- a/tests/data/metadata/fence_emerson.xml

+++ b/tests/data/metadata/fence_emerson.xml

@@ -120,7 +120,12 @@

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_eps.xml b/tests/data/metadata/fence_eps.xml

index 26e75477..47cad6f0 100644

--- a/tests/data/metadata/fence_eps.xml

+++ b/tests/data/metadata/fence_eps.xml

@@ -83,7 +83,12 @@ Agent basically works by connecting to hidden page and pass appropriate argument

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_evacuate.xml b/tests/data/metadata/fence_evacuate.xml

index 95da0e1b..f32b48eb 100644

--- a/tests/data/metadata/fence_evacuate.xml

+++ b/tests/data/metadata/fence_evacuate.xml

@@ -126,7 +126,12 @@

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_gce.xml b/tests/data/metadata/fence_gce.xml

index 79b82ebb..3b8a24a4 100644

--- a/tests/data/metadata/fence_gce.xml

+++ b/tests/data/metadata/fence_gce.xml

@@ -56,7 +56,12 @@ For instructions see: https://cloud.google.com/compute/docs/tutorials/python-gui

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_hds_cb.xml b/tests/data/metadata/fence_hds_cb.xml

index 71cfd8ed..5529472d 100644

--- a/tests/data/metadata/fence_hds_cb.xml

+++ b/tests/data/metadata/fence_hds_cb.xml

@@ -111,7 +111,12 @@

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_heuristics_ping.xml b/tests/data/metadata/fence_heuristics_ping.xml

index 3dbceeb2..53e3bb05 100644

--- a/tests/data/metadata/fence_heuristics_ping.xml

+++ b/tests/data/metadata/fence_heuristics_ping.xml

@@ -56,7 +56,12 @@ This is not a fence agent by itself! Its only purpose is to enable/disable anoth

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_hpblade.xml b/tests/data/metadata/fence_hpblade.xml

index 6cdc73ed..bbb51668 100644

--- a/tests/data/metadata/fence_hpblade.xml

+++ b/tests/data/metadata/fence_hpblade.xml

@@ -111,7 +111,12 @@

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_ibmblade.xml b/tests/data/metadata/fence_ibmblade.xml

index 5084b3a0..6585c4fb 100644

--- a/tests/data/metadata/fence_ibmblade.xml

+++ b/tests/data/metadata/fence_ibmblade.xml

@@ -120,7 +120,12 @@

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_idrac.xml b/tests/data/metadata/fence_idrac.xml

index 55d9ced3..efecc720 100644

--- a/tests/data/metadata/fence_idrac.xml

+++ b/tests/data/metadata/fence_idrac.xml

@@ -123,7 +123,12 @@

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_ifmib.xml b/tests/data/metadata/fence_ifmib.xml

index c07a6e1f..93bd8aa3 100644

--- a/tests/data/metadata/fence_ifmib.xml

+++ b/tests/data/metadata/fence_ifmib.xml

@@ -122,7 +122,12 @@ It was written with managed ethernet switches in mind, in order to fence iSCSI S

 	<parameter name="verbose" unique="0" required="0">

 		<getopt mixed="-v, --verbose" />

 		<content type="boolean"  />

-		<shortdesc lang="en">Verbose mode</shortdesc>

+		<shortdesc lang="en">Verbose mode. Multiple -v flags can be stacked on the command line (e.g., -vvv) to increase verbosity.</shortdesc>

+	</parameter>

+	<parameter name="verbose_level" unique="0" required="0">

+		<getopt mixed="--verbose-level" />

+		<content type="integer"  />

+		<shortdesc lang="en">Level of debugging detail in output. Defaults to the number of --verbose flags specified on the command line, or to 1 if verbose=1 in a stonith device configuration (i.e., on stdin).</shortdesc>

 	</parameter>

 	<parameter name="debug" unique="0" required="0" deprecated="1">

 		<getopt mixed="-D, --debug-file=[debugfile]" />

diff --git a/tests/data/metadata/fence_ilo.xml b/tests/data/metadata/fence_ilo.xml