Blame SOURCES/bz1760201-fence_compute-fence_evacuate-2-fix-project-shortopt.patch

6147c0
From 708d0a8e4e45d4f4a6bee67f0a9ebc0ff573e1ff Mon Sep 17 00:00:00 2001
6147c0
From: Kumabuchi Kenji <k.kumabuchi+curvygrin@gmail.com>
6147c0
Date: Fri, 25 Oct 2019 16:34:40 +0900
6147c0
Subject: [PATCH] fix shortopt in fence-compute / fence_evacuate help messages
6147c0
6147c0
Signed-off-by: Kumabuchi Kenji <k.kumabuchi+curvygrin@gmail.com>
6147c0
---
6147c0
 agents/compute/fence_compute.py        | 2 +-
6147c0
 agents/evacuate/fence_evacuate.py      | 2 +-
6147c0
 tests/data/metadata/fence_compute.xml  | 4 ++--
6147c0
 tests/data/metadata/fence_evacuate.xml | 4 ++--
6147c0
 4 files changed, 6 insertions(+), 6 deletions(-)
6147c0
6147c0
diff --git a/agents/compute/fence_compute.py b/agents/compute/fence_compute.py
6147c0
index c08a9dbe..d0e012e6 100644
6147c0
--- a/agents/compute/fence_compute.py
6147c0
+++ b/agents/compute/fence_compute.py
6147c0
@@ -365,7 +365,7 @@ def define_new_opts():
6147c0
 	all_opt["project-domain"] = {
6147c0
 		"getopt" : "P:",
6147c0
 		"longopt" : "project-domain",
6147c0
-		"help" : "-d, --project-domain=[name]    Keystone v3 Project Domain",
6147c0
+		"help" : "-P, --project-domain=[name]    Keystone v3 Project Domain",
6147c0
 		"required" : "0",
6147c0
 		"shortdesc" : "Keystone v3 Project Domain",
6147c0
 		"default" : "Default",
6147c0
diff --git a/agents/evacuate/fence_evacuate.py b/agents/evacuate/fence_evacuate.py
6147c0
index 76e78b87..60bb130e 100644
6147c0
--- a/agents/evacuate/fence_evacuate.py
6147c0
+++ b/agents/evacuate/fence_evacuate.py
6147c0
@@ -302,7 +302,7 @@ def define_new_opts():
6147c0
 	all_opt["project-domain"] = {
6147c0
 		"getopt" : "P:",
6147c0
 		"longopt" : "project-domain",
6147c0
-		"help" : "-d, --project-domain=[name]    Keystone v3 Project Domain",
6147c0
+		"help" : "-P, --project-domain=[name]    Keystone v3 Project Domain",
6147c0
 		"required" : "0",
6147c0
 		"shortdesc" : "Keystone v3 Project Domain",
6147c0
 		"default" : "Default",
6147c0
diff --git a/tests/data/metadata/fence_compute.xml b/tests/data/metadata/fence_compute.xml
6147c0
index abc276ca..99d56af0 100644
6147c0
--- a/tests/data/metadata/fence_compute.xml
6147c0
+++ b/tests/data/metadata/fence_compute.xml
6147c0
@@ -74,12 +74,12 @@
6147c0
 		<shortdesc lang="en">Allow Insecure TLS Requests</shortdesc>
6147c0
 	</parameter>
6147c0
 	<parameter name="project-domain" unique="0" required="0" deprecated="1">
6147c0
-		<getopt mixed="-d, --project-domain=[name]" />
6147c0
+		<getopt mixed="-P, --project-domain=[name]" />
6147c0
 		<content type="string" default="Default"  />
6147c0
 		<shortdesc lang="en">Keystone v3 Project Domain</shortdesc>
6147c0
 	</parameter>
6147c0
 	<parameter name="project_domain" unique="0" required="0" obsoletes="project-domain">
6147c0
-		<getopt mixed="-d, --project-domain=[name]" />
6147c0
+		<getopt mixed="-P, --project-domain=[name]" />
6147c0
 		<content type="string" default="Default"  />
6147c0
 		<shortdesc lang="en">Keystone v3 Project Domain</shortdesc>
6147c0
 	</parameter>
6147c0
diff --git a/tests/data/metadata/fence_evacuate.xml b/tests/data/metadata/fence_evacuate.xml
6147c0
index 7decb05c..8c720b80 100644
6147c0
--- a/tests/data/metadata/fence_evacuate.xml
6147c0
+++ b/tests/data/metadata/fence_evacuate.xml
6147c0
@@ -74,12 +74,12 @@
6147c0
 		<shortdesc lang="en">Allow Insecure TLS Requests</shortdesc>
6147c0
 	</parameter>
6147c0
 	<parameter name="project-domain" unique="0" required="0" deprecated="1">
6147c0
-		<getopt mixed="-d, --project-domain=[name]" />
6147c0
+		<getopt mixed="-P, --project-domain=[name]" />
6147c0
 		<content type="string" default="Default"  />
6147c0
 		<shortdesc lang="en">Keystone v3 Project Domain</shortdesc>
6147c0
 	</parameter>
6147c0
 	<parameter name="project_domain" unique="0" required="0" obsoletes="project-domain">
6147c0
-		<getopt mixed="-d, --project-domain=[name]" />
6147c0
+		<getopt mixed="-P, --project-domain=[name]" />
6147c0
 		<content type="string" default="Default"  />
6147c0
 		<shortdesc lang="en">Keystone v3 Project Domain</shortdesc>
6147c0
 	</parameter>