From f853e14f6ae5cb7d7cc2f75686009b37e4edbb0f Mon Sep 17 00:00:00 2001
From: Jan Pokorný <jpokorny@redhat.com>
Date: Fri, 29 May 2015 19:38:24 +0200
Subject: filters/ccs_revitalize[cluster]: simplify using xslt_is_member
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
---
 filters/cluster/__init__.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'filters/cluster')

diff --git a/filters/cluster/__init__.py b/filters/cluster/__init__.py
index 79cc592..3d7d410 100644
--- a/filters/cluster/__init__.py
+++ b/filters/cluster/__init__.py
@@ -472,6 +472,16 @@ ccsflat2cibprelude = ('''\
 
 ###
 
+# following 2nd chance import is to allow direct usage context (testing, etc.)
+try:
+    from ....utils_xslt import xslt_is_member
+except ValueError:  # Value?
+    from ...utils_xslt import xslt_is_member
+
+ccs_revitalize_fa_domain = tuple(
+    'fence_' + agent for agent in ('virt', 'xvm')
+)
+
 ccs_revitalize = '''\
     <clufter:descent-mix preserve-rest="true"/>
 
@@ -492,11 +502,10 @@ ccs_revitalize = '''\
                                     /cluster/fencedevices/fencedevice[
                                         @name = $FenceInst/@name
                                         and
-                                        (
-                                            @agent = 'fence_virt'
-                                            or
-                                            @agent = 'fence_xvm'
-                                        )
+''' + (
+                                        xslt_is_member('@agent',
+                                                       ccs_revitalize_fa_domain)
+) + '''
                                     ]">
                         <xsl:attribute name='port'>
                             <xsl:value-of select="."/>
-- 
cgit