File 0001-Zone-Project-parameters-are-mandatory.patch of Package fence-agents.9831

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Zone-Project-parameters-are-mandatory.patch of Package fence-agents.9831

From 7eb147411faec972989ab8741c86d7dfc25aa52a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9?= <dud225@users.noreply.github.com>
Date: Wed, 28 Feb 2018 15:51:39 +0100
Subject: [PATCH] Zone & Project parameters are mandatory

---
 fence/agents/gce/fence_gce.py     | 10 +++++-----
 tests/data/metadata/fence_gce.xml |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/fence/agents/gce/fence_gce.py b/fence/agents/gce/fence_gce.py
index fcb792d2..342745cb 100644
--- a/fence/agents/gce/fence_gce.py
+++ b/fence/agents/gce/fence_gce.py
@@ -57,17 +57,17 @@ def define_new_opts():
 	all_opt["zone"] = {
 		"getopt" : ":",
 		"longopt" : "zone",
-		"help" : "--zone=[name]            Zone, e.g. us-central1-b",
+		"help" : "--zone=[name]                  Zone, e.g. us-central1-b",
 		"shortdesc" : "Zone.",
-		"required" : "0",
+		"required" : "1",
 		"order" : 2
 	}
 	all_opt["project"] = {
 		"getopt" : ":",
 		"longopt" : "project",
-		"help" : "--project=[name]            Project",
-		"shortdesc" : "Project.",
-		"required" : "0",
+		"help" : "--project=[name]               Project ID",
+		"shortdesc" : "Project ID.",
+		"required" : "1",
 		"order" : 3
 	}
 
diff --git a/tests/data/metadata/fence_gce.xml b/tests/data/metadata/fence_gce.xml
index 0b86e66a..92374e79 100644
--- a/tests/data/metadata/fence_gce.xml
+++ b/tests/data/metadata/fence_gce.xml
@@ -20,15 +20,15 @@ For instructions see: https://cloud.google.com/compute/docs/tutorials/python-gui
 		<content type="string"  />
 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
 	</parameter>
-	<parameter name="zone" unique="0" required="0">
+	<parameter name="zone" unique="0" required="1">
 		<getopt mixed="--zone=[name]" />
 		<content type="string"  />
 		<shortdesc lang="en">Zone.</shortdesc>
 	</parameter>
-	<parameter name="project" unique="0" required="0">
+	<parameter name="project" unique="0" required="1">
 		<getopt mixed="--project=[name]" />
 		<content type="string"  />
-		<shortdesc lang="en">Project.</shortdesc>
+		<shortdesc lang="en">Project ID.</shortdesc>
 	</parameter>
 	<parameter name="quiet" unique="0" required="0">
 		<getopt mixed="-q, --quiet" />
-- 
2.16.4

Places

File 0001-Zone-Project-parameters-are-mandatory.patch of Package fence-agents.9831

Places