packages/fence-agents
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!21 [sync] PR-20: fence_openstack: fix fail_usage() issue and a couple of other minor issues w/the newly added plug/port parameter

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @jxy_git 
Signed-off-by: @jxy_git
This commit is contained in:
openeuler-ci-bot 2023-11-02 05:56:57 +00:00 committed by Gitee
commit dd9274e238
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 83 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
0001-fix-fail_usage-issue.patch Normal file
View File

@ -0,0 +1,77 @@
From ed3ce39ac322edc0c764c8347aab79efcd6785ce Mon Sep 17 00:00:00 2001
From: wubijie <wubijie@kylinos.cn>
Date: Tue, 22 Aug 2023 19:08:34 +0800
Subject: [PATCH] fix fail_usage() issue
---
agents/openstack/fence_openstack.py | 11 ++++++-----
tests/data/metadata/fence_openstack.xml | 6 +++---
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/agents/openstack/fence_openstack.py b/agents/openstack/fence_openstack.py
index 5257ec5..1a1218c 100755
--- a/agents/openstack/fence_openstack.py
+++ b/agents/openstack/fence_openstack.py
@@ -114,7 +114,7 @@ def define_new_opts():
"longopt" : "uuid",
"help" : "--uuid=[uuid] Replaced by -n, --plug",
"required" : "0",
- "shortdesc" : "Replaced by port",
+ "shortdesc" : "Replaced by port/-n/--plug",
"order": 1
}
@@ -126,6 +126,7 @@ def main():
"port", "no_port", "uuid" ]
define_new_opts()
+ all_opt["port"]["required"] = "0"
all_opt["port"]["help"] = "-n, --plug=[UUID] UUID of the node to be fenced"
all_opt["port"]["shortdesc"] = "UUID of the node to be fenced."
@@ -138,10 +139,10 @@ def main():
if "--uuid" in options:
options["--plug"] = options["--uuid"]
del options["--uuid"]
- elif options["--action"] in ["off", "on", "reboot", "status"] \
- and "--plug" not in options:
- fail_usage("Failed: You have to enter plug number or machine identification", stop)
-
+ elif "--help" not in options and options["--action"] in ["off", "on", \
+ "reboot", "status", "validate-all"] and "--plug" not in options:
+ stop_after_error = False if options["--action"] == "validate-all" else True
+ fail_usage("Failed: You have to enter plug number or machine identification", stop_after_error)
docs = {}
docs["shortdesc"] = "Fence agent for OpenStack's Nova service"
docs["longdesc"] = "fence_openstack is a Fencing agent \
diff --git a/tests/data/metadata/fence_openstack.xml b/tests/data/metadata/fence_openstack.xml
index a7b2594..3a799f4 100644
--- a/tests/data/metadata/fence_openstack.xml
+++ b/tests/data/metadata/fence_openstack.xml
@@ -43,12 +43,12 @@
<content type="string" />
<shortdesc lang="en">Script to run to retrieve password</shortdesc>
</parameter>
- <parameter name="plug" unique="0" required="1" obsoletes="port">
+ <parameter name="plug" unique="0" required="0" obsoletes="port">
<getopt mixed="-n, --plug=[UUID]" />
<content type="string" />
<shortdesc lang="en">UUID of the node to be fenced.</shortdesc>
</parameter>
- <parameter name="port" unique="0" required="1" deprecated="1">
+ <parameter name="port" unique="0" required="0" deprecated="1">
<getopt mixed="-n, --plug=[UUID]" />
<content type="string" />
<shortdesc lang="en">UUID of the node to be fenced.</shortdesc>
@@ -91,7 +91,7 @@
<parameter name="uuid" unique="0" required="0">
<getopt mixed="--uuid=[uuid]" />
<content type="string" />
- <shortdesc lang="en">Replaced by port</shortdesc>
+ <shortdesc lang="en">Replaced by port/-n/--plig</shortdesc>
</parameter>
<parameter name="quiet" unique="0" required="0">
<getopt mixed="-q, --quiet" />
--
2.33.0

8
fence-agents.spec
View File

@ -6,14 +6,14 @@
Name: fence-agents
Summary: Set of unified programs capable of host isolation ("fencing")
Version: 4.5.0
Release: 2
Release: 3
License: GPLv2+ and LGPLv2+
Group: System Environment/Base
URL: https://github.com/ClusterLabs/fence-agents
Source0: https://github.com/ClusterLabs/fence-agents/archive/v4.5.0.tar.gz
Patch0: fix-fail_usage-issue-and-a-couple-of-other-minor-iss.patch
Patch1: 0001-fix-fail_usage-issue.patch
%global allfenceagents %(cat <<EOF
fence-agents-alom \\
fence-agents-amt \\
@ -91,6 +91,7 @@ BuildRequires: python3-google-api-client
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
%patch1 -p1
# prevent compilation of something that won't get used anyway
sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac
@ -884,6 +885,9 @@ Fence agent for IBM z/VM over IP.
%{_mandir}/man8/fence_zvmip.8*
%changelog
* Thu Aug 24 2023 wubijie <wubijie@kylinos.cn> - 4.5.0-3
- fence_openstack: fix fail_usage() issue and a couple of other minor issues w/the newly added plug/port parameter
* Wed Aug 23 2023 zhanghan <zhanghan@kylinos.cn> - 4.5.0-2
- fix fail_usage() issue and a couple of other minor issues w/the newly added plug/port parameter