From 98f60a846ef12affc612063b733e40be45a9a284 Mon Sep 17 00:00:00 2001
From: Marek 'marx' Grac <mgrac@redhat.com>
Date: Tue, 9 Feb 2016 10:11:23 +0100
Subject: [PATCH 4/4] fence_cisco_ucs: Re-order options in XML metadata
RHEL7 uses different ordering than master branch
---
tests/data/metadata/fence_cisco_ucs.xml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/tests/data/metadata/fence_cisco_ucs.xml b/tests/data/metadata/fence_cisco_ucs.xml
index 7114694..067966a 100644
--- a/tests/data/metadata/fence_cisco_ucs.xml
+++ b/tests/data/metadata/fence_cisco_ucs.xml
@@ -13,6 +13,11 @@
<content type="boolean" />
<shortdesc lang="en">Disable TLS negotiation, force SSL 3.0</shortdesc>
</parameter>
+ <parameter name="suborg" unique="0" required="0">
+ <getopt mixed="--suborg=[path]" />
+ <content type="string" />
+ <shortdesc lang="en">Additional path needed to access suborganization</shortdesc>
+ </parameter>
<parameter name="ssl_secure" unique="0" required="0">
<getopt mixed="--ssl-secure" />
<content type="boolean" />
@@ -53,11 +58,6 @@
<content type="boolean" />
<shortdesc lang="en">SSL connection</shortdesc>
</parameter>
- <parameter name="suborg" unique="0" required="0">
- <getopt mixed="--suborg=[path]" />
- <content type="string" />
- <shortdesc lang="en">Additional path needed to access suborganization</shortdesc>
- </parameter>
<parameter name="ssl_insecure" unique="0" required="0">
<getopt mixed="--ssl-insecure" />
<content type="boolean" />
@@ -108,11 +108,6 @@
<content type="string" default="5" />
<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
</parameter>
- <parameter name="missing_as_off" unique="0" required="0">
- <getopt mixed="--missing-as-off" />
- <content type="boolean" />
- <shortdesc lang="en">Missing port returns OFF instead of failure</shortdesc>
- </parameter>
<parameter name="power_timeout" unique="0" required="0">
<getopt mixed="--power-timeout=[seconds]" />
<content type="string" default="20" />
@@ -123,6 +118,11 @@
<content type="string" default="0" />
<shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
</parameter>
+ <parameter name="missing_as_off" unique="0" required="0">
+ <getopt mixed="--missing-as-off" />
+ <content type="boolean" />
+ <shortdesc lang="en">Missing port returns OFF instead of failure</shortdesc>
+ </parameter>
<parameter name="shell_timeout" unique="0" required="0">
<getopt mixed="--shell-timeout=[seconds]" />
<content type="string" default="3" />
--
2.4.3