Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fence-agents for openSUSE:Factory checked in at 2022-03-31 17:18:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fence-agents (Old) and /work/SRC/openSUSE:Factory/.fence-agents.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fence-agents" Thu Mar 31 17:18:58 2022 rev:59 rq:966235 version:4.11.0+git.1647434775.2f1b86d8 Changes: -------- --- /work/SRC/openSUSE:Factory/fence-agents/fence-agents.changes 2022-02-22 21:19:07.714296565 +0100 +++ /work/SRC/openSUSE:Factory/.fence-agents.new.1900/fence-agents.changes 2022-03-31 17:19:37.340639078 +0200 @@ -1,0 +2,8 @@ +Thu Mar 31 13:33:20 UTC 2022 - vark...@suse.com + +- Update to version 4.11.0+git.1647434775.2f1b86d8: + * fence_apc.py compatibility for Firmware major release 7 workaround #475 + * fence_lpar: fix missing import logging, use fail_usage + * fence_raritan: Also allow pure port number, not only system1/outletX string (#473) + +------------------------------------------------------------------- Old: ---- fence-agents-4.11.0+git.1644831027.5283cdb5.tar.xz New: ---- fence-agents-4.11.0+git.1647434775.2f1b86d8.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fence-agents.spec ++++++ --- /var/tmp/diff_new_pack.pjzPLz/_old 2022-03-31 17:19:37.932632326 +0200 +++ /var/tmp/diff_new_pack.pjzPLz/_new 2022-03-31 17:19:37.936632280 +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.11.0+git.1644831027.5283cdb5 +Version: 4.11.0+git.1647434775.2f1b86d8 Release: 0 URL: https://github.com/ClusterLabs/fence-agents Source0: %{name}-%{version}.tar.xz ++++++ _service ++++++ --- /var/tmp/diff_new_pack.pjzPLz/_old 2022-03-31 17:19:37.972631869 +0200 +++ /var/tmp/diff_new_pack.pjzPLz/_new 2022-03-31 17:19:37.976631824 +0200 @@ -1,6 +1,6 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="url">git://github.com/ClusterLabs/fence-agents.git</param> + <param name="url">https://github.com/ClusterLabs/fence-agents.git</param> <param name="scm">git</param> <param name="exclude">.git</param> <param name="filename">fence-agents</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.pjzPLz/_old 2022-03-31 17:19:37.996631596 +0200 +++ /var/tmp/diff_new_pack.pjzPLz/_new 2022-03-31 17:19:38.000631550 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> - <param name="url">git://github.com/ClusterLabs/fence-agents.git</param> - <param name="changesrevision">5283cdb5435ecd22e9f29746ee0c79160555bfeb</param></service></servicedata> + <param name="url">https://github.com/ClusterLabs/fence-agents.git</param> + <param name="changesrevision">cd893f97fd61da22080463fe168c40daaa86aafd</param></service></servicedata> (No newline at EOF) ++++++ fence-agents-4.11.0+git.1644831027.5283cdb5.tar.xz -> fence-agents-4.11.0+git.1647434775.2f1b86d8.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.11.0+git.1644831027.5283cdb5/agents/apc/fence_apc.py new/fence-agents-4.11.0+git.1647434775.2f1b86d8/agents/apc/fence_apc.py --- old/fence-agents-4.11.0+git.1644831027.5283cdb5/agents/apc/fence_apc.py 2022-02-14 10:30:27.000000000 +0100 +++ new/fence-agents-4.11.0+git.1647434775.2f1b86d8/agents/apc/fence_apc.py 2022-03-16 13:46:15.000000000 +0100 @@ -250,7 +250,7 @@ #### result = -1 firmware_version = re.compile(r'\s*v(\d)*\.').search(conn.before) - if (firmware_version != None) and (firmware_version.group(1) in [ "5", "6" ]): + if (firmware_version != None) and (firmware_version.group(1) in [ "5", "6", "7" ]): result = fence_action(conn, options, set_power_status5, get_power_status5, get_power_status5) else: result = fence_action(conn, options, set_power_status, get_power_status, get_power_status) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.11.0+git.1644831027.5283cdb5/agents/lpar/fence_lpar.py new/fence-agents-4.11.0+git.1647434775.2f1b86d8/agents/lpar/fence_lpar.py --- old/fence-agents-4.11.0+git.1644831027.5283cdb5/agents/lpar/fence_lpar.py 2022-02-14 10:30:27.000000000 +0100 +++ new/fence-agents-4.11.0+git.1647434775.2f1b86d8/agents/lpar/fence_lpar.py 2022-03-16 13:46:15.000000000 +0100 @@ -28,31 +28,28 @@ def get_power_status(conn, options): if options["--hmc-version"] == "3": - conn.send("lssyscfg -r lpar -m " + options["--managed"] + " -n " + options["--plug"] + " -F name,state\n") - - # First line (command) may cause parsing issues if long - conn.readline() - conn.log_expect(options["--command-prompt"], int(options["--power-timeout"])) - - try: - status = re.compile("^" + options["--plug"] + ",(.*?),.*$", - re.IGNORECASE | re.MULTILINE).search(conn.before).group(1) - except AttributeError as e: - logging.error("Failed: {}".format(str(e))) - fail(EC_STATUS_HMC) + command = "lssyscfg -r lpar -m " + options["--managed"] + " -n " + options["--plug"] + " -F name,state\n" elif options["--hmc-version"] in ["4", "IVM"]: - conn.send("lssyscfg -r lpar -m "+ options["--managed"] + - " --filter 'lpar_names=" + options["--plug"] + "'\n") + command = "lssyscfg -r lpar -m "+ options["--managed"] + \ + " --filter 'lpar_names=" + options["--plug"] + "'\n" + else: + # Bad HMC Version cannot be reached + fail(EC_STATUS_HMC) + + conn.send(command) + # First line (command) may cause parsing issues if long + conn.readline() + conn.log_expect(options["--command-prompt"], int(options["--power-timeout"])) - # First line (command) may cause parsing issues if long - conn.readline() - conn.log_expect(options["--command-prompt"], int(options["--power-timeout"])) - - try: + try: + if options["--hmc-version"] == "3": + status = re.compile("^" + options["--plug"] + ",(.*?),.*$", + re.IGNORECASE | re.MULTILINE).search(conn.before).group(1) + elif options["--hmc-version"] in ["4", "IVM"]: status = re.compile(",state=(.*?),", re.IGNORECASE).search(conn.before).group(1) - except AttributeError as e: - logging.error("Failed: {}".format(str(e))) - fail(EC_STATUS_HMC) + except AttributeError as e: + fail_usage("Command on HMC failed: {}\n{}".format(command, str(e)), False) + fail(EC_STATUS_HMC) return _normalize_status(status) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.11.0+git.1644831027.5283cdb5/agents/raritan/fence_raritan.py new/fence-agents-4.11.0+git.1647434775.2f1b86d8/agents/raritan/fence_raritan.py --- old/fence-agents-4.11.0+git.1644831027.5283cdb5/agents/raritan/fence_raritan.py 2022-02-14 10:30:27.000000000 +0100 +++ new/fence-agents-4.11.0+git.1647434775.2f1b86d8/agents/raritan/fence_raritan.py 2022-03-16 13:46:15.000000000 +0100 @@ -6,9 +6,6 @@ from fencing import * from fencing import fspawn, fail, EC_LOGIN_DENIED, run_delay -# --plug should include path to the outlet # such as port 1: -# /system1/outlet1 - def get_power_status(conn, options): conn.send_eol("show -d properties=powerState %s" % options["--plug"]) re_status = re.compile(".*powerState is [12].*") @@ -54,6 +51,12 @@ # add support also for delay before login which is very useful for 2-node clusters run_delay(options) + # Convert pure port/plug number to /system1/outlet${plug} + try: + plug_int = int(options["--plug"]) + options["--plug"] = "/system1/outlet" + str(plug_int) + except ValueError: + pass ## ## Operate the fencing device ## We can not use fence_login(), username and passwd are sent on one line
