From 705c778c1f672fb20645f5ff7bbe6aa8c19c1e7f Mon Sep 17 00:00:00 2001
From: Jan Pokorný <jpokorny@redhat.com>
Date: Oct 08 2014 14:43:08 +0000
Subject: filters/cluster: normalize XML/dir structure


Signed-off-by: Jan Pokorný <jpokorny@redhat.com>

---

diff --git a/filters/cluster/clusternodes/clusternode/fence/method/device.py b/filters/cluster/clusternodes/clusternode/fence/method/device.py
deleted file mode 100644
index f3ad031..0000000
--- a/filters/cluster/clusternodes/clusternode/fence/method/device.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: UTF-8 -*-
-# Copyright 2014 Red Hat, Inc.
-# Part of clufter project
-# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
-
-from logging import getLogger
-log = getLogger(__name__)
-
-# XXX a bit dirty DRY approach
-from os.path import dirname, exists, join
-use = reduce(lambda a, b: dirname(a), xrange(5), __file__)
-use = join(use, 'fencedevices', 'fencedevice')
-use = use + '.py' if exists(use + '.py') else join(use, '__init__.py')
-myglobals = {}
-try:
-    execfile(use, myglobals)
-except IOError:
-    log.error("Unable to refer to `{0}' file".format(use))
-else:
-    ccs_obfuscate_credentials = myglobals['ccs_obfuscate_credentials']
diff --git a/filters/cluster/clusternodes/clusternode/fence/method/device/__init__.py b/filters/cluster/clusternodes/clusternode/fence/method/device/__init__.py
new file mode 100644
index 0000000..6008a51
--- /dev/null
+++ b/filters/cluster/clusternodes/clusternode/fence/method/device/__init__.py
@@ -0,0 +1,20 @@
+# -*- coding: UTF-8 -*-
+# Copyright 2014 Red Hat, Inc.
+# Part of clufter project
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+
+from logging import getLogger
+log = getLogger(__name__)
+
+# XXX a bit dirty DRY approach
+from os.path import dirname, exists, join
+use = reduce(lambda a, b: dirname(a), xrange(6), __file__)
+use = join(use, 'fencedevices', 'fencedevice')
+use = use + '.py' if exists(use + '.py') else join(use, '__init__.py')
+myglobals = {}
+try:
+    execfile(use, myglobals)
+except IOError:
+    log.error("Unable to refer to `{0}' file".format(use))
+else:
+    ccs_obfuscate_credentials = myglobals['ccs_obfuscate_credentials']
diff --git a/filters/cluster/fencedevices/fencedevice.py b/filters/cluster/fencedevices/fencedevice.py
deleted file mode 100644
index 9ec6026..0000000
--- a/filters/cluster/fencedevices/fencedevice.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: UTF-8 -*-
-# Copyright 2014 Red Hat, Inc.
-# Part of clufter project
-# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
-
-ccsflat2pcs = '''\
-    <template id="{concat('FENCEDEV-', @name)}"
-              class="stonith"
-              type="{@agent}">
-        <xsl:variable name='FenceDevName' select="@name"/>
-        <instance_attributes id="{concat('FENCEDEV-', @name, '-ATTRS')}">
-        <xsl:for-each select="@*[name() != 'agent' and name() != 'name']">
-            <nvpair id="{concat('FENCEDEV-', $FenceDevName, '-ATTRS-', name())}"
-                    name="{name()}"
-                    value="{.}"/>
-        </xsl:for-each>
-        </instance_attributes>
-    </template>
-'''
-
-ccs_obfuscate_credentials = '''\
-    <xsl:copy>
-        <xsl:apply-templates select="@*"/>
-        <xsl:for-each select="@*[contains(concat(
-                '|passwd',
-                '|snmp_priv_passwd',
-                '|'), concat('|', name(), '|'))]">
-                <xsl:attribute name="{name()}">SECRET-PASSWORD</xsl:attribute>
-        </xsl:for-each>
-        <xsl:for-each select="@*[contains(concat(
-                '|login',
-                '|'), concat('|', name(), '|'))]">
-                <xsl:attribute name="{name()}">SECRET-LOGIN</xsl:attribute>
-        </xsl:for-each>
-        <xsl:apply-templates/>
-    </xsl:copy>
-'''
-
-ccs_revitalize = '''\
-    <!-- xvm: domain -> port -->
-    <xsl:template match="fencedevice[@agent = 'xvm']">
-        <xsl:copy>
-            <xsl:apply-templates select="@*"/>
-            <xsl:for-each select="@domain">
-                <xsl:attribute name="port">
-                    <xsl:value-of select="."/>
-                </xsl:attribute>
-            </xsl:for-each>
-            <xsl:apply-templates/>
-        </xsl:copy>
-    </xsl:template>
-'''
diff --git a/filters/cluster/fencedevices/fencedevice/__init__.py b/filters/cluster/fencedevices/fencedevice/__init__.py
new file mode 100644
index 0000000..9ec6026
--- /dev/null
+++ b/filters/cluster/fencedevices/fencedevice/__init__.py
@@ -0,0 +1,52 @@
+# -*- coding: UTF-8 -*-
+# Copyright 2014 Red Hat, Inc.
+# Part of clufter project
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+
+ccsflat2pcs = '''\
+    <template id="{concat('FENCEDEV-', @name)}"
+              class="stonith"
+              type="{@agent}">
+        <xsl:variable name='FenceDevName' select="@name"/>
+        <instance_attributes id="{concat('FENCEDEV-', @name, '-ATTRS')}">
+        <xsl:for-each select="@*[name() != 'agent' and name() != 'name']">
+            <nvpair id="{concat('FENCEDEV-', $FenceDevName, '-ATTRS-', name())}"
+                    name="{name()}"
+                    value="{.}"/>
+        </xsl:for-each>
+        </instance_attributes>
+    </template>
+'''
+
+ccs_obfuscate_credentials = '''\
+    <xsl:copy>
+        <xsl:apply-templates select="@*"/>
+        <xsl:for-each select="@*[contains(concat(
+                '|passwd',
+                '|snmp_priv_passwd',
+                '|'), concat('|', name(), '|'))]">
+                <xsl:attribute name="{name()}">SECRET-PASSWORD</xsl:attribute>
+        </xsl:for-each>
+        <xsl:for-each select="@*[contains(concat(
+                '|login',
+                '|'), concat('|', name(), '|'))]">
+                <xsl:attribute name="{name()}">SECRET-LOGIN</xsl:attribute>
+        </xsl:for-each>
+        <xsl:apply-templates/>
+    </xsl:copy>
+'''
+
+ccs_revitalize = '''\
+    <!-- xvm: domain -> port -->
+    <xsl:template match="fencedevice[@agent = 'xvm']">
+        <xsl:copy>
+            <xsl:apply-templates select="@*"/>
+            <xsl:for-each select="@domain">
+                <xsl:attribute name="port">
+                    <xsl:value-of select="."/>
+                </xsl:attribute>
+            </xsl:for-each>
+            <xsl:apply-templates/>
+        </xsl:copy>
+    </xsl:template>
+'''
diff --git a/filters/cluster/rm/apache.py b/filters/cluster/rm/apache.py
deleted file mode 100644
index 5fe7d61..0000000
--- a/filters/cluster/rm/apache.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# -*- coding: UTF-8 -*-
-# Copyright 2014 Red Hat, Inc.
-# Part of clufter project
-# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
-__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
-
-from ...utils_cib import ResourceSpec
-
-
-ccsflat2pcs = '''\
-    <!--
-        apache ~ apache
-     -->
-    <xsl:when test="name() = 'apache'">
-''' + \
-        ResourceSpec('ocf:heartbeat:apache').xsl_attrs \
-+ '''
-        <!-- INSTANCE_ATTRIBUTES -->
-        <instance_attributes id="{concat($Prefix, '-ATTRS')}">
-            <!-- configfile ~ config_file (if present) -->
-            <xsl:if test="@config_file">
-                <nvpair id="{concat($Prefix, '-ATTRS-configfile')}"
-                        name="configfile"
-                        value="{@config_file}"/>
-            </xsl:if>
-            <!-- options ~ httpd_options (if present; + name, server_root) -->
-            <nvpair id="{concat($Prefix, '-ATTRS-options')}"
-                    name="options"/>
-                <xsl:attribute name="value">
-                    <xsl:value-of select="concat(
-                        ' -D\&quot;', @name, '\&quot;'
-                    )"/>
-                    <xsl:if test="@server_root">
-                        <xsl:value-of select="concat(
-                            ' -d \&quot;', @server_root, '\&quot;'
-                        )"/>
-                    </xsl:if>
-                    <xsl:if test="@httpd_options">
-                        <xsl:value-of select="concat(
-                            ' ', @httpd_options
-                        )"/>
-                    </xsl:if>
-                </xsl:attribute>
-        </instance_attributes>
-
-        <!-- OPERATIONS -->
-        <operations>
-            <xsl:if test="@shutdown_wait">
-            <op id="{concat($Prefix, '-OPS-shutdown')}"
-                name="stop"
-                timeout="{concat(@shutdown_wait, 's')}"/>
-            </xsl:if>
-        </operations>
-    </xsl:when>
-'''
diff --git a/filters/cluster/rm/apache/__index__.py b/filters/cluster/rm/apache/__index__.py
new file mode 100644
index 0000000..5fe7d61
--- /dev/null
+++ b/filters/cluster/rm/apache/__index__.py
@@ -0,0 +1,55 @@
+# -*- coding: UTF-8 -*-
+# Copyright 2014 Red Hat, Inc.
+# Part of clufter project
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
+
+from ...utils_cib import ResourceSpec
+
+
+ccsflat2pcs = '''\
+    <!--
+        apache ~ apache
+     -->
+    <xsl:when test="name() = 'apache'">
+''' + \
+        ResourceSpec('ocf:heartbeat:apache').xsl_attrs \
++ '''
+        <!-- INSTANCE_ATTRIBUTES -->
+        <instance_attributes id="{concat($Prefix, '-ATTRS')}">
+            <!-- configfile ~ config_file (if present) -->
+            <xsl:if test="@config_file">
+                <nvpair id="{concat($Prefix, '-ATTRS-configfile')}"
+                        name="configfile"
+                        value="{@config_file}"/>
+            </xsl:if>
+            <!-- options ~ httpd_options (if present; + name, server_root) -->
+            <nvpair id="{concat($Prefix, '-ATTRS-options')}"
+                    name="options"/>
+                <xsl:attribute name="value">
+                    <xsl:value-of select="concat(
+                        ' -D\&quot;', @name, '\&quot;'
+                    )"/>
+                    <xsl:if test="@server_root">
+                        <xsl:value-of select="concat(
+                            ' -d \&quot;', @server_root, '\&quot;'
+                        )"/>
+                    </xsl:if>
+                    <xsl:if test="@httpd_options">
+                        <xsl:value-of select="concat(
+                            ' ', @httpd_options
+                        )"/>
+                    </xsl:if>
+                </xsl:attribute>
+        </instance_attributes>
+
+        <!-- OPERATIONS -->
+        <operations>
+            <xsl:if test="@shutdown_wait">
+            <op id="{concat($Prefix, '-OPS-shutdown')}"
+                name="stop"
+                timeout="{concat(@shutdown_wait, 's')}"/>
+            </xsl:if>
+        </operations>
+    </xsl:when>
+'''
diff --git a/filters/cluster/rm/failoverdomains/failoverdomain/failoverdomainnode.py b/filters/cluster/rm/failoverdomains/failoverdomain/failoverdomainnode.py
deleted file mode 100644
index e69de29..0000000
--- a/filters/cluster/rm/failoverdomains/failoverdomain/failoverdomainnode.py
+++ /dev/null
diff --git a/filters/cluster/rm/failoverdomains/failoverdomain/failoverdomainnode/__init__.py b/filters/cluster/rm/failoverdomains/failoverdomain/failoverdomainnode/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/filters/cluster/rm/failoverdomains/failoverdomain/failoverdomainnode/__init__.py
diff --git a/filters/cluster/rm/ip.py b/filters/cluster/rm/ip.py
deleted file mode 100644
index 3bc9253..0000000
--- a/filters/cluster/rm/ip.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: UTF-8 -*-
-# Copyright 2014 Red Hat, Inc.
-# Part of clufter project
-# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
-__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
-
-from ...utils_cib import ResourceSpec
-
-
-ccsflat2pcs = '''\
-    <!--
-        IPAddr2 ~ ip
-     -->
-    <xsl:when test="name() = 'ip'">
-        <xsl:variable name="IpAddress"
-                      select="substring-before(@address, '/')"/>
-''' + \
-        ResourceSpec('ocf:heartbeat:IPaddr2').xsl_attrs \
-+ '''
-        <!-- INSTANCE_ATTRIBUTES -->
-        <instance_attributes id="{concat($Prefix, '-ATTRS')}">
-            <!-- ip (+ cidr_netmask) ~ address -->
-            <nvpair id="{concat($Prefix, '-ATTRS-ip')}"
-                    name="ip"
-                    value="{@address}">
-                <xsl:if test="$IpAddress">
-                <xsl:attribute name="value">
-                    <xsl:value-of select="$IpAddress"/>
-                </xsl:attribute>
-                </xsl:if>
-            </nvpair>
-            <xsl:if test="$IpAddress">
-            <nvpair id="{concat($Prefix, '-ATTRS-cidr_netmask')}"
-                    name="cidr_netmask"
-                    value="{substring-after(@address, '/')}"/>
-            </xsl:if>
-        </instance_attributes>
-    </xsl:when>
-'''
diff --git a/filters/cluster/rm/ip/__index__.py b/filters/cluster/rm/ip/__index__.py
new file mode 100644
index 0000000..29b81fd
--- /dev/null
+++ b/filters/cluster/rm/ip/__index__.py
@@ -0,0 +1,39 @@
+# -*- coding: UTF-8 -*-
+# Copyright 2014 Red Hat, Inc.
+# Part of clufter project
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
+
+from ....utils_cib import ResourceSpec
+
+
+ccsflat2pcs = '''\
+    <!--
+        IPAddr2 ~ ip
+     -->
+    <xsl:when test="name() = 'ip'">
+        <xsl:variable name="IpAddress"
+                      select="substring-before(@address, '/')"/>
+''' + \
+        ResourceSpec('ocf:heartbeat:IPaddr2').xsl_attrs \
++ '''
+        <!-- INSTANCE_ATTRIBUTES -->
+        <instance_attributes id="{concat($Prefix, '-ATTRS')}">
+            <!-- ip (+ cidr_netmask) ~ address -->
+            <nvpair id="{concat($Prefix, '-ATTRS-ip')}"
+                    name="ip"
+                    value="{@address}">
+                <xsl:if test="$IpAddress">
+                <xsl:attribute name="value">
+                    <xsl:value-of select="$IpAddress"/>
+                </xsl:attribute>
+                </xsl:if>
+            </nvpair>
+            <xsl:if test="$IpAddress">
+            <nvpair id="{concat($Prefix, '-ATTRS-cidr_netmask')}"
+                    name="cidr_netmask"
+                    value="{substring-after(@address, '/')}"/>
+            </xsl:if>
+        </instance_attributes>
+    </xsl:when>
+'''
diff --git a/filters/cluster/rm/lvm.py b/filters/cluster/rm/lvm.py
deleted file mode 100644
index 675aea3..0000000
--- a/filters/cluster/rm/lvm.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- coding: UTF-8 -*-
-# Copyright 2014 Red Hat, Inc.
-# Part of clufter project
-# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
-__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
-
-from ...utils_cib import ResourceSpec
-
-
-ccsflat2pcs = '''\
-    <!--
-        LVM ~ lvm
-     -->
-    <xsl:when test="name() = 'lvm'">
-''' + \
-        ResourceSpec('ocf:heartbeat:LVM').xsl_attrs \
-+ '''
-        <!-- SHOW-STOPPERS -->
-        <xsl:if test="@lv_name">
-            <xsl:message terminate="true"
-            >Cannot convert LV binding, stick with whole VG one</xsl:message>
-        </xsl:if>
-
-        <!-- INSTANCE_ATTRIBUTES -->
-        <instance_attributes id="{concat($Prefix, '-ATTRS')}">
-            <!-- volgrpname ~ vg_name -->
-            <nvpair id="{concat($Prefix, '-ATTRS-volgrpname')}"
-                    name="volgrpname"
-                    value="{@vg_name}"/>
-            <!-- exclusive: implied -->
-            <nvpair id="{concat($Prefix, '-ATTRS-exclusive')}"
-                    name="exclusive"
-                    value="true"/>
-        </instance_attributes>
-    </xsl:when>
-'''
diff --git a/filters/cluster/rm/lvm/__index__.py b/filters/cluster/rm/lvm/__index__.py
new file mode 100644
index 0000000..a4fd064
--- /dev/null
+++ b/filters/cluster/rm/lvm/__index__.py
@@ -0,0 +1,36 @@
+# -*- coding: UTF-8 -*-
+# Copyright 2014 Red Hat, Inc.
+# Part of clufter project
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
+
+from ....utils_cib import ResourceSpec
+
+
+ccsflat2pcs = '''\
+    <!--
+        LVM ~ lvm
+     -->
+    <xsl:when test="name() = 'lvm'">
+''' + \
+        ResourceSpec('ocf:heartbeat:LVM').xsl_attrs \
++ '''
+        <!-- SHOW-STOPPERS -->
+        <xsl:if test="@lv_name">
+            <xsl:message terminate="true"
+            >Cannot convert LV binding, stick with whole VG one</xsl:message>
+        </xsl:if>
+
+        <!-- INSTANCE_ATTRIBUTES -->
+        <instance_attributes id="{concat($Prefix, '-ATTRS')}">
+            <!-- volgrpname ~ vg_name -->
+            <nvpair id="{concat($Prefix, '-ATTRS-volgrpname')}"
+                    name="volgrpname"
+                    value="{@vg_name}"/>
+            <!-- exclusive: implied -->
+            <nvpair id="{concat($Prefix, '-ATTRS-exclusive')}"
+                    name="exclusive"
+                    value="true"/>
+        </instance_attributes>
+    </xsl:when>
+'''
diff --git a/filters/cluster/rm/mysql.py b/filters/cluster/rm/mysql.py
deleted file mode 100644
index f474e92..0000000
--- a/filters/cluster/rm/mysql.py
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- coding: UTF-8 -*-
-# Copyright 2014 Red Hat, Inc.
-# Part of clufter project
-# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
-__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
-
-from ...utils_cib import ResourceSpec
-
-
-ccsflat2pcs = '''\
-    <!--
-        mysql ~ mysql
-     -->
-    <xsl:when test="name() = 'mysql'">
-''' + \
-        ResourceSpec('ocf:heartbeat:mysql').xsl_attrs \
-+ '''
-        <!-- INSTANCE_ATTRIBUTES -->
-        <instance_attributes id="{concat($Prefix, '-ATTRS')}">
-            <!-- config ~ config_file -->
-            <xsl:if test="@config_file">
-            <nvpair id="{concat($Prefix, '-ATTRS-config')}"
-                    name="config"
-                    value="{@config_file}"/>
-            </xsl:if>
-            <!-- additional_parameters ~ listen_address + mysqld_options -->
-            <xsl:if test="@listen_address or @mysqld_options">
-            <nvpair id="{concat($Prefix, '-ATTRS-additional_parameters')}"
-                    name="additional_parameters"/>
-                <xsl:attribute name="value">
-                    <xsl:if test="@listen_address">
-                        <xsl:value-of select="concat(
-                            '--bind-address=&quot;',
-                            @listen_address,
-                            '&quot; '
-                        )"/>
-                    </xsl:if>
-                    <xsl:value-of select="@mysqld_options"/>
-                </xsl:attribute>
-            </xsl:if>
-        </instance_attributes>
-    </xsl:when>
-'''
diff --git a/filters/cluster/rm/mysql/__index__.py b/filters/cluster/rm/mysql/__index__.py
new file mode 100644
index 0000000..7d5150d
--- /dev/null
+++ b/filters/cluster/rm/mysql/__index__.py
@@ -0,0 +1,43 @@
+# -*- coding: UTF-8 -*-
+# Copyright 2014 Red Hat, Inc.
+# Part of clufter project
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
+
+from ....utils_cib import ResourceSpec
+
+
+ccsflat2pcs = '''\
+    <!--
+        mysql ~ mysql
+     -->
+    <xsl:when test="name() = 'mysql'">
+''' + \
+        ResourceSpec('ocf:heartbeat:mysql').xsl_attrs \
++ '''
+        <!-- INSTANCE_ATTRIBUTES -->
+        <instance_attributes id="{concat($Prefix, '-ATTRS')}">
+            <!-- config ~ config_file -->
+            <xsl:if test="@config_file">
+            <nvpair id="{concat($Prefix, '-ATTRS-config')}"
+                    name="config"
+                    value="{@config_file}"/>
+            </xsl:if>
+            <!-- additional_parameters ~ listen_address + mysqld_options -->
+            <xsl:if test="@listen_address or @mysqld_options">
+            <nvpair id="{concat($Prefix, '-ATTRS-additional_parameters')}"
+                    name="additional_parameters"/>
+                <xsl:attribute name="value">
+                    <xsl:if test="@listen_address">
+                        <xsl:value-of select="concat(
+                            '--bind-address=&quot;',
+                            @listen_address,
+                            '&quot; '
+                        )"/>
+                    </xsl:if>
+                    <xsl:value-of select="@mysqld_options"/>
+                </xsl:attribute>
+            </xsl:if>
+        </instance_attributes>
+    </xsl:when>
+'''
diff --git a/filters/cluster/rm/nfsserver.py b/filters/cluster/rm/nfsserver.py
deleted file mode 100644
index 37f98e9..0000000
--- a/filters/cluster/rm/nfsserver.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: UTF-8 -*-
-# Copyright 2014 Red Hat, Inc.
-# Part of clufter project
-# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
-__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
-
-from ...utils_cib import ResourceSpec
-
-
-ccsflat2pcs = '''\
-    <!--
-        nfsserver ~ nfserver
-     -->
-    <xsl:when test="name() = 'nfsserver'">
-''' + \
-        ResourceSpec('ocf:heartbeat:nfsserver').xsl_attrs \
-+ '''
-        <!-- INSTANCE_ATTRIBUTES -->
-        <instance_attributes id="{concat($Prefix, '-ATTRS')}">
-            <!-- nfs_shared_infodir ~ nfspath -->
-            <xsl:if test="@nfsserver">
-            <nvpair id="{concat($Prefix, '-ATTRS-nfs_shared_infodir')}"
-                    name="nfs_shared_infodir"
-                    value="{@nfsserver}"/>
-            </xsl:if>
-        </instance_attributes>
-    </xsl:when>
-'''
diff --git a/filters/cluster/rm/nfsserver/__index__.py b/filters/cluster/rm/nfsserver/__index__.py
new file mode 100644
index 0000000..3aade64
--- /dev/null
+++ b/filters/cluster/rm/nfsserver/__index__.py
@@ -0,0 +1,28 @@
+# -*- coding: UTF-8 -*-
+# Copyright 2014 Red Hat, Inc.
+# Part of clufter project
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
+
+from ....utils_cib import ResourceSpec
+
+
+ccsflat2pcs = '''\
+    <!--
+        nfsserver ~ nfserver
+     -->
+    <xsl:when test="name() = 'nfsserver'">
+''' + \
+        ResourceSpec('ocf:heartbeat:nfsserver').xsl_attrs \
++ '''
+        <!-- INSTANCE_ATTRIBUTES -->
+        <instance_attributes id="{concat($Prefix, '-ATTRS')}">
+            <!-- nfs_shared_infodir ~ nfspath -->
+            <xsl:if test="@nfsserver">
+            <nvpair id="{concat($Prefix, '-ATTRS-nfs_shared_infodir')}"
+                    name="nfs_shared_infodir"
+                    value="{@nfsserver}"/>
+            </xsl:if>
+        </instance_attributes>
+    </xsl:when>
+'''
diff --git a/filters/cluster/rm/samba.py b/filters/cluster/rm/samba.py
deleted file mode 100644
index 4b8f659..0000000
--- a/filters/cluster/rm/samba.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: UTF-8 -*-
-# Copyright 2014 Red Hat, Inc.
-# Part of clufter project
-# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
-__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
-
-from ...utils_cib import ResourceSpec
-
-
-ccsflat2pcs = '''\
-    <!--
-        native initscript/systemd unitfile ~ samba
-     -->
-    <xsl:when test="name() = 'samba'">
-            <xsl:choose>
-                <!-- NOTE we rely on atmost single dot separator
-                     in the version, hence conformity with IEEE 754 -->
-                <xsl:when test="$system = 'linux' and (
-                    $system_1 = 'redhat' and $system_2 &gt;= 7
-                    or
-                    $system_1 = 'fedora' and $system_2 &gt;= 15
-                    )">
-''' + \
-                    ResourceSpec('systemd:smb').xsl_attrs \
-+ '''
-                </xsl:when>
-                <xsl:when test="$system = 'linux' and (
-                    $system_1 = 'redhat' and $system_2 &lt; 7
-                    or
-                    $system_1 = 'fedora' and $system_2 &lt; 15
-                    ">
-                    <!-- XXX could be either lsb, service or upstart
-                             (as far as RHEL 6 is concerned),
-                             service seems to be most canonical, though -->
-''' + \
-                    ResourceSpec('service:smb').xsl_attrs \
-+ '''
-                </xsl:when>
-                <xsl:otherwise>
-                    <xsl:message terminate="true"
-                    >Knowledge of how to start samba on your system missing</xsl:message>
-                </xsl:otherwise>
-            </xsl:choose>
-        </xsl:attribute>
-    </xsl:when>
-'''
diff --git a/filters/cluster/rm/samba/__index__.py b/filters/cluster/rm/samba/__index__.py
new file mode 100644
index 0000000..1444527
--- /dev/null
+++ b/filters/cluster/rm/samba/__index__.py
@@ -0,0 +1,46 @@
+# -*- coding: UTF-8 -*-
+# Copyright 2014 Red Hat, Inc.
+# Part of clufter project
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
+
+from ....utils_cib import ResourceSpec
+
+
+ccsflat2pcs = '''\
+    <!--
+        native initscript/systemd unitfile ~ samba
+     -->
+    <xsl:when test="name() = 'samba'">
+            <xsl:choose>
+                <!-- NOTE we rely on atmost single dot separator
+                     in the version, hence conformity with IEEE 754 -->
+                <xsl:when test="$system = 'linux' and (
+                    $system_1 = 'redhat' and $system_2 &gt;= 7
+                    or
+                    $system_1 = 'fedora' and $system_2 &gt;= 15
+                    )">
+''' + \
+                    ResourceSpec('systemd:smb').xsl_attrs \
++ '''
+                </xsl:when>
+                <xsl:when test="$system = 'linux' and (
+                    $system_1 = 'redhat' and $system_2 &lt; 7
+                    or
+                    $system_1 = 'fedora' and $system_2 &lt; 15
+                    ">
+                    <!-- XXX could be either lsb, service or upstart
+                             (as far as RHEL 6 is concerned),
+                             service seems to be most canonical, though -->
+''' + \
+                    ResourceSpec('service:smb').xsl_attrs \
++ '''
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:message terminate="true"
+                    >Knowledge of how to start samba on your system missing</xsl:message>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:attribute>
+    </xsl:when>
+'''
diff --git a/filters/cluster/rm/vm.py b/filters/cluster/rm/vm.py
deleted file mode 100644
index 6e53146..0000000
--- a/filters/cluster/rm/vm.py
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- coding: UTF-8 -*-
-# Copyright 2014 Red Hat, Inc.
-# Part of clufter project
-# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
-__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
-
-from ...utils_cib import ResourceSpec
-
-
-ccsflat2pcs = '''\
-    <!--
-        VirtualDomain ~ vm
-     -->
-    <xsl:when test="name() = 'vm'">
-''' + \
-        ResourceSpec('ocf:heartbeat:VirtualDomain').xsl_attrs \
-+ '''
-        <!-- SHOW-STOPPERS -->
-        <xsl:if test="@use_virsh = '0'">
-            <xsl:message terminate="true"
-            >Cannot reliably convert non-virsh configuration</xsl:message>
-        </xsl:if>
-
-        <!-- INSTANCE_ATTRIBUTES -->
-        <instance_attributes id="{concat($Prefix, '-ATTRS')}">
-            <!-- config ~ xmlfile -->
-            <xsl:if test="@xmlfile or @path">
-            <nvpair id="{concat($Prefix, '-ATTRS-config')}"
-                    name="config"
-                    value="{@xmlfile}">
-                <xsl:if test="not(@xmlfile)">
-                    <xsl:attribute name="value">
-                        <!-- XXX simply assume the extension -->
-                        <xsl:value-of select="concat(@path, '/', @name, '.xml')"/>
-                    </xsl:attribute>
-                </xsl:if>
-            </nvpair>
-            </xsl:if>
-            <!-- hypervisor ~ hypervisor_uri -->
-            <xsl:if test="@hypervisor_uri">
-            <nvpair id="{concat($Prefix, '-ATTRS-hypervisor')}"
-                    name="hypervisor"
-                    value="{@hypervisor_uri}"/>
-            </xsl:if>
-            <!-- snapshot ~ snapshot -->
-            <xsl:if test="@snapshot">
-            <nvpair id="{concat($Prefix, '-ATTRS-snapshot')}"
-                    name="snapshot"
-                    value="{@snapshot}"/>
-            </xsl:if>
-        </instance_attributes>
-    </xsl:when>
-'''
diff --git a/filters/cluster/rm/vm/__index__.py b/filters/cluster/rm/vm/__index__.py
new file mode 100644
index 0000000..6e53146
--- /dev/null
+++ b/filters/cluster/rm/vm/__index__.py
@@ -0,0 +1,53 @@
+# -*- coding: UTF-8 -*-
+# Copyright 2014 Red Hat, Inc.
+# Part of clufter project
+# Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt)
+__author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>"
+
+from ...utils_cib import ResourceSpec
+
+
+ccsflat2pcs = '''\
+    <!--
+        VirtualDomain ~ vm
+     -->
+    <xsl:when test="name() = 'vm'">
+''' + \
+        ResourceSpec('ocf:heartbeat:VirtualDomain').xsl_attrs \
++ '''
+        <!-- SHOW-STOPPERS -->
+        <xsl:if test="@use_virsh = '0'">
+            <xsl:message terminate="true"
+            >Cannot reliably convert non-virsh configuration</xsl:message>
+        </xsl:if>
+
+        <!-- INSTANCE_ATTRIBUTES -->
+        <instance_attributes id="{concat($Prefix, '-ATTRS')}">
+            <!-- config ~ xmlfile -->
+            <xsl:if test="@xmlfile or @path">
+            <nvpair id="{concat($Prefix, '-ATTRS-config')}"
+                    name="config"
+                    value="{@xmlfile}">
+                <xsl:if test="not(@xmlfile)">
+                    <xsl:attribute name="value">
+                        <!-- XXX simply assume the extension -->
+                        <xsl:value-of select="concat(@path, '/', @name, '.xml')"/>
+                    </xsl:attribute>
+                </xsl:if>
+            </nvpair>
+            </xsl:if>
+            <!-- hypervisor ~ hypervisor_uri -->
+            <xsl:if test="@hypervisor_uri">
+            <nvpair id="{concat($Prefix, '-ATTRS-hypervisor')}"
+                    name="hypervisor"
+                    value="{@hypervisor_uri}"/>
+            </xsl:if>
+            <!-- snapshot ~ snapshot -->
+            <xsl:if test="@snapshot">
+            <nvpair id="{concat($Prefix, '-ATTRS-snapshot')}"
+                    name="snapshot"
+                    value="{@snapshot}"/>
+            </xsl:if>
+        </instance_attributes>
+    </xsl:when>
+'''