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