|
 |
3340af |
From 6b7ba7c2969169a96146c0f3ed1fa6a0b34ff00f Mon Sep 17 00:00:00 2001
|
|
|
3340af |
From: Marek 'marx' Grac <mgrac@redhat.com>
|
|
|
3340af |
Date: Mon, 1 Sep 2014 16:37:50 +0200
|
|
|
3340af |
Subject: [PATCH 2/2] [tests] Update XML metadata of fence agents
|
|
|
3340af |
|
|
|
3340af |
added --ssl-secure, --ssl-insecure
|
|
|
3340af |
---
|
|
|
3340af |
tests/data/metadata/fence_cisco_ucs.xml | 10 ++++++++++
|
|
|
3340af |
tests/data/metadata/fence_docker.xml | 10 ++++++++++
|
|
|
3340af |
tests/data/metadata/fence_ilo.xml | 10 ++++++++++
|
|
|
3340af |
tests/data/metadata/fence_ilo2.xml | 10 ++++++++++
|
|
|
3340af |
tests/data/metadata/fence_rhevm.xml | 10 ++++++++++
|
|
|
3340af |
tests/data/metadata/fence_vmware_soap.xml | 10 ++++++++++
|
|
|
3340af |
6 files changed, 60 insertions(+)
|
|
|
3340af |
|
|
|
3340af |
diff --git a/tests/data/metadata/fence_cisco_ucs.xml b/tests/data/metadata/fence_cisco_ucs.xml
|
|
|
3340af |
index 30a3cb4..75e45ce 100644
|
|
|
3340af |
--- a/tests/data/metadata/fence_cisco_ucs.xml
|
|
|
3340af |
+++ b/tests/data/metadata/fence_cisco_ucs.xml
|
|
|
3340af |
@@ -13,6 +13,11 @@
|
|
|
3340af |
<content type="boolean" />
|
|
|
3340af |
<shortdesc lang="en">Disable TLS negotiation</shortdesc>
|
|
|
3340af |
</parameter>
|
|
|
3340af |
+ <parameter name="ssl_secure" unique="0" required="0">
|
|
|
3340af |
+ <getopt mixed="--ssl-secure" />
|
|
|
3340af |
+ <content type="boolean" />
|
|
|
3340af |
+ <shortdesc lang="en">SSL connection with verifying fence device's certificate</shortdesc>
|
|
|
3340af |
+ </parameter>
|
|
|
3340af |
<parameter name="port" unique="0" required="1">
|
|
|
3340af |
<getopt mixed="-n, --plug=[id]" />
|
|
|
3340af |
<content type="string" />
|
|
|
3340af |
@@ -53,6 +58,11 @@
|
|
|
3340af |
<content type="string" />
|
|
|
3340af |
<shortdesc lang="en">Additional path needed to access suborganization</shortdesc>
|
|
|
3340af |
</parameter>
|
|
|
3340af |
+ <parameter name="ssl_insecure" unique="0" required="0">
|
|
|
3340af |
+ <getopt mixed="--ssl-insecure" />
|
|
|
3340af |
+ <content type="boolean" />
|
|
|
3340af |
+ <shortdesc lang="en">SSL connection without verifying fence device's certificate</shortdesc>
|
|
|
3340af |
+ </parameter>
|
|
|
3340af |
<parameter name="action" unique="0" required="1">
|
|
|
3340af |
<getopt mixed="-o, --action=[action]" />
|
|
|
3340af |
<content type="string" default="reboot" />
|
|
|
3340af |
diff --git a/tests/data/metadata/fence_docker.xml b/tests/data/metadata/fence_docker.xml
|
|
|
3340af |
index bda31d01..d100b8c 100644
|
|
|
3340af |
--- a/tests/data/metadata/fence_docker.xml
|
|
|
3340af |
+++ b/tests/data/metadata/fence_docker.xml
|
|
|
3340af |
@@ -8,6 +8,11 @@
|
|
|
3340af |
<content type="string" default="80" />
|
|
|
3340af |
<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
|
|
|
3340af |
</parameter>
|
|
|
3340af |
+ <parameter name="ssl_secure" unique="0" required="0">
|
|
|
3340af |
+ <getopt mixed="--ssl-secure" />
|
|
|
3340af |
+ <content type="boolean" />
|
|
|
3340af |
+ <shortdesc lang="en">SSL connection with verifying fence device's certificate</shortdesc>
|
|
|
3340af |
+ </parameter>
|
|
|
3340af |
<parameter name="port" unique="0" required="1">
|
|
|
3340af |
<getopt mixed="-n, --plug=[id]" />
|
|
|
3340af |
<content type="string" />
|
|
|
3340af |
@@ -41,6 +46,11 @@
|
|
|
3340af |
<content type="boolean" />
|
|
|
3340af |
<shortdesc lang="en">SSL connection</shortdesc>
|
|
|
3340af |
</parameter>
|
|
|
3340af |
+ <parameter name="ssl_insecure" unique="0" required="0">
|
|
|
3340af |
+ <getopt mixed="--ssl-insecure" />
|
|
|
3340af |
+ <content type="boolean" />
|
|
|
3340af |
+ <shortdesc lang="en">SSL connection without verifying fence device's certificate</shortdesc>
|
|
|
3340af |
+ </parameter>
|
|
|
3340af |
<parameter name="action" unique="0" required="1">
|
|
|
3340af |
<getopt mixed="-o, --action=[action]" />
|
|
|
3340af |
<content type="string" default="reboot" />
|
|
|
3340af |
diff --git a/tests/data/metadata/fence_ilo.xml b/tests/data/metadata/fence_ilo.xml
|
|
|
3340af |
index eb8951c..25d9d54 100644
|
|
|
3340af |
--- a/tests/data/metadata/fence_ilo.xml
|
|
|
3340af |
+++ b/tests/data/metadata/fence_ilo.xml
|
|
|
3340af |
@@ -19,6 +19,11 @@
|
|
|
3340af |
<content type="string" />
|
|
|
3340af |
<shortdesc lang="en">Force ribcl version to use</shortdesc>
|
|
|
3340af |
</parameter>
|
|
|
3340af |
+ <parameter name="ssl_secure" unique="0" required="0">
|
|
|
3340af |
+ <getopt mixed="--ssl-secure" />
|
|
|
3340af |
+ <content type="boolean" />
|
|
|
3340af |
+ <shortdesc lang="en">SSL connection with verifying fence device's certificate</shortdesc>
|
|
|
3340af |
+ </parameter>
|
|
|
3340af |
<parameter name="action" unique="0" required="1">
|
|
|
3340af |
<getopt mixed="-o, --action=[action]" />
|
|
|
3340af |
<content type="string" default="reboot" />
|
|
|
3340af |
@@ -54,6 +59,11 @@
|
|
|
3340af |
<content type="boolean" default="1" />
|
|
|
3340af |
<shortdesc lang="en">SSL connection</shortdesc>
|
|
|
3340af |
</parameter>
|
|
|
3340af |
+ <parameter name="ssl_insecure" unique="0" required="0">
|
|
|
3340af |
+ <getopt mixed="--ssl-insecure" />
|
|
|
3340af |
+ <content type="boolean" />
|
|
|
3340af |
+ <shortdesc lang="en">SSL connection without verifying fence device's certificate</shortdesc>
|
|
|
3340af |
+ </parameter>
|
|
|
3340af |
<parameter name="login" unique="0" required="1">
|
|
|
3340af |
<getopt mixed="-l, --username=[name]" />
|
|
|
3340af |
<content type="string" />
|
|
|
3340af |
diff --git a/tests/data/metadata/fence_ilo2.xml b/tests/data/metadata/fence_ilo2.xml
|
|
|
3340af |
index 4d65808..47e8e28 100644
|
|
|
3340af |
--- a/tests/data/metadata/fence_ilo2.xml
|
|
|
3340af |
+++ b/tests/data/metadata/fence_ilo2.xml
|
|
|
3340af |
@@ -19,6 +19,11 @@
|
|
|
3340af |
<content type="string" />
|
|
|
3340af |
<shortdesc lang="en">Force ribcl version to use</shortdesc>
|
|
|
3340af |
</parameter>
|
|
|
3340af |
+ <parameter name="ssl_secure" unique="0" required="0">
|
|
|
3340af |
+ <getopt mixed="--ssl-secure" />
|
|
|
3340af |
+ <content type="boolean" />
|
|
|
3340af |
+ <shortdesc lang="en">SSL connection with verifying fence device's certificate</shortdesc>
|
|
|
3340af |
+ </parameter>
|
|
|
3340af |
<parameter name="action" unique="0" required="1">
|
|
|
3340af |
<getopt mixed="-o, --action=[action]" />
|
|
|
3340af |
<content type="string" default="reboot" />
|
|
|
3340af |
@@ -54,6 +59,11 @@
|
|
|
3340af |
<content type="boolean" default="1" />
|
|
|
3340af |
<shortdesc lang="en">SSL connection</shortdesc>
|
|
|
3340af |
</parameter>
|
|
|
3340af |
+ <parameter name="ssl_insecure" unique="0" required="0">
|
|
|
3340af |
+ <getopt mixed="--ssl-insecure" />
|
|
|
3340af |
+ <content type="boolean" />
|
|
|
3340af |
+ <shortdesc lang="en">SSL connection without verifying fence device's certificate</shortdesc>
|
|
|
3340af |
+ </parameter>
|
|
|
3340af |
<parameter name="login" unique="0" required="1">
|
|
|
3340af |
<getopt mixed="-l, --username=[name]" />
|
|
|
3340af |
<content type="string" />
|
|
|
3340af |
diff --git a/tests/data/metadata/fence_rhevm.xml b/tests/data/metadata/fence_rhevm.xml
|
|
|
3340af |
index a47f025..c9d6eeb 100644
|
|
|
3340af |
--- a/tests/data/metadata/fence_rhevm.xml
|
|
|
3340af |
+++ b/tests/data/metadata/fence_rhevm.xml
|
|
|
3340af |
@@ -13,6 +13,11 @@
|
|
|
3340af |
<content type="boolean" />
|
|
|
3340af |
<shortdesc lang="en">Disable TLS negotiation</shortdesc>
|
|
|
3340af |
</parameter>
|
|
|
3340af |
+ <parameter name="ssl_secure" unique="0" required="0">
|
|
|
3340af |
+ <getopt mixed="--ssl-secure" />
|
|
|
3340af |
+ <content type="boolean" />
|
|
|
3340af |
+ <shortdesc lang="en">SSL connection with verifying fence device's certificate</shortdesc>
|
|
|
3340af |
+ </parameter>
|
|
|
3340af |
<parameter name="port" unique="0" required="1">
|
|
|
3340af |
<getopt mixed="-n, --plug=[id]" />
|
|
|
3340af |
<content type="string" />
|
|
|
3340af |
@@ -48,6 +53,11 @@
|
|
|
3340af |
<content type="boolean" />
|
|
|
3340af |
<shortdesc lang="en">SSL connection</shortdesc>
|
|
|
3340af |
</parameter>
|
|
|
3340af |
+ <parameter name="ssl_insecure" unique="0" required="0">
|
|
|
3340af |
+ <getopt mixed="--ssl-insecure" />
|
|
|
3340af |
+ <content type="boolean" />
|
|
|
3340af |
+ <shortdesc lang="en">SSL connection without verifying fence device's certificate</shortdesc>
|
|
|
3340af |
+ </parameter>
|
|
|
3340af |
<parameter name="action" unique="0" required="1">
|
|
|
3340af |
<getopt mixed="-o, --action=[action]" />
|
|
|
3340af |
<content type="string" default="reboot" />
|
|
|
3340af |
diff --git a/tests/data/metadata/fence_vmware_soap.xml b/tests/data/metadata/fence_vmware_soap.xml
|
|
|
3340af |
index 97d8fc6..d0a465f 100644
|
|
|
3340af |
--- a/tests/data/metadata/fence_vmware_soap.xml
|
|
|
3340af |
+++ b/tests/data/metadata/fence_vmware_soap.xml
|
|
|
3340af |
@@ -15,6 +15,11 @@ Name of virtual machine (-n / port) has to be used in inventory path format (e.g
|
|
|
3340af |
<content type="boolean" />
|
|
|
3340af |
<shortdesc lang="en">Disable TLS negotiation</shortdesc>
|
|
|
3340af |
</parameter>
|
|
|
3340af |
+ <parameter name="ssl_secure" unique="0" required="0">
|
|
|
3340af |
+ <getopt mixed="--ssl-secure" />
|
|
|
3340af |
+ <content type="boolean" />
|
|
|
3340af |
+ <shortdesc lang="en">SSL connection with verifying fence device's certificate</shortdesc>
|
|
|
3340af |
+ </parameter>
|
|
|
3340af |
<parameter name="port" unique="0" required="1">
|
|
|
3340af |
<getopt mixed="-n, --plug=[id]" />
|
|
|
3340af |
<content type="string" />
|
|
|
3340af |
@@ -50,6 +55,11 @@ Name of virtual machine (-n / port) has to be used in inventory path format (e.g
|
|
|
3340af |
<content type="boolean" />
|
|
|
3340af |
<shortdesc lang="en">SSL connection</shortdesc>
|
|
|
3340af |
</parameter>
|
|
|
3340af |
+ <parameter name="ssl_insecure" unique="0" required="0">
|
|
|
3340af |
+ <getopt mixed="--ssl-insecure" />
|
|
|
3340af |
+ <content type="boolean" />
|
|
|
3340af |
+ <shortdesc lang="en">SSL connection without verifying fence device's certificate</shortdesc>
|
|
|
3340af |
+ </parameter>
|
|
|
3340af |
<parameter name="action" unique="0" required="1">
|
|
|
3340af |
<getopt mixed="-o, --action=[action]" />
|
|
|
3340af |
<content type="string" default="reboot" />
|
|
|
3340af |
--
|
|
|
3340af |
1.9.3
|
|
|
3340af |
|