Hello community, here is the log from the commit of package fence-agents for openSUSE:Factory checked in at 2018-09-28 08:52:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fence-agents (Old) and /work/SRC/openSUSE:Factory/.fence-agents.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fence-agents" Fri Sep 28 08:52:51 2018 rev:44 rq:638330 version:4.2.1+git.1537269352.7b1fd536 Changes: -------- --- /work/SRC/openSUSE:Factory/fence-agents/fence-agents.changes 2018-08-15 10:33:14.411729885 +0200 +++ /work/SRC/openSUSE:Factory/.fence-agents.new/fence-agents.changes 2018-09-28 08:52:52.929774101 +0200 @@ -1,0 +2,17 @@ +Wed Sep 26 06:54:47 UTC 2018 - kgronlund@suse.com + +- Update to version 4.2.1+git.1537269352.7b1fd536: + * fence_vmware_soap: cleanup when receiving SIGTERM + * fence_cisco_ucs: encode POSTFIELDS + * Update fence_rcd_serial to correct vendor URL + * fence_aliyun: correct indentation for *key in help + * fence_aliyun: list instance names and show up to 100 instances (fate#326557) + * fence-rhevm: improve error reporting. + * fence_impilan/fence_ilo_ssh: iLO5-support + * fence_rhevm: improve indentation and metadata + * fence_compute/fence_evacuate/fence_rhevm: dont use has_key (not supported in Python 3) + * fence_rhevm fixing help for plug param + * fence_kdump: fix strncpy issue + * fence_evacuate: fix evacuable tag mix issue + +------------------------------------------------------------------- Old: ---- fence-agents-4.2.1+git.1532964592.3ae5b58e.tar.xz New: ---- fence-agents-4.2.1+git.1537269352.7b1fd536.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fence-agents.spec ++++++ --- /var/tmp/diff_new_pack.uoQYIo/_old 2018-09-28 08:52:53.881772720 +0200 +++ /var/tmp/diff_new_pack.uoQYIo/_new 2018-09-28 08:52:53.881772720 +0200 @@ -29,7 +29,7 @@ Summary: Fence Agents for High Availability License: GPL-2.0-only AND LGPL-2.1-only Group: Productivity/Clustering/HA -Version: 4.2.1+git.1532964592.3ae5b58e +Version: 4.2.1+git.1537269352.7b1fd536 Release: 0 Url: https://github.com/ClusterLabs/fence-agents Source0: %{name}-%{version}.tar.xz ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.uoQYIo/_old 2018-09-28 08:52:53.913772674 +0200 +++ /var/tmp/diff_new_pack.uoQYIo/_new 2018-09-28 08:52:53.913772674 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/fence-agents.git</param> - <param name="changesrevision">790cbaa66f3927a84739af4a1f0e8bba295cdc36</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">7b1fd536961421d93a1e960ffc558ce938153f42</param></service></servicedata> \ No newline at end of file ++++++ fence-agents-4.2.1+git.1532964592.3ae5b58e.tar.xz -> fence-agents-4.2.1+git.1537269352.7b1fd536.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/agents/aliyun/fence_aliyun.py new/fence-agents-4.2.1+git.1537269352.7b1fd536/agents/aliyun/fence_aliyun.py --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/agents/aliyun/fence_aliyun.py 2018-07-30 17:29:52.000000000 +0200 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/agents/aliyun/fence_aliyun.py 2018-09-18 13:15:52.000000000 +0200 @@ -59,13 +59,15 @@ def get_nodes_list(conn, options): result = {} request = DescribeInstancesRequest() + request.set_PageSize(100) response = _send_request(conn, request) instance_status = None if response is not None: instance_list = response.get('Instances').get('Instance') for item in instance_list: instance_id = item.get('InstanceId') - result[instance_id] = ("", None) + instance_name = item.get('InstanceName') + result[instance_id] = (instance_name, None) return result def get_power_status(conn, options): @@ -106,7 +108,7 @@ all_opt["access_key"] = { "getopt" : "a:", "longopt" : "access-key", - "help" : "-a, --access-key=[name] Access Key", + "help" : "-a, --access-key=[name] Access Key", "shortdesc" : "Access Key.", "required" : "0", "order" : 3 @@ -114,7 +116,7 @@ all_opt["secret_key"] = { "getopt" : "s:", "longopt" : "secret-key", - "help" : "-s, --secret-key=[name] Secret Key", + "help" : "-s, --secret-key=[name] Secret Key", "shortdesc" : "Secret Key.", "required" : "0", "order" : 4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/agents/cisco_ucs/fence_cisco_ucs.py new/fence-agents-4.2.1+git.1537269352.7b1fd536/agents/cisco_ucs/fence_cisco_ucs.py --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/agents/cisco_ucs/fence_cisco_ucs.py 2018-07-30 17:29:52.000000000 +0200 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/agents/cisco_ucs/fence_cisco_ucs.py 2018-09-18 13:15:52.000000000 +0200 @@ -111,7 +111,7 @@ web_buffer = io.BytesIO() conn.setopt(pycurl.URL, url.encode("ascii")) conn.setopt(pycurl.HTTPHEADER, ["Content-type: text/xml"]) - conn.setopt(pycurl.POSTFIELDS, command) + conn.setopt(pycurl.POSTFIELDS, command.encode("ascii")) conn.setopt(pycurl.WRITEFUNCTION, web_buffer.write) conn.setopt(pycurl.TIMEOUT, timeout) if "--ssl" in opt or "--ssl-secure" in opt: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/agents/compute/fence_compute.py new/fence-agents-4.2.1+git.1537269352.7b1fd536/agents/compute/fence_compute.py --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/agents/compute/fence_compute.py 2018-07-30 17:29:52.000000000 +0200 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/agents/compute/fence_compute.py 2018-09-18 13:15:52.000000000 +0200 @@ -311,7 +311,7 @@ region_name=options["--region-name"], endpoint_type=options["--endpoint-type"], session=keystone_session, auth=keystone_auth, - http_log_debug=options.has_key("--verbose")) + http_log_debug="--verbose" in options) else: # OSP >= 11 # ArgSpec(args=['version'], varargs='args', keywords='kwargs', defaults=None) @@ -319,7 +319,7 @@ region_name=options["--region-name"], endpoint_type=options["--endpoint-type"], session=keystone_session, auth=keystone_auth, - http_log_debug=options.has_key("--verbose")) + http_log_debug="--verbose" in options) try: nova.hypervisors.list() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/agents/evacuate/fence_evacuate.py new/fence-agents-4.2.1+git.1537269352.7b1fd536/agents/evacuate/fence_evacuate.py --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/agents/evacuate/fence_evacuate.py 2018-07-30 17:29:52.000000000 +0200 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/agents/evacuate/fence_evacuate.py 2018-09-18 13:15:52.000000000 +0200 @@ -74,12 +74,15 @@ } def _is_server_evacuable(server, evac_flavors, evac_images): + reason = "flavor "+server.flavor.get('id') if server.flavor.get('id') in evac_flavors: return True if hasattr(server.image, 'get'): if server.image.get('id') in evac_images: return True - logging.debug("Instance %s is not evacuable" % server.image.get('id')) + reason = reason +" and image "+server.image.get('id') + + logging.debug("Instance is not evacuable: no match for %s" % reason) return False def _get_evacuable_flavors(connection): @@ -245,7 +248,7 @@ region_name=options["--region-name"], endpoint_type=options["--endpoint-type"], session=keystone_session, auth=keystone_auth, - http_log_debug=options.has_key("--verbose")) + http_log_debug="--verbose" in options) else: # OSP >= 11 # ArgSpec(args=['version'], varargs='args', keywords='kwargs', defaults=None) @@ -253,7 +256,7 @@ region_name=options["--region-name"], endpoint_type=options["--endpoint-type"], session=keystone_session, auth=keystone_auth, - http_log_debug=options.has_key("--verbose")) + http_log_debug="--verbose" in options) try: nova.hypervisors.list() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/agents/ilo_ssh/fence_ilo_ssh.py new/fence-agents-4.2.1+git.1537269352.7b1fd536/agents/ilo_ssh/fence_ilo_ssh.py --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/agents/ilo_ssh/fence_ilo_ssh.py 2018-07-30 17:29:52.000000000 +0200 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/agents/ilo_ssh/fence_ilo_ssh.py 2018-09-18 13:15:52.000000000 +0200 @@ -54,7 +54,8 @@ device via ssh and reboot a specified outlet. " docs["vendorurl"] = "http://www.hp.com" docs["symlink"] = [("fence_ilo3_ssh", "Fence agent for HP iLO3 over SSH"), - ("fence_ilo4_ssh", "Fence agent for HP iLO4 over SSH")] + ("fence_ilo4_ssh", "Fence agent for HP iLO4 over SSH"), + ("fence_ilo5_ssh", "Fence agent for HP iLO5 over SSH")] show_docs(options, docs) options["eol"] = "\r" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/agents/ipmilan/fence_ipmilan.py new/fence-agents-4.2.1+git.1537269352.7b1fd536/agents/ipmilan/fence_ipmilan.py --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/agents/ipmilan/fence_ipmilan.py 2018-07-30 17:29:52.000000000 +0200 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/agents/ipmilan/fence_ipmilan.py 2018-09-18 13:15:52.000000000 +0200 @@ -169,6 +169,8 @@ all_opt["lanplus"]["default"] = "1" elif os.path.basename(sys.argv[0]) == "fence_ilo4": all_opt["lanplus"]["default"] = "1" + elif os.path.basename(sys.argv[0]) == "fence_ilo5": + all_opt["lanplus"]["default"] = "1" all_opt["ipport"]["default"] = "623" all_opt["method"]["help"] = "-m, --method=[method] Method to fence (onoff|cycle) (Default: onoff)\n" \ @@ -187,6 +189,7 @@ docs["vendorurl"] = "" docs["symlink"] = [("fence_ilo3", "Fence agent for HP iLO3"), ("fence_ilo4", "Fence agent for HP iLO4"), + ("fence_ilo5", "Fence agent for HP iLO5"), ("fence_imm", "Fence agent for IBM Integrated Management Module"), ("fence_idrac", "Fence agent for Dell iDRAC")] show_docs(options, docs) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/agents/kdump/fence_kdump.c new/fence-agents-4.2.1+git.1537269352.7b1fd536/agents/kdump/fence_kdump.c --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/agents/kdump/fence_kdump.c 2018-07-30 17:29:52.000000000 +0200 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/agents/kdump/fence_kdump.c 2018-09-18 13:15:52.000000000 +0200 @@ -351,7 +351,7 @@ hints.ai_protocol = IPPROTO_UDP; hints.ai_flags = AI_NUMERICSERV; - strncpy (node->name, opts->nodename, sizeof (node->name)); + strncpy (node->name, opts->nodename, sizeof (node->name) - 1); snprintf (node->port, sizeof (node->port), "%d", opts->ipport); node->info = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/agents/kdump/fence_kdump_send.c new/fence-agents-4.2.1+git.1537269352.7b1fd536/agents/kdump/fence_kdump_send.c --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/agents/kdump/fence_kdump_send.c 2018-07-30 17:29:52.000000000 +0200 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/agents/kdump/fence_kdump_send.c 2018-09-18 13:15:52.000000000 +0200 @@ -116,7 +116,7 @@ hints.ai_protocol = IPPROTO_UDP; hints.ai_flags = AI_NUMERICSERV; - strncpy (node->name, opts->nodename, sizeof (node->name)); + strncpy (node->name, opts->nodename, sizeof (node->name) - 1); snprintf (node->port, sizeof (node->port), "%d", opts->ipport); node->info = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/agents/rcd_serial/fence_rcd_serial.py new/fence-agents-4.2.1+git.1537269352.7b1fd536/agents/rcd_serial/fence_rcd_serial.py --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/agents/rcd_serial/fence_rcd_serial.py 2018-07-30 17:29:52.000000000 +0200 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/agents/rcd_serial/fence_rcd_serial.py 2018-09-18 13:15:52.000000000 +0200 @@ -1,12 +1,12 @@ #!@PYTHON@ -tt -# Copyright 2015 Infoxchange, Danielle Madeley, Sam McLeod-Jones +# Copyright 2018 Infoxchange, Danielle Madeley, Sam McLeod-Jones # Controls an RCD serial device # Ported from stonith/rcd_serial.c # The Following Agent Has Been Tested On: -# CentOS Linux release 7.1.1503 +# CentOS Linux release 7.5.1804 # Resource example: # primitive stonith_node_1 ocf:rcd_serial_py params port="/dev/ttyS0" time=1000 hostlist=stonith_node_1 stonith-timeout=5s @@ -82,7 +82,7 @@ cable itself is simple with no power, network or moving parts. An example of \ the cable is available here: https://smcleod.net/rcd-stonith/ and the circuit \ design is available in the fence-agents src as SVG" - docs["vendorurl"] = "http://www.scl.co.uk/rcd_serial/" + docs["vendorurl"] = "https://github.com/sammcj/fence_rcd_serial" show_docs(options, docs) if options["--action"] in ["off", "reboot"]: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/agents/rhevm/fence_rhevm.py new/fence-agents-4.2.1+git.1537269352.7b1fd536/agents/rhevm/fence_rhevm.py --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/agents/rhevm/fence_rhevm.py 2018-07-30 17:29:52.000000000 +0200 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/agents/rhevm/fence_rhevm.py 2018-09-18 13:15:52.000000000 +0200 @@ -6,7 +6,7 @@ import atexit sys.path.append("@FENCEAGENTSLIBDIR@") from fencing import * -from fencing import fail, EC_STATUS, run_delay +from fencing import fail, EC_FETCH_VM_UUID, run_delay RE_GET_ID = re.compile("<vm( .*)? id=\"(.*?)\"", re.IGNORECASE) RE_STATUS = re.compile("<state>(.*?)</state>", re.IGNORECASE) @@ -21,7 +21,7 @@ result = RE_GET_ID.search(res) if result == None: # Unable to obtain ID needed to access virtual machine - fail(EC_STATUS) + fail(EC_FETCH_VM_UUID) options["id"] = result.group(2) @@ -74,11 +74,11 @@ url = "https:" else: url = "http:" - if opt.has_key("--api-path"): + if "--api-path" in opt: api_path = opt["--api-path"] else: api_path = "/ovirt-engine/api" - if opt.has_key("--disable-http-filter"): + if "--disable-http-filter" in opt: http_filter = 'false' else: http_filter = 'true' @@ -136,6 +136,14 @@ return result def define_new_opts(): + + all_opt["port"] = { + "getopt" : "n:", + "longopt" : "plug", + "help" : "-n, --plug=[name] " + "VM name in RHV", + "required" : "1", + "order" : 1} all_opt["use_cookies"] = { "getopt" : "", "longopt" : "use-cookies", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/agents/vmware_soap/fence_vmware_soap.py new/fence-agents-4.2.1+git.1537269352.7b1fd536/agents/vmware_soap/fence_vmware_soap.py --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/agents/vmware_soap/fence_vmware_soap.py 2018-07-30 17:29:52.000000000 +0200 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/agents/vmware_soap/fence_vmware_soap.py 2018-09-18 13:15:52.000000000 +0200 @@ -3,7 +3,7 @@ import sys import shutil, tempfile, suds import logging, requests -import atexit +import atexit, signal sys.path.append("@FENCEAGENTSLIBDIR@") from suds.client import Client @@ -211,6 +211,9 @@ except Exception: pass +def signal_handler(signum, frame): + raise Exception("Signal \"%d\" received which has triggered an exit of the process." % signum) + def main(): global options_global global conn_global @@ -219,6 +222,8 @@ atexit.register(atexit_handler) atexit.register(logout) + signal.signal(signal.SIGTERM, signal_handler) + options_global = check_input(device_opt, process_input(device_opt)) ## diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/lib/fencing.py.py new/fence-agents-4.2.1+git.1537269352.7b1fd536/lib/fencing.py.py --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/lib/fencing.py.py 2018-07-30 17:29:52.000000000 +0200 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/lib/fencing.py.py 2018-09-18 13:15:52.000000000 +0200 @@ -27,6 +27,7 @@ EC_STATUS_HMC = 9 EC_PASSWORD_MISSING = 10 EC_INVALID_PRIVILEGES = 11 +EC_FETCH_VM_UUID = 12 LOG_FORMAT = "%(asctime)-15s %(levelname)s: %(message)s" @@ -540,7 +541,9 @@ EC_STATUS_HMC : "Failed: Either unable to obtain correct plug status, " "partition is not available or incorrect HMC version used", EC_PASSWORD_MISSING : "Failed: You have to set login password", - EC_INVALID_PRIVILEGES : "Failed: The user does not have the correct privileges to do the requested action." + EC_INVALID_PRIVILEGES : "Failed: The user does not have the correct privileges to do the requested action.", + EC_FETCH_VM_UUID : "Failed: Can not find VM UUID by its VM name given in the <plug> parameter." + }[error_code] + "\n" logging.error("%s\n", message) sys.exit(EC_GENERIC_ERROR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_idrac.xml new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_idrac.xml --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_idrac.xml 2018-07-30 17:29:52.000000000 +0200 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_idrac.xml 2018-09-18 13:15:52.000000000 +0200 @@ -2,6 +2,7 @@ <resource-agent name="fence_idrac" shortdesc="Fence agent for IPMI" > <symlink name="fence_ilo3" shortdesc="Fence agent for HP iLO3"/> <symlink name="fence_ilo4" shortdesc="Fence agent for HP iLO4"/> +<symlink name="fence_ilo5" shortdesc="Fence agent for HP iLO5"/> <symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/> <symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/> <longdesc>fence_ipmilan is an I/O Fencing agentwhich can be used with machines controlled by IPMI.This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_ilo3.xml new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_ilo3.xml --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_ilo3.xml 2018-07-30 17:29:52.000000000 +0200 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_ilo3.xml 2018-09-18 13:15:52.000000000 +0200 @@ -2,6 +2,7 @@ <resource-agent name="fence_ilo3" shortdesc="Fence agent for IPMI" > <symlink name="fence_ilo3" shortdesc="Fence agent for HP iLO3"/> <symlink name="fence_ilo4" shortdesc="Fence agent for HP iLO4"/> +<symlink name="fence_ilo5" shortdesc="Fence agent for HP iLO5"/> <symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/> <symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/> <longdesc>fence_ipmilan is an I/O Fencing agentwhich can be used with machines controlled by IPMI.This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_ilo3_ssh.xml new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_ilo3_ssh.xml --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_ilo3_ssh.xml 2018-07-30 17:29:52.000000000 +0200 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_ilo3_ssh.xml 2018-09-18 13:15:52.000000000 +0200 @@ -2,6 +2,7 @@ <resource-agent name="fence_ilo3_ssh" shortdesc="Fence agent for HP iLO over SSH" > <symlink name="fence_ilo3_ssh" shortdesc="Fence agent for HP iLO3 over SSH"/> <symlink name="fence_ilo4_ssh" shortdesc="Fence agent for HP iLO4 over SSH"/> +<symlink name="fence_ilo5_ssh" shortdesc="Fence agent for HP iLO5 over SSH"/> <longdesc>fence_ilo_ssh is a fence agent that connects to iLO device. It logs into device via ssh and reboot a specified outlet. </longdesc> <vendor-url>http://www.hp.com</vendor-url> <parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_ilo4.xml new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_ilo4.xml --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_ilo4.xml 2018-07-30 17:29:52.000000000 +0200 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_ilo4.xml 2018-09-18 13:15:52.000000000 +0200 @@ -2,6 +2,7 @@ <resource-agent name="fence_ilo4" shortdesc="Fence agent for IPMI" > <symlink name="fence_ilo3" shortdesc="Fence agent for HP iLO3"/> <symlink name="fence_ilo4" shortdesc="Fence agent for HP iLO4"/> +<symlink name="fence_ilo5" shortdesc="Fence agent for HP iLO5"/> <symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/> <symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/> <longdesc>fence_ipmilan is an I/O Fencing agentwhich can be used with machines controlled by IPMI.This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_ilo4_ssh.xml new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_ilo4_ssh.xml --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_ilo4_ssh.xml 2018-07-30 17:29:52.000000000 +0200 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_ilo4_ssh.xml 2018-09-18 13:15:52.000000000 +0200 @@ -2,6 +2,7 @@ <resource-agent name="fence_ilo4_ssh" shortdesc="Fence agent for HP iLO over SSH" > <symlink name="fence_ilo3_ssh" shortdesc="Fence agent for HP iLO3 over SSH"/> <symlink name="fence_ilo4_ssh" shortdesc="Fence agent for HP iLO4 over SSH"/> +<symlink name="fence_ilo5_ssh" shortdesc="Fence agent for HP iLO5 over SSH"/> <longdesc>fence_ilo_ssh is a fence agent that connects to iLO device. It logs into device via ssh and reboot a specified outlet. </longdesc> <vendor-url>http://www.hp.com</vendor-url> <parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_ilo5.xml new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_ilo5.xml --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_ilo5.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_ilo5.xml 2018-09-18 13:15:52.000000000 +0200 @@ -0,0 +1,223 @@ +<?xml version="1.0" ?> +<resource-agent name="fence_ilo5" shortdesc="Fence agent for IPMI" > +<symlink name="fence_ilo3" shortdesc="Fence agent for HP iLO3"/> +<symlink name="fence_ilo4" shortdesc="Fence agent for HP iLO4"/> +<symlink name="fence_ilo5" shortdesc="Fence agent for HP iLO5"/> +<symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/> +<symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/> +<longdesc>fence_ipmilan is an I/O Fencing agentwhich can be used with machines controlled by IPMI.This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc> +<vendor-url></vendor-url> +<parameters> + <parameter name="action" unique="0" required="1"> + <getopt mixed="-o, --action=[action]" /> + <content type="string" default="reboot" /> + <shortdesc lang="en">Fencing action</shortdesc> + </parameter> + <parameter name="auth" unique="0" required="0"> + <getopt mixed="-A, --auth=[auth]" /> + <content type="select" > + <option value="md5" /> + <option value="password" /> + <option value="none" /> + </content> + <shortdesc lang="en">IPMI Lan Auth type.</shortdesc> + </parameter> + <parameter name="cipher" unique="0" required="0"> + <getopt mixed="-C, --cipher=[cipher]" /> + <content type="string" /> + <shortdesc lang="en">Ciphersuite to use (same as ipmitool -C parameter)</shortdesc> + </parameter> + <parameter name="hexadecimal_kg" unique="0" required="0"> + <getopt mixed="--hexadecimal-kg=[key]" /> + <content type="string" /> + <shortdesc lang="en">Hexadecimal-encoded Kg key for IPMIv2 authentication</shortdesc> + </parameter> + <parameter name="inet4_only" unique="0" required="0"> + <getopt mixed="-4, --inet4-only" /> + <content type="boolean" /> + <shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc> + </parameter> + <parameter name="inet6_only" unique="0" required="0"> + <getopt mixed="-6, --inet6-only" /> + <content type="boolean" /> + <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> + </parameter> + <parameter name="ip" unique="0" required="0" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="0" deprecated="1"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipport" unique="0" required="0"> + <getopt mixed="-u, --ipport=[port]" /> + <content type="integer" default="623" /> + <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> + </parameter> + <parameter name="lanplus" unique="0" required="0"> + <getopt mixed="-P, --lanplus" /> + <content type="boolean" default="1" /> + <shortdesc lang="en">Use Lanplus to improve security of connection</shortdesc> + </parameter> + <parameter name="login" unique="0" required="0" deprecated="1"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> + <parameter name="method" unique="0" required="0"> + <getopt mixed="-m, --method=[method]" /> + <content type="select" default="onoff" > + <option value="onoff" /> + <option value="cycle" /> + </content> + <shortdesc lang="en">Method to fence</shortdesc> + </parameter> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="plug" unique="0" required="0" obsoletes="port"> + <getopt mixed="-n, --plug=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> + </parameter> + <parameter name="port" unique="0" required="0" deprecated="1"> + <getopt mixed="-n, --plug=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> + </parameter> + <parameter name="privlvl" unique="0" required="0"> + <getopt mixed="-L, --privlvl=[level]" /> + <content type="select" default="administrator" > + <option value="callback" /> + <option value="user" /> + <option value="operator" /> + <option value="administrator" /> + </content> + <shortdesc lang="en">Privilege level on IPMI device</shortdesc> + </parameter> + <parameter name="target" unique="0" required="0"> + <getopt mixed="--target=[targetaddress]" /> + <content type="string" /> + <shortdesc lang="en">Bridge IPMI requests to the remote target address</shortdesc> + </parameter> + <parameter name="username" unique="0" required="0" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> + <parameter name="quiet" unique="0" required="0"> + <getopt mixed="-q, --quiet" /> + <content type="boolean" /> + <shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc> + </parameter> + <parameter name="verbose" unique="0" required="0"> + <getopt mixed="-v, --verbose" /> + <content type="boolean" /> + <shortdesc lang="en">Verbose mode</shortdesc> + </parameter> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="version" unique="0" required="0"> + <getopt mixed="-V, --version" /> + <content type="boolean" /> + <shortdesc lang="en">Display version information and exit</shortdesc> + </parameter> + <parameter name="help" unique="0" required="0"> + <getopt mixed="-h, --help" /> + <content type="boolean" /> + <shortdesc lang="en">Display help and exit</shortdesc> + </parameter> + <parameter name="delay" unique="0" required="0"> + <getopt mixed="--delay=[seconds]" /> + <content type="second" default="0" /> + <shortdesc lang="en">Wait X seconds before fencing is started</shortdesc> + </parameter> + <parameter name="ipmitool_path" unique="0" required="0"> + <getopt mixed="--ipmitool-path=[path]" /> + <shortdesc lang="en">Path to ipmitool binary</shortdesc> + </parameter> + <parameter name="login_timeout" unique="0" required="0"> + <getopt mixed="--login-timeout=[seconds]" /> + <content type="second" default="5" /> + <shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc> + </parameter> + <parameter name="port_as_ip" unique="0" required="0"> + <getopt mixed="--port-as-ip" /> + <content type="boolean" /> + <shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc> + </parameter> + <parameter name="power_timeout" unique="0" required="0"> + <getopt mixed="--power-timeout=[seconds]" /> + <content type="second" default="20" /> + <shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc> + </parameter> + <parameter name="power_wait" unique="0" required="0"> + <getopt mixed="--power-wait=[seconds]" /> + <content type="second" default="2" /> + <shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc> + </parameter> + <parameter name="shell_timeout" unique="0" required="0"> + <getopt mixed="--shell-timeout=[seconds]" /> + <content type="second" default="3" /> + <shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc> + </parameter> + <parameter name="retry_on" unique="0" required="0"> + <getopt mixed="--retry-on=[attempts]" /> + <content type="integer" default="1" /> + <shortdesc lang="en">Count of attempts to retry power on</shortdesc> + </parameter> + <parameter name="sudo" unique="0" required="0" deprecated="1"> + <getopt mixed="--use-sudo" /> + <content type="boolean" /> + <shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc> + </parameter> + <parameter name="use_sudo" unique="0" required="0" obsoletes="sudo"> + <getopt mixed="--use-sudo" /> + <content type="boolean" /> + <shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc> + </parameter> + <parameter name="sudo_path" unique="0" required="0"> + <getopt mixed="--sudo-path=[path]" /> + <shortdesc lang="en">Path to sudo binary</shortdesc> + </parameter> +</parameters> +<actions> + <action name="on" automatic="0"/> + <action name="off" /> + <action name="reboot" /> + <action name="status" /> + <action name="monitor" /> + <action name="metadata" /> + <action name="manpage" /> + <action name="validate-all" /> + <action name="diag" /> +</actions> +</resource-agent> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_ilo5_ssh.xml new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_ilo5_ssh.xml --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_ilo5_ssh.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_ilo5_ssh.xml 2018-09-18 13:15:52.000000000 +0200 @@ -0,0 +1,201 @@ +<?xml version="1.0" ?> +<resource-agent name="fence_ilo5_ssh" shortdesc="Fence agent for HP iLO over SSH" > +<symlink name="fence_ilo3_ssh" shortdesc="Fence agent for HP iLO3 over SSH"/> +<symlink name="fence_ilo4_ssh" shortdesc="Fence agent for HP iLO4 over SSH"/> +<symlink name="fence_ilo5_ssh" shortdesc="Fence agent for HP iLO5 over SSH"/> +<longdesc>fence_ilo_ssh is a fence agent that connects to iLO device. It logs into device via ssh and reboot a specified outlet. </longdesc> +<vendor-url>http://www.hp.com</vendor-url> +<parameters> + <parameter name="action" unique="0" required="1"> + <getopt mixed="-o, --action=[action]" /> + <content type="string" default="reboot" /> + <shortdesc lang="en">Fencing action</shortdesc> + </parameter> + <parameter name="cmd_prompt" unique="0" required="0" deprecated="1"> + <getopt mixed="-c, --command-prompt=[prompt]" /> + <content type="string" default="['MP>', 'hpiLO->']" /> + <shortdesc lang="en">Force Python regex for command prompt</shortdesc> + </parameter> + <parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt"> + <getopt mixed="-c, --command-prompt=[prompt]" /> + <content type="string" default="['MP>', 'hpiLO->']" /> + <shortdesc lang="en">Force Python regex for command prompt</shortdesc> + </parameter> + <parameter name="identity_file" unique="0" required="0"> + <getopt mixed="-k, --identity-file=[filename]" /> + <content type="string" /> + <shortdesc lang="en">Identity file (private key) for SSH</shortdesc> + </parameter> + <parameter name="inet4_only" unique="0" required="0"> + <getopt mixed="-4, --inet4-only" /> + <content type="boolean" /> + <shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc> + </parameter> + <parameter name="inet6_only" unique="0" required="0"> + <getopt mixed="-6, --inet6-only" /> + <content type="boolean" /> + <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc> + </parameter> + <parameter name="ip" unique="0" required="0" obsoletes="ipaddr"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipaddr" unique="0" required="0" deprecated="1"> + <getopt mixed="-a, --ip=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device</shortdesc> + </parameter> + <parameter name="ipport" unique="0" required="0"> + <getopt mixed="-u, --ipport=[port]" /> + <content type="integer" default="23" /> + <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc> + </parameter> + <parameter name="login" unique="0" required="1" deprecated="1"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> + <parameter name="method" unique="0" required="0"> + <getopt mixed="-m, --method=[method]" /> + <content type="select" default="onoff" > + <option value="onoff" /> + <option value="cycle" /> + </content> + <shortdesc lang="en">Method to fence</shortdesc> + </parameter> + <parameter name="passwd" unique="0" required="0" deprecated="1"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="passwd_script" unique="0" required="0" deprecated="1"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="password" unique="0" required="0" obsoletes="passwd"> + <getopt mixed="-p, --password=[password]" /> + <content type="string" /> + <shortdesc lang="en">Login password or passphrase</shortdesc> + </parameter> + <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script"> + <getopt mixed="-S, --password-script=[script]" /> + <content type="string" /> + <shortdesc lang="en">Script to run to retrieve password</shortdesc> + </parameter> + <parameter name="plug" unique="0" required="0" obsoletes="port"> + <getopt mixed="-n, --plug=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> + </parameter> + <parameter name="port" unique="0" required="0" deprecated="1"> + <getopt mixed="-n, --plug=[ip]" /> + <content type="string" /> + <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc> + </parameter> + <parameter name="secure" unique="0" required="0" deprecated="1"> + <getopt mixed="-x, --ssh" /> + <content type="boolean" /> + <shortdesc lang="en">Use SSH connection</shortdesc> + </parameter> + <parameter name="ssh" unique="0" required="0" obsoletes="secure"> + <getopt mixed="-x, --ssh" /> + <content type="boolean" /> + <shortdesc lang="en">Use SSH connection</shortdesc> + </parameter> + <parameter name="ssh_options" unique="0" required="0"> + <getopt mixed="--ssh-options=[options]" /> + <content type="string" /> + <shortdesc lang="en">SSH options to use</shortdesc> + </parameter> + <parameter name="username" unique="0" required="1" obsoletes="login"> + <getopt mixed="-l, --username=[name]" /> + <content type="string" /> + <shortdesc lang="en">Login name</shortdesc> + </parameter> + <parameter name="quiet" unique="0" required="0"> + <getopt mixed="-q, --quiet" /> + <content type="boolean" /> + <shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc> + </parameter> + <parameter name="verbose" unique="0" required="0"> + <getopt mixed="-v, --verbose" /> + <content type="boolean" /> + <shortdesc lang="en">Verbose mode</shortdesc> + </parameter> + <parameter name="debug" unique="0" required="0" deprecated="1"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="debug_file" unique="0" required="0" obsoletes="debug"> + <getopt mixed="-D, --debug-file=[debugfile]" /> + <content type="string" /> + <shortdesc lang="en">Write debug information to given file</shortdesc> + </parameter> + <parameter name="version" unique="0" required="0"> + <getopt mixed="-V, --version" /> + <content type="boolean" /> + <shortdesc lang="en">Display version information and exit</shortdesc> + </parameter> + <parameter name="help" unique="0" required="0"> + <getopt mixed="-h, --help" /> + <content type="boolean" /> + <shortdesc lang="en">Display help and exit</shortdesc> + </parameter> + <parameter name="delay" unique="0" required="0"> + <getopt mixed="--delay=[seconds]" /> + <content type="second" default="0" /> + <shortdesc lang="en">Wait X seconds before fencing is started</shortdesc> + </parameter> + <parameter name="login_timeout" unique="0" required="0"> + <getopt mixed="--login-timeout=[seconds]" /> + <content type="second" default="5" /> + <shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc> + </parameter> + <parameter name="port_as_ip" unique="0" required="0"> + <getopt mixed="--port-as-ip" /> + <content type="boolean" /> + <shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc> + </parameter> + <parameter name="power_timeout" unique="0" required="0"> + <getopt mixed="--power-timeout=[seconds]" /> + <content type="second" default="20" /> + <shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc> + </parameter> + <parameter name="power_wait" unique="0" required="0"> + <getopt mixed="--power-wait=[seconds]" /> + <content type="second" default="5" /> + <shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc> + </parameter> + <parameter name="shell_timeout" unique="0" required="0"> + <getopt mixed="--shell-timeout=[seconds]" /> + <content type="second" default="3" /> + <shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc> + </parameter> + <parameter name="retry_on" unique="0" required="0"> + <getopt mixed="--retry-on=[attempts]" /> + <content type="integer" default="1" /> + <shortdesc lang="en">Count of attempts to retry power on</shortdesc> + </parameter> + <parameter name="ssh_path" unique="0" required="0"> + <getopt mixed="--ssh-path=[path]" /> + <shortdesc lang="en">Path to ssh binary</shortdesc> + </parameter> + <parameter name="telnet_path" unique="0" required="0"> + <getopt mixed="--telnet-path=[path]" /> + <shortdesc lang="en">Path to telnet binary</shortdesc> + </parameter> +</parameters> +<actions> + <action name="on" automatic="0"/> + <action name="off" /> + <action name="reboot" /> + <action name="status" /> + <action name="monitor" /> + <action name="metadata" /> + <action name="manpage" /> + <action name="validate-all" /> +</actions> +</resource-agent> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_ilo_ssh.xml new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_ilo_ssh.xml --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_ilo_ssh.xml 2018-07-30 17:29:52.000000000 +0200 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_ilo_ssh.xml 2018-09-18 13:15:52.000000000 +0200 @@ -2,6 +2,7 @@ <resource-agent name="fence_ilo_ssh" shortdesc="Fence agent for HP iLO over SSH" > <symlink name="fence_ilo3_ssh" shortdesc="Fence agent for HP iLO3 over SSH"/> <symlink name="fence_ilo4_ssh" shortdesc="Fence agent for HP iLO4 over SSH"/> +<symlink name="fence_ilo5_ssh" shortdesc="Fence agent for HP iLO5 over SSH"/> <longdesc>fence_ilo_ssh is a fence agent that connects to iLO device. It logs into device via ssh and reboot a specified outlet. </longdesc> <vendor-url>http://www.hp.com</vendor-url> <parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_imm.xml new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_imm.xml --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_imm.xml 2018-07-30 17:29:52.000000000 +0200 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_imm.xml 2018-09-18 13:15:52.000000000 +0200 @@ -2,6 +2,7 @@ <resource-agent name="fence_imm" shortdesc="Fence agent for IPMI" > <symlink name="fence_ilo3" shortdesc="Fence agent for HP iLO3"/> <symlink name="fence_ilo4" shortdesc="Fence agent for HP iLO4"/> +<symlink name="fence_ilo5" shortdesc="Fence agent for HP iLO5"/> <symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/> <symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/> <longdesc>fence_ipmilan is an I/O Fencing agentwhich can be used with machines controlled by IPMI.This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_ipmilan.xml new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_ipmilan.xml --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_ipmilan.xml 2018-07-30 17:29:52.000000000 +0200 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_ipmilan.xml 2018-09-18 13:15:52.000000000 +0200 @@ -2,6 +2,7 @@ <resource-agent name="fence_ipmilan" shortdesc="Fence agent for IPMI" > <symlink name="fence_ilo3" shortdesc="Fence agent for HP iLO3"/> <symlink name="fence_ilo4" shortdesc="Fence agent for HP iLO4"/> +<symlink name="fence_ilo5" shortdesc="Fence agent for HP iLO5"/> <symlink name="fence_imm" shortdesc="Fence agent for IBM Integrated Management Module"/> <symlink name="fence_idrac" shortdesc="Fence agent for Dell iDRAC"/> <longdesc>fence_ipmilan is an I/O Fencing agentwhich can be used with machines controlled by IPMI.This agent calls support software ipmitool (http://ipmitool.sf.net/). WARNING! This fence agent might report success before the node is powered off. You should use -m/method onoff if your fence device works correctly with that option.</longdesc> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_rcd_serial.xml new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_rcd_serial.xml --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_rcd_serial.xml 2018-07-30 17:29:52.000000000 +0200 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_rcd_serial.xml 2018-09-18 13:15:52.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" ?> <resource-agent name="fence_rcd_serial" shortdesc="rcd_serial fence agent" > <longdesc>fence_rcd_serial operates a serial cable that toggles a reset of an opposing server using the reset switch on its motherboard. The cable itself is simple with no power, network or moving parts. An example of the cable is available here: https://smcleod.net/rcd-stonith/ and the circuit design is available in the fence-agents src as SVG</longdesc> -<vendor-url>http://www.scl.co.uk/rcd_serial/</vendor-url> +<vendor-url>https://github.com/sammcj/fence_rcd_serial</vendor-url> <parameters> <parameter name="action" unique="0" required="1"> <getopt mixed="-o, --action=[action]" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_rhevm.xml new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_rhevm.xml --- old/fence-agents-4.2.1+git.1532964592.3ae5b58e/tests/data/metadata/fence_rhevm.xml 2018-07-30 17:29:52.000000000 +0200 +++ new/fence-agents-4.2.1+git.1537269352.7b1fd536/tests/data/metadata/fence_rhevm.xml 2018-09-18 13:15:52.000000000 +0200 @@ -64,14 +64,14 @@ <shortdesc lang="en">Script to run to retrieve password</shortdesc> </parameter> <parameter name="plug" unique="0" required="1" obsoletes="port"> - <getopt mixed="-n, --plug=[id]" /> + <getopt mixed="-n, --plug=[name]" /> <content type="string" /> - <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + <shortdesc lang="en">VM name in RHV</shortdesc> </parameter> <parameter name="port" unique="0" required="1" deprecated="1"> - <getopt mixed="-n, --plug=[id]" /> + <getopt mixed="-n, --plug=[name]" /> <content type="string" /> - <shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc> + <shortdesc lang="en">VM name in RHV</shortdesc> </parameter> <parameter name="ssl" unique="0" required="0"> <getopt mixed="-z, --ssl" />