From ffe1725e6a0df8a976b4b4df32bab189122566db Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Wed, 17 Sep 2025 12:34:52 +0200
Subject: [PATCH] - fence_ibm_powervs: update description of api-type parameter
 to show   correct default value   Resolves: RHEL-114752

---
 ..._powervs-update-api-type-description.patch | 35 +++++++------------
 fence-agents.spec                             |  4 +--
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/RHEL-114752-fence_ibm_powervs-update-api-type-description.patch b/RHEL-114752-fence_ibm_powervs-update-api-type-description.patch
index 9d402ab..1a7788c 100644
--- a/RHEL-114752-fence_ibm_powervs-update-api-type-description.patch
+++ b/RHEL-114752-fence_ibm_powervs-update-api-type-description.patch
@@ -1,19 +1,19 @@
-From 604b4aa99a644c11f94f22562370fafc98d6bfbb Mon Sep 17 00:00:00 2001
+From f0b9a79b4c17ba3d98cf4dad9e15391595535f90 Mon Sep 17 00:00:00 2001
 From: Oyvind Albrigtsen <oalbrigt@redhat.com>
 Date: Mon, 25 Aug 2025 13:28:59 +0200
 Subject: [PATCH] fence_ibm_powervs: update description of api-type parameter
  to show correct default value
 
 ---
- agents/ibm_powervs/fence_ibm_powervs.py   |  7 ++++---
- tests/data/metadata/fence_ibm_powervs.xml | 18 ++++++++++++------
- 2 files changed, 16 insertions(+), 9 deletions(-)
+ agents/ibm_powervs/fence_ibm_powervs.py   | 6 +++---
+ tests/data/metadata/fence_ibm_powervs.xml | 8 ++++----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/agents/ibm_powervs/fence_ibm_powervs.py b/agents/ibm_powervs/fence_ibm_powervs.py
-index d408e8727..aa7d66b57 100755
+index d408e8727..b4d3bdc32 100755
 --- a/agents/ibm_powervs/fence_ibm_powervs.py
 +++ b/agents/ibm_powervs/fence_ibm_powervs.py
-@@ -258,9 +258,11 @@ def define_new_opts():
+@@ -258,9 +258,10 @@ def define_new_opts():
  	all_opt["api-type"] = {
  		"getopt" : ":",
  		"longopt" : "api-type",
@@ -22,12 +22,11 @@ index d408e8727..aa7d66b57 100755
  		"required" : "0",
 -		"shortdesc" : "API-type (public|private)",
 +		"shortdesc" : "API-type (private|public)",
-+		"choices" : ["private", "public"],
 +		"default" : "private",
  		"order" : 0
  	}
  	all_opt["proxy"] = {
-@@ -293,7 +295,6 @@ def main():
+@@ -293,7 +294,6 @@ def main():
  	all_opt["power_timeout"]["default"] = "120"
  	all_opt["power_wait"]["default"] = "15"
  	all_opt["stonith_status_sleep"]["default"] = "10"
@@ -36,32 +35,24 @@ index d408e8727..aa7d66b57 100755
  
  	options = check_input(device_opt, process_input(device_opt))
 diff --git a/tests/data/metadata/fence_ibm_powervs.xml b/tests/data/metadata/fence_ibm_powervs.xml
-index ec59e1b53..62f5c34ff 100644
+index ec59e1b53..2298d60cd 100644
 --- a/tests/data/metadata/fence_ibm_powervs.xml
 +++ b/tests/data/metadata/fence_ibm_powervs.xml
-@@ -4,14 +4,20 @@
+@@ -4,14 +4,14 @@
  <vendor-url>https://www.ibm.com</vendor-url>
  <parameters>
  	<parameter name="api-type" unique="0" required="0" deprecated="1">
 -		<getopt mixed="--api-type=[public|private]" />
--		<content type="string" default="private"  />
--		<shortdesc lang="en">API-type (public|private)</shortdesc>
 +		<getopt mixed="--api-type=[private|public]" />
-+		<content type="select" default="private"  >
-+			<option value="private" />
-+			<option value="public" />
-+		</content>
+ 		<content type="string" default="private"  />
+-		<shortdesc lang="en">API-type (public|private)</shortdesc>
 +		<shortdesc lang="en">API-type (private|public)</shortdesc>
  	</parameter>
  	<parameter name="api_type" unique="0" required="0" obsoletes="api-type">
 -		<getopt mixed="--api-type=[public|private]" />
--		<content type="string" default="private"  />
--		<shortdesc lang="en">API-type (public|private)</shortdesc>
 +		<getopt mixed="--api-type=[private|public]" />
-+		<content type="select" default="private"  >
-+			<option value="private" />
-+			<option value="public" />
-+		</content>
+ 		<content type="string" default="private"  />
+-		<shortdesc lang="en">API-type (public|private)</shortdesc>
 +		<shortdesc lang="en">API-type (private|public)</shortdesc>
  	</parameter>
  	<parameter name="crn" unique="0" required="1">
diff --git a/fence-agents.spec b/fence-agents.spec
index c399c13..ba8b123 100644
--- a/fence-agents.spec
+++ b/fence-agents.spec
@@ -13,7 +13,7 @@
 Name: fence-agents
 Summary: Set of unified programs capable of host isolation ("fencing")
 Version: 4.16.0
-Release: 14%{?alphatag:.%{alphatag}}%{?dist}
+Release: 15%{?alphatag:.%{alphatag}}%{?dist}
 License: GPL-2.0-or-later AND LGPL-2.0-or-later
 URL: https://github.com/ClusterLabs/fence-agents
 Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.gz
@@ -1213,7 +1213,7 @@ are located on corosync cluster nodes.
 %endif
 
 %changelog
-* Mon Sep 15 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-14
+* Wed Sep 17 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-15
 - fence_ibm_powervs: update description of api-type parameter to show
   correct default value
   Resolves: RHEL-114752