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