Blame SOURCES/test-01-fix_xml_metadata.patch

e4ffb1
From 7614464c6a7df9512643b62048481d66dc1f989c Mon Sep 17 00:00:00 2001
e4ffb1
From: Marek 'marx' Grac <mgrac@redhat.com>
e4ffb1
Date: Wed, 17 Jun 2015 19:20:10 +0200
e4ffb1
Subject: [PATCH 01/10] testing: Fix XML metadata
e4ffb1
e4ffb1
---
e4ffb1
 tests/data/metadata/fence_cisco_ucs.xml   |  2 +-
e4ffb1
 tests/data/metadata/fence_compute.xml     | 10 +++++-----
e4ffb1
 tests/data/metadata/fence_rhevm.xml       |  2 +-
e4ffb1
 tests/data/metadata/fence_vmware_soap.xml |  2 +-
e4ffb1
 4 files changed, 8 insertions(+), 8 deletions(-)
e4ffb1
e4ffb1
diff --git a/tests/data/metadata/fence_cisco_ucs.xml b/tests/data/metadata/fence_cisco_ucs.xml
e4ffb1
index 75e45ce..66fc576 100644
e4ffb1
--- a/tests/data/metadata/fence_cisco_ucs.xml
e4ffb1
+++ b/tests/data/metadata/fence_cisco_ucs.xml
e4ffb1
@@ -11,7 +11,7 @@
e4ffb1
 	<parameter name="notls" unique="0" required="0">
e4ffb1
 		<getopt mixed="-t, --notls" />
e4ffb1
 		<content type="boolean"  />
e4ffb1
-		<shortdesc lang="en">Disable TLS negotiation</shortdesc>
e4ffb1
+		<shortdesc lang="en">Disable TLS negotiation, force SSL 3.0</shortdesc>
e4ffb1
 	</parameter>
e4ffb1
 	<parameter name="ssl_secure" unique="0" required="0">
e4ffb1
 		<getopt mixed="--ssl-secure" />
e4ffb1
diff --git a/tests/data/metadata/fence_compute.xml b/tests/data/metadata/fence_compute.xml
e4ffb1
index ff7c06c..f9b97fc 100644
e4ffb1
--- a/tests/data/metadata/fence_compute.xml
e4ffb1
+++ b/tests/data/metadata/fence_compute.xml
e4ffb1
@@ -23,6 +23,11 @@
e4ffb1
 		<content type="string"  />
e4ffb1
 		<shortdesc lang="en">Login password or passphrase</shortdesc>
e4ffb1
 	</parameter>
e4ffb1
+	<parameter name="endpoint-type" unique="0" required="0">
e4ffb1
+		<getopt mixed="-e, --endpoint-type=[endpoint]" />
e4ffb1
+		<content type="string" default="internalURL"  />
e4ffb1
+		<shortdesc lang="en">Nova Endpoint type</shortdesc>
e4ffb1
+	</parameter>
e4ffb1
 	<parameter name="tenant-name" unique="0" required="0">
e4ffb1
 		<getopt mixed="-t, --tenant-name=[tenant]" />
e4ffb1
 		<content type="string"  />
e4ffb1
@@ -48,11 +53,6 @@
e4ffb1
 		<content type="boolean" default="False"  />
e4ffb1
 		<shortdesc lang="en">Disable functionality for dealing with shared storage</shortdesc>
e4ffb1
 	</parameter>
e4ffb1
-	<parameter name="novatool-path" unique="0" required="0">
e4ffb1
-		<getopt mixed="-i, --novatool-path=[path]" />
e4ffb1
-		<content type="string" default="/usr/bin/nova"  />
e4ffb1
-		<shortdesc lang="en">Path to nova binary</shortdesc>
e4ffb1
-	</parameter>
e4ffb1
 	<parameter name="verbose" unique="0" required="0">
e4ffb1
 		<getopt mixed="-v, --verbose" />
e4ffb1
 		<content type="boolean"  />
e4ffb1
diff --git a/tests/data/metadata/fence_rhevm.xml b/tests/data/metadata/fence_rhevm.xml
e4ffb1
index c9d6eeb..1eccd26 100644
e4ffb1
--- a/tests/data/metadata/fence_rhevm.xml
e4ffb1
+++ b/tests/data/metadata/fence_rhevm.xml
e4ffb1
@@ -11,7 +11,7 @@
e4ffb1
 	<parameter name="notls" unique="0" required="0">
e4ffb1
 		<getopt mixed="-t, --notls" />
e4ffb1
 		<content type="boolean"  />
e4ffb1
-		<shortdesc lang="en">Disable TLS negotiation</shortdesc>
e4ffb1
+		<shortdesc lang="en">Disable TLS negotiation, force SSL 3.0</shortdesc>
e4ffb1
 	</parameter>
e4ffb1
 	<parameter name="ssl_secure" unique="0" required="0">
e4ffb1
 		<getopt mixed="--ssl-secure" />
e4ffb1
diff --git a/tests/data/metadata/fence_vmware_soap.xml b/tests/data/metadata/fence_vmware_soap.xml
e4ffb1
index d0a465f..1308c85 100644
e4ffb1
--- a/tests/data/metadata/fence_vmware_soap.xml
e4ffb1
+++ b/tests/data/metadata/fence_vmware_soap.xml
e4ffb1
@@ -13,7 +13,7 @@ Name of virtual machine (-n / port) has to be used in inventory path format (e.g
e4ffb1
 	<parameter name="notls" unique="0" required="0">
e4ffb1
 		<getopt mixed="-t, --notls" />
e4ffb1
 		<content type="boolean"  />
e4ffb1
-		<shortdesc lang="en">Disable TLS negotiation</shortdesc>
e4ffb1
+		<shortdesc lang="en">Disable TLS negotiation, force SSL 3.0</shortdesc>
e4ffb1
 	</parameter>
e4ffb1
 	<parameter name="ssl_secure" unique="0" required="0">
e4ffb1
 		<getopt mixed="--ssl-secure" />
e4ffb1
-- 
e4ffb1
1.9.3
e4ffb1