fence-agents: master - fencing: Fix invalid parsing in XML metadata
Marek GrĂ¡c
marx at fedoraproject.org
Wed Apr 16 13:05:22 UTC 2014
Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=a61329c3e6611f0b49fe3d0eef25b35080651ebe
Commit: a61329c3e6611f0b49fe3d0eef25b35080651ebe
Parent: 90ce5ac64762f54eada6cc6f4623a98e2eb493f7
Author: Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate: Wed Apr 16 15:01:11 2014 +0200
Committer: Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Wed Apr 16 15:01:11 2014 +0200
fencing: Fix invalid parsing in XML metadata
This error has no functional impact on fence agents integration.
---
fence/agents/lib/fencing.py.py | 2 +-
tests/data/metadata/fence_apc.xml | 3 +--
tests/data/metadata/fence_bladecenter.xml | 3 +--
tests/data/metadata/fence_brocade.xml | 3 +--
tests/data/metadata/fence_cisco_ucs.xml | 3 +--
tests/data/metadata/fence_drac5.xml | 3 +--
tests/data/metadata/fence_hds_cb.xml | 3 +--
tests/data/metadata/fence_hpblade.xml | 3 +--
tests/data/metadata/fence_ilo_mp.xml | 3 +--
tests/data/metadata/fence_rhevm.xml | 3 +--
tests/data/metadata/fence_rsa.xml | 3 +--
tests/data/metadata/fence_vmware_soap.xml | 3 +--
tests/data/metadata/fence_wti.xml | 3 +--
13 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index c84476f..6a30ef8 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -494,7 +494,7 @@ def metadata(avail_opt, options, docs):
mixed = all_opt[option]["help"]
## split it between option and help text
- res = re.compile(r"^(.*--\S+)\s+", re.IGNORECASE | re.S).search(mixed)
+ res = re.compile(r"^(.*?--\S+)\s+", re.IGNORECASE | re.S).search(mixed)
if None != res:
mixed = res.group(1)
mixed = mixed.replace("<", "<").replace(">", ">")
diff --git a/tests/data/metadata/fence_apc.xml b/tests/data/metadata/fence_apc.xml
index 0e6b265..441de61 100644
--- a/tests/data/metadata/fence_apc.xml
+++ b/tests/data/metadata/fence_apc.xml
@@ -4,8 +4,7 @@
<vendor-url>http://www.apc.com</vendor-url>
<parameters>
<parameter name="ipport" unique="0" required="0">
- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
- (default 23, 22 if --ssh" />
+ <getopt mixed="-u, --ipport=[port]" />
<content type="string" default="23" />
<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
</parameter>
diff --git a/tests/data/metadata/fence_bladecenter.xml b/tests/data/metadata/fence_bladecenter.xml
index 8ab7939..ec1b011 100644
--- a/tests/data/metadata/fence_bladecenter.xml
+++ b/tests/data/metadata/fence_bladecenter.xml
@@ -4,8 +4,7 @@
<vendor-url>http://www.ibm.com</vendor-url>
<parameters>
<parameter name="ipport" unique="0" required="0">
- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
- (default 23, 22 if --ssh" />
+ <getopt mixed="-u, --ipport=[port]" />
<content type="string" default="23" />
<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
</parameter>
diff --git a/tests/data/metadata/fence_brocade.xml b/tests/data/metadata/fence_brocade.xml
index 4670da8..5373d0e 100644
--- a/tests/data/metadata/fence_brocade.xml
+++ b/tests/data/metadata/fence_brocade.xml
@@ -4,8 +4,7 @@
<vendor-url>http://www.brocade.com</vendor-url>
<parameters>
<parameter name="ipport" unique="0" required="0">
- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
- (default 23, 22 if --ssh" />
+ <getopt mixed="-u, --ipport=[port]" />
<content type="string" default="23" />
<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
</parameter>
diff --git a/tests/data/metadata/fence_cisco_ucs.xml b/tests/data/metadata/fence_cisco_ucs.xml
index c5b6b37..30a3cb4 100644
--- a/tests/data/metadata/fence_cisco_ucs.xml
+++ b/tests/data/metadata/fence_cisco_ucs.xml
@@ -4,8 +4,7 @@
<vendor-url>http://www.cisco.com</vendor-url>
<parameters>
<parameter name="ipport" unique="0" required="0">
- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
- (default 80, 443 if --ssl" />
+ <getopt mixed="-u, --ipport=[port]" />
<content type="string" default="80" />
<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
</parameter>
diff --git a/tests/data/metadata/fence_drac5.xml b/tests/data/metadata/fence_drac5.xml
index a461cb6..d96484c 100644
--- a/tests/data/metadata/fence_drac5.xml
+++ b/tests/data/metadata/fence_drac5.xml
@@ -4,8 +4,7 @@
<vendor-url>http://www.dell.com</vendor-url>
<parameters>
<parameter name="ipport" unique="0" required="0">
- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
- (default 23, 22 if --ssh" />
+ <getopt mixed="-u, --ipport=[port]" />
<content type="string" default="23" />
<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
</parameter>
diff --git a/tests/data/metadata/fence_hds_cb.xml b/tests/data/metadata/fence_hds_cb.xml
index c1bb5b9..8f5279a 100644
--- a/tests/data/metadata/fence_hds_cb.xml
+++ b/tests/data/metadata/fence_hds_cb.xml
@@ -4,8 +4,7 @@
<vendor-url>http://www.hds.com</vendor-url>
<parameters>
<parameter name="ipport" unique="0" required="0">
- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
- (default 23, 22 if --ssh" />
+ <getopt mixed="-u, --ipport=[port]" />
<content type="string" default="23" />
<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
</parameter>
diff --git a/tests/data/metadata/fence_hpblade.xml b/tests/data/metadata/fence_hpblade.xml
index 255f7f3..4f0976b 100644
--- a/tests/data/metadata/fence_hpblade.xml
+++ b/tests/data/metadata/fence_hpblade.xml
@@ -4,8 +4,7 @@
<vendor-url>http://www.hp.com</vendor-url>
<parameters>
<parameter name="ipport" unique="0" required="0">
- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
- (default 23, 22 if --ssh" />
+ <getopt mixed="-u, --ipport=[port]" />
<content type="string" default="23" />
<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
</parameter>
diff --git a/tests/data/metadata/fence_ilo_mp.xml b/tests/data/metadata/fence_ilo_mp.xml
index 8960349..93503a0 100644
--- a/tests/data/metadata/fence_ilo_mp.xml
+++ b/tests/data/metadata/fence_ilo_mp.xml
@@ -4,8 +4,7 @@
<vendor-url>http://www.hp.com</vendor-url>
<parameters>
<parameter name="ipport" unique="0" required="0">
- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
- (default 23, 22 if --ssh" />
+ <getopt mixed="-u, --ipport=[port]" />
<content type="string" default="23" />
<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
</parameter>
diff --git a/tests/data/metadata/fence_rhevm.xml b/tests/data/metadata/fence_rhevm.xml
index 1324839..a47f025 100644
--- a/tests/data/metadata/fence_rhevm.xml
+++ b/tests/data/metadata/fence_rhevm.xml
@@ -4,8 +4,7 @@
<vendor-url>http://www.redhat.com</vendor-url>
<parameters>
<parameter name="ipport" unique="0" required="0">
- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
- (default 80, 443 if --ssl" />
+ <getopt mixed="-u, --ipport=[port]" />
<content type="string" default="80" />
<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
</parameter>
diff --git a/tests/data/metadata/fence_rsa.xml b/tests/data/metadata/fence_rsa.xml
index ee0421a..749b21d 100644
--- a/tests/data/metadata/fence_rsa.xml
+++ b/tests/data/metadata/fence_rsa.xml
@@ -4,8 +4,7 @@
<vendor-url>http://www.ibm.com</vendor-url>
<parameters>
<parameter name="ipport" unique="0" required="0">
- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
- (default 23, 22 if --ssh" />
+ <getopt mixed="-u, --ipport=[port]" />
<content type="string" default="23" />
<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
</parameter>
diff --git a/tests/data/metadata/fence_vmware_soap.xml b/tests/data/metadata/fence_vmware_soap.xml
index 52dedfa..97d8fc6 100644
--- a/tests/data/metadata/fence_vmware_soap.xml
+++ b/tests/data/metadata/fence_vmware_soap.xml
@@ -6,8 +6,7 @@ Name of virtual machine (-n / port) has to be used in inventory path format (e.g
<vendor-url>http://www.vmware.com</vendor-url>
<parameters>
<parameter name="ipport" unique="0" required="0">
- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
- (default 80, 443 if --ssl" />
+ <getopt mixed="-u, --ipport=[port]" />
<content type="string" default="80" />
<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
</parameter>
diff --git a/tests/data/metadata/fence_wti.xml b/tests/data/metadata/fence_wti.xml
index 0c05620..c7cb9d1 100644
--- a/tests/data/metadata/fence_wti.xml
+++ b/tests/data/metadata/fence_wti.xml
@@ -4,8 +4,7 @@
<vendor-url>http://www.wti.com</vendor-url>
<parameters>
<parameter name="ipport" unique="0" required="0">
- <getopt mixed="-u, --ipport=[port] TCP/UDP port to use
- (default 23, 22 if --ssh" />
+ <getopt mixed="-u, --ipport=[port]" />
<content type="string" default="23" />
<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
</parameter>
More information about the cluster-commits
mailing list