From 26067c4c48828ae0a26da08860d0ab95fbfca6c9 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Thu, 5 May 2022 12:38:58 +0200
Subject: [PATCH] - fence_ibm_vpc: remove unused instance parameter and make
 limit   optional   Resolves: rhbz#2081235

---
 bz2081235-fence_ibm_vpc-fix-parameters.patch | 65 ++++++++++++++++++++
 fence-agents.spec                            |  9 ++-
 2 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 bz2081235-fence_ibm_vpc-fix-parameters.patch

diff --git a/bz2081235-fence_ibm_vpc-fix-parameters.patch b/bz2081235-fence_ibm_vpc-fix-parameters.patch
new file mode 100644
index 0000000..5e031ad
--- /dev/null
+++ b/bz2081235-fence_ibm_vpc-fix-parameters.patch
@@ -0,0 +1,65 @@
+From d0254345472c9415af1e06e9e8df2fe0ce464db0 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Mon, 2 May 2022 11:14:42 +0200
+Subject: [PATCH] fence_ibm_vpc: remove unused instance parameter and make
+ limit optional
+
+---
+ agents/ibm_vpc/fence_ibm_vpc.py       | 11 +----------
+ tests/data/metadata/fence_ibm_vpc.xml |  7 +------
+ 2 files changed, 2 insertions(+), 16 deletions(-)
+
+diff --git a/agents/ibm_vpc/fence_ibm_vpc.py b/agents/ibm_vpc/fence_ibm_vpc.py
+index 9f84f7b2d..9e38e8301 100755
+--- a/agents/ibm_vpc/fence_ibm_vpc.py
++++ b/agents/ibm_vpc/fence_ibm_vpc.py
+@@ -161,14 +161,6 @@ def define_new_opts():
+ 		"shortdesc" : "API Key",
+ 		"order" : 0
+ 	}
+-	all_opt["instance"] = {
+-		"getopt" : ":",
+-		"longopt" : "instance",
+-		"help" : "--instance=[instance]          Cloud Instance",
+-		"required" : "1",
+-		"shortdesc" : "Cloud Instance",
+-		"order" : 0
+-	}
+ 	all_opt["region"] = {
+ 		"getopt" : ":",
+ 		"longopt" : "region",
+@@ -181,7 +173,7 @@ def define_new_opts():
+ 		"getopt" : ":",
+ 		"longopt" : "limit",
+ 		"help" : "--limit=[number]               Limit number of nodes returned by API",
+-		"required" : "1",
++		"required" : "0",
+ 		"default": 50,
+ 		"shortdesc" : "Number of nodes returned by API",
+ 		"order" : 0
+@@ -191,7 +183,6 @@ def define_new_opts():
+ def main():
+ 	device_opt = [
+ 		"apikey",
+-		"instance",
+ 		"region",
+ 		"limit",
+ 		"port",
+diff --git a/tests/data/metadata/fence_ibm_vpc.xml b/tests/data/metadata/fence_ibm_vpc.xml
+index 926efcaa0..ee7151673 100644
+--- a/tests/data/metadata/fence_ibm_vpc.xml
++++ b/tests/data/metadata/fence_ibm_vpc.xml
+@@ -8,12 +8,7 @@
+ 		<content type="string"  />
+ 		<shortdesc lang="en">API Key</shortdesc>
+ 	</parameter>
+-	<parameter name="instance" unique="0" required="1">
+-		<getopt mixed="--instance=[instance]" />
+-		<content type="string"  />
+-		<shortdesc lang="en">Cloud Instance</shortdesc>
+-	</parameter>
+-	<parameter name="limit" unique="0" required="1">
++	<parameter name="limit" unique="0" required="0">
+ 		<getopt mixed="--limit=[number]" />
+ 		<content type="string" default="50"  />
+ 		<shortdesc lang="en">Number of nodes returned by API</shortdesc>
diff --git a/fence-agents.spec b/fence-agents.spec
index 7cf8ff1..a94ee7e 100644
--- a/fence-agents.spec
+++ b/fence-agents.spec
@@ -59,7 +59,7 @@
 Name: fence-agents
 Summary: Set of unified programs capable of host isolation ("fencing")
 Version: 4.10.0
-Release: 22%{?alphatag:.%{alphatag}}%{?dist}
+Release: 23%{?alphatag:.%{alphatag}}%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: https://github.com/ClusterLabs/fence-agents
 Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.gz
@@ -236,6 +236,7 @@ Patch19: bz2022334-fence_zvmip-add-disable-ssl.patch
 Patch20: bz2065114-fence_lpar-refactor.patch
 Patch21: bz2072420-all-agents-unify-ssl-parameters.patch
 Patch22: bz2079889-fence_gce-update.patch
+Patch23: bz2081235-fence_ibm_vpc-fix-parameters.patch
 
 %global supportedagents amt_ws apc apc_snmp bladecenter brocade cisco_mds cisco_ucs compute drac5 eaton_snmp emerson eps evacuate hpblade ibmblade ibm_powervs ibm_vpc ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan kdump kubevirt lpar mpath redfish rhevm rsa rsb sbd scsi vmware_rest vmware_soap wti
 %ifarch x86_64
@@ -369,6 +370,7 @@ BuildRequires: %{systemd_units}
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 
 # prevent compilation of something that won't get used anyway
 sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac
@@ -1460,6 +1462,11 @@ are located on corosync cluster nodes.
 %endif
 
 %changelog
+* Thu May  5 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-23
+- fence_ibm_vpc: remove unused instance parameter and make limit
+  optional
+  Resolves: rhbz#2081235
+
 * Fri Apr 29 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-22
 - all agents: unify ssl parameters to avoid having to use --ssl when
   using --ssl-secure/--ssl-insecure for some agents