diff options
34 files changed, 95 insertions, 95 deletions
diff --git a/commands/ccs2pcs.py b/commands/ccs2pcs.py index 087220b..1a94148 100644 --- a/commands/ccs2pcs.py +++ b/commands/ccs2pcs.py @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 Red Hat, Inc. # Part of clufter project # Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt) """ccs2pcs{,-flatiron,-needle} commands""" @@ -30,10 +30,10 @@ def _check_pacemaker_1_2(cmd_ctxt): @Command.deco(('ccs2ccsflat', ('ccs2ccs-pcmk'), ('ccs-revitalize', - ('ccsflat2pcsprelude', - ('pcsprelude2pcscompact', - ('pcscompact2pcs', - ('pcs2pcsfinal'))))))) + ('ccsflat2cibprelude', + ('cibprelude2cibcompact', + ('cibcompact2cib', + ('cib2cibfinal'))))))) def ccs2pcs_flatiron(cmd_ctxt, input="/etc/cluster/cluster.conf", ccs_pcmk="cluster-{ccs2ccsflat.in.hash}.conf", @@ -76,10 +76,10 @@ def ccs2pcs_flatiron(cmd_ctxt, ('ccs2needlexml', ('xml2simpleconfig'))), ('ccs-revitalize', - ('ccsflat2pcsprelude', - ('pcsprelude2pcscompact', - ('pcscompact2pcs', - ('pcs2pcsfinal'))))))) + ('ccsflat2cibprelude', + ('cibprelude2cibcompact', + ('cibcompact2cib', + ('cib2cibfinal'))))))) def ccs2pcs_needle(cmd_ctxt, input="/etc/cluster/cluster.conf", cib="cib-{ccs2ccsflat.in.hash}.xml", diff --git a/ext-plugins/lib-pcs/filters/pcs_resource.py b/ext-plugins/lib-pcs/filters/pcs_resource.py index 87979d8..32277fa 100644 --- a/ext-plugins/lib-pcs/filters/pcs_resource.py +++ b/ext-plugins/lib-pcs/filters/pcs_resource.py @@ -19,7 +19,7 @@ def map_resource_to_pkgs(spec, *pkgs): ) -@XMLFilter.deco('pcs', 'string-list') +@XMLFilter.deco('cib', 'string-list') def pcs_resource_deps(flt_ctxt, in_obj): """Outputs set of logical dependencies based on configured resources""" return ('bytestring', flt_ctxt.ctxt_proceed_xslt(in_obj, textmode=True)) diff --git a/filters/ccsflat2pcsprelude.py b/filters/ccsflat2cibprelude.py index e764cef..6d5ee6d 100644 --- a/filters/ccsflat2pcsprelude.py +++ b/filters/ccsflat2cibprelude.py @@ -1,8 +1,8 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 Red Hat, Inc. # Part of clufter project # Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt) -"""ccsflat2pcsprelude filter""" +"""ccsflat2cibprelude filter""" __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>" from ..filter import XMLFilter @@ -10,5 +10,5 @@ from ..filter import XMLFilter # XXX temporary hack with plain ccs; # check that it is indeed ccs-flat, by exploring flt_ctxt? -@XMLFilter.deco_xslt('ccs-flat', 'pcs-prelude') -class ccsflat2pcsprelude: pass +@XMLFilter.deco_xslt('ccs-flat', 'cib-prelude') +class ccsflat2cibprelude: pass diff --git a/filters/cib/configuration/__init__.py b/filters/cib/configuration/__init__.py index 7f68e63..70525db 100644 --- a/filters/cib/configuration/__init__.py +++ b/filters/cib/configuration/__init__.py @@ -1,11 +1,11 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 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>" -pcsprelude2pcscompact = '''\ +cibprelude2cibcompact = '''\ <clufter:descent-mix preserve-rest="true"/> <!-- strip empty optional elements --> <xsl:template match="fencing-topology[count(*) = 0]"/> @@ -15,7 +15,7 @@ pcsprelude2pcscompact = '''\ from .... import package_name -pcscompact2pcs = ('''\ +cibcompact2cib = ('''\ <xsl:template match="crm_config[ not( following-sibling::resources/primitive[ diff --git a/filters/cib/configuration/resources/__init__.py b/filters/cib/configuration/resources/__init__.py index 25ed687..fe5d38d 100644 --- a/filters/cib/configuration/resources/__init__.py +++ b/filters/cib/configuration/resources/__init__.py @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 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>" @@ -8,7 +8,7 @@ __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>" from .... import package_name -pcsprelude2pcscompact = ('''\ +cibprelude2cibcompact = ('''\ <!-- SIMPLIFY FENCING/STONITH --> diff --git a/filters/cib/configuration/resources/template/__init__.py b/filters/cib/configuration/resources/template/__init__.py index 9cceaf9..a080abc 100644 --- a/filters/cib/configuration/resources/template/__init__.py +++ b/filters/cib/configuration/resources/template/__init__.py @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 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>" @@ -8,7 +8,7 @@ __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>" from .... import package_name -pcs2pcsfinal = ('''\ +cib2cibfinal = ('''\ <xsl:choose> <xsl:when test="not(@provider = '%(package_name)s' and diff --git a/filters/pcs2pcsfinal.py b/filters/cib2cibfinal.py index 34c3c0e..79480f8 100644 --- a/filters/pcs2pcsfinal.py +++ b/filters/cib2cibfinal.py @@ -1,12 +1,12 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 Red Hat, Inc. # Part of clufter project # Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt) -"""pcs2pcsfinal filter""" +"""cib2cibfinal filter""" __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>" from ..filter import XMLFilter -@XMLFilter.deco_xslt('pcs', 'pcs-final') -class pcs2pcsfinal: pass +@XMLFilter.deco_xslt('cib', 'cib-final') +class cib2cibfinal: pass diff --git a/filters/pcscompact2pcs.py b/filters/cibcompact2cib.py index e929d8d..3c5ba0d 100644 --- a/filters/pcscompact2pcs.py +++ b/filters/cibcompact2cib.py @@ -1,12 +1,12 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 Red Hat, Inc. # Part of clufter project # Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt) -"""pcscompact2pcs filter""" +"""cibcompact2cib filter""" __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>" from ..filter import XMLFilter -@XMLFilter.deco_xslt('pcs-compact', 'pcs') -class pcscompact2pcs: pass +@XMLFilter.deco_xslt('cib-compact', 'cib') +class cibcompact2cib: pass diff --git a/filters/pcsprelude2pcscompact.py b/filters/cibprelude2cibcompact.py index 1c6b73f..1363024 100644 --- a/filters/pcsprelude2pcscompact.py +++ b/filters/cibprelude2cibcompact.py @@ -1,12 +1,12 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 Red Hat, Inc. # Part of clufter project # Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt) -"""pcsprelude2pcscompact filter""" +"""cibprelude2cibcompact filter""" __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>" from ..filter import XMLFilter -@XMLFilter.deco_xslt('pcs-prelude', 'pcs-compact') -class pcsprelude2pcscompact: pass +@XMLFilter.deco_xslt('cib-prelude', 'cib-compact') +class cibprelude2cibcompact: pass diff --git a/filters/cluster/__init__.py b/filters/cluster/__init__.py index 129cdce..5a66f06 100644 --- a/filters/cluster/__init__.py +++ b/filters/cluster/__init__.py @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 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>" @@ -314,7 +314,7 @@ try: from .... import package_name, version except ValueError: from ... import package_name, version -ccsflat2pcsprelude_self_id = "{0} {1}".format(package_name(), version) +ccsflat2cibprelude_self_id = "{0} {1}".format(package_name(), version) # should roughly match the output of: # (exec 3>&1; exec >/dev/null; export CIB_shadow=test-shadow; @@ -330,7 +330,7 @@ ccsflat2pcsprelude_self_id = "{0} {1}".format(package_name(), version) # </configuration> # <status/> # </cib> -ccsflat2pcsprelude = ('''\ +ccsflat2cibprelude = ('''\ <cib validate-with="pacemaker-1.2" admin_epoch="0" epoch="0" @@ -468,7 +468,7 @@ ccsflat2pcsprelude = ('''\ </configuration> <status/> </cib> -''') % dict(self_id=ccsflat2pcsprelude_self_id) +''') % dict(self_id=ccsflat2cibprelude_self_id) ### diff --git a/filters/cluster/clusternodes/__init__.py b/filters/cluster/clusternodes/__init__.py index 91aeef2..b77813e 100644 --- a/filters/cluster/clusternodes/__init__.py +++ b/filters/cluster/clusternodes/__init__.py @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 Red Hat, Inc. # Part of clufter project # Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt) @@ -9,7 +9,7 @@ ccs2needlexml = '''\ </nodelist> ''' -ccsflat2pcsprelude = '''\ +ccsflat2cibprelude = '''\ <nodes> <clufter:descent at="clusternode"/> </nodes> diff --git a/filters/cluster/clusternodes/clusternode/__init__.py b/filters/cluster/clusternodes/clusternode/__init__.py index 5c3ff31..fd7026b 100644 --- a/filters/cluster/clusternodes/clusternode/__init__.py +++ b/filters/cluster/clusternodes/clusternode/__init__.py @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 Red Hat, Inc. # Part of clufter project # Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt) @@ -74,7 +74,7 @@ ccs2ccs_pcmk = '''\ # following could be omitted but keep it around if we ever need # to add some node attributes in the future -ccsflat2pcsprelude = '''\ +ccsflat2cibprelude = '''\ <node id="{@nodeid}" uname="{@name}" type="member" diff --git a/filters/cluster/fencedevices/fencedevice/__init__.py b/filters/cluster/fencedevices/fencedevice/__init__.py index 7f362b8..bb38fe9 100644 --- a/filters/cluster/fencedevices/fencedevice/__init__.py +++ b/filters/cluster/fencedevices/fencedevice/__init__.py @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 Red Hat, Inc. # Part of clufter project # Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt) @@ -7,7 +7,7 @@ from ....utils_xslt import xslt_is_member ### -ccsflat2pcsprelude = '''\ +ccsflat2cibprelude = '''\ <template id="{concat('FENCEDEV-', @name)}" class="stonith" type="{@agent}"> diff --git a/filters/cluster/rm/__init__.py b/filters/cluster/rm/__init__.py index 38b361d..677f79d 100644 --- a/filters/cluster/rm/__init__.py +++ b/filters/cluster/rm/__init__.py @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 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>" @@ -95,19 +95,19 @@ ccs_obfuscate_identifiers = '''\ from ....utils_cib import ResourceSpec from .... import package_name -ccsflat2pcsprelude_elems = ( +ccsflat2cibprelude_elems = ( 'service', 'vm', ) -ccsflat2pcsprelude_elems_with_res = ccsflat2pcsprelude_elems + ( +ccsflat2cibprelude_elems_with_res = ccsflat2cibprelude_elems + ( 'resources', ) -ccsflat2pcsprelude = ('''\ +ccsflat2cibprelude = ('''\ <xsl:for-each select="*[ ''' + ( - xslt_is_member('name()', ccsflat2pcsprelude_elems_with_res) + xslt_is_member('name()', ccsflat2cibprelude_elems_with_res) ) + ''']/*"> <xsl:variable name="Prefix" select="concat('RESOURCE-', name(), '-', @@ -182,7 +182,7 @@ ccsflat2pcsprelude = ('''\ <xsl:for-each select="*[ ''' + ( - xslt_is_member('name()', ccsflat2pcsprelude_elems) + xslt_is_member('name()', ccsflat2cibprelude_elems) ) + ''']"> <xsl:variable name="ResourceGroup" select="concat( diff --git a/filters/cluster/rm/_fs.py b/filters/cluster/rm/_fs.py index 28d5b17..70a95ea 100644 --- a/filters/cluster/rm/_fs.py +++ b/filters/cluster/rm/_fs.py @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 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>" @@ -21,7 +21,7 @@ try: except ValueError: from ...utils_cib import ResourceSpec -ccsflat2pcsprelude = (''' +ccsflat2cibprelude = (''' <!-- Filesystem ~ {,cluster,net}fs --> diff --git a/filters/cluster/rm/apache/__init__.py b/filters/cluster/rm/apache/__init__.py index 7a5808a..394f54c 100644 --- a/filters/cluster/rm/apache/__init__.py +++ b/filters/cluster/rm/apache/__init__.py @@ -7,7 +7,7 @@ __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>" from ....utils_cib import ResourceSpec, rg2hb_xsl -ccsflat2pcsprelude = '''\ +ccsflat2cibprelude = '''\ <!-- apache ~ apache --> diff --git a/filters/cluster/rm/bind-mount/__init__.py b/filters/cluster/rm/bind-mount/__init__.py index 8845b2e..adf7280 100644 --- a/filters/cluster/rm/bind-mount/__init__.py +++ b/filters/cluster/rm/bind-mount/__init__.py @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 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>" @@ -18,4 +18,4 @@ try: except IOError: log.error("Unable to refer to `{0}' file".format(use)) else: - ccsflat2pcsprelude = myglobals['ccsflat2pcsprelude'] + ccsflat2cibprelude = myglobals['ccsflat2cibprelude'] diff --git a/filters/cluster/rm/clusterfs/__init__.py b/filters/cluster/rm/clusterfs/__init__.py index 8845b2e..adf7280 100644 --- a/filters/cluster/rm/clusterfs/__init__.py +++ b/filters/cluster/rm/clusterfs/__init__.py @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 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>" @@ -18,4 +18,4 @@ try: except IOError: log.error("Unable to refer to `{0}' file".format(use)) else: - ccsflat2pcsprelude = myglobals['ccsflat2pcsprelude'] + ccsflat2cibprelude = myglobals['ccsflat2cibprelude'] diff --git a/filters/cluster/rm/failoverdomains/failoverdomain/__init__.py b/filters/cluster/rm/failoverdomains/failoverdomain/__init__.py index aa06b29..3d35de4 100644 --- a/filters/cluster/rm/failoverdomains/failoverdomain/__init__.py +++ b/filters/cluster/rm/failoverdomains/failoverdomain/__init__.py @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 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>" @@ -8,7 +8,7 @@ __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>" from .... import package_name -ccsflat2pcsprelude = ('''\ +ccsflat2cibprelude = ('''\ <template id="FAILOVERDOMAIN-{@name}" class="ocf" provider="%(package_name)s" diff --git a/filters/cluster/rm/fs/__init__.py b/filters/cluster/rm/fs/__init__.py index 8845b2e..adf7280 100644 --- a/filters/cluster/rm/fs/__init__.py +++ b/filters/cluster/rm/fs/__init__.py @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 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>" @@ -18,4 +18,4 @@ try: except IOError: log.error("Unable to refer to `{0}' file".format(use)) else: - ccsflat2pcsprelude = myglobals['ccsflat2pcsprelude'] + ccsflat2cibprelude = myglobals['ccsflat2cibprelude'] diff --git a/filters/cluster/rm/ip/__init__.py b/filters/cluster/rm/ip/__init__.py index 6048da4..2f9ec59 100644 --- a/filters/cluster/rm/ip/__init__.py +++ b/filters/cluster/rm/ip/__init__.py @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 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>" @@ -7,7 +7,7 @@ __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>" from ....utils_cib import ResourceSpec -ccsflat2pcsprelude = '''\ +ccsflat2cibprelude = '''\ <!-- IPAddr2 ~ ip --> diff --git a/filters/cluster/rm/lvm/__init__.py b/filters/cluster/rm/lvm/__init__.py index 9092203..10c3cc9 100644 --- a/filters/cluster/rm/lvm/__init__.py +++ b/filters/cluster/rm/lvm/__init__.py @@ -7,7 +7,7 @@ __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>" from ....utils_cib import ResourceSpec, rg2hb_xsl -ccsflat2pcsprelude = '''\ +ccsflat2cibprelude = '''\ <!-- LVM ~ lvm --> diff --git a/filters/cluster/rm/mysql/__init__.py b/filters/cluster/rm/mysql/__init__.py index 56887fe..f69fec4 100644 --- a/filters/cluster/rm/mysql/__init__.py +++ b/filters/cluster/rm/mysql/__init__.py @@ -6,7 +6,7 @@ __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>" from ....utils_cib import ResourceSpec, rg2hb_xsl -ccsflat2pcsprelude = '''\ +ccsflat2cibprelude = '''\ <!-- mysql ~ mysql --> diff --git a/filters/cluster/rm/netfs/__init__.py b/filters/cluster/rm/netfs/__init__.py index 8845b2e..adf7280 100644 --- a/filters/cluster/rm/netfs/__init__.py +++ b/filters/cluster/rm/netfs/__init__.py @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 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>" @@ -18,4 +18,4 @@ try: except IOError: log.error("Unable to refer to `{0}' file".format(use)) else: - ccsflat2pcsprelude = myglobals['ccsflat2pcsprelude'] + ccsflat2cibprelude = myglobals['ccsflat2cibprelude'] diff --git a/filters/cluster/rm/nfsserver/__init__.py b/filters/cluster/rm/nfsserver/__init__.py index 94b4482..14c9ba1 100644 --- a/filters/cluster/rm/nfsserver/__init__.py +++ b/filters/cluster/rm/nfsserver/__init__.py @@ -7,7 +7,7 @@ __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>" from ....utils_cib import ResourceSpec, rg2hb_xsl -ccsflat2pcsprelude = '''\ +ccsflat2cibprelude = '''\ <!-- nfsserver ~ nfsserver --> diff --git a/filters/cluster/rm/postgres-8/__init__.py b/filters/cluster/rm/postgres-8/__init__.py index b8b035f..5371739 100644 --- a/filters/cluster/rm/postgres-8/__init__.py +++ b/filters/cluster/rm/postgres-8/__init__.py @@ -15,7 +15,7 @@ ccs_artefacts = ''.join(( from ....utils_cib import ResourceSpec, rg2hb_xsl -ccsflat2pcsprelude = '''\ +ccsflat2cibprelude = '''\ <!-- pgsql ~ postgres-8 --> diff --git a/filters/cluster/rm/samba/__init__.py b/filters/cluster/rm/samba/__init__.py index 40bdb11..a8d3fe3 100644 --- a/filters/cluster/rm/samba/__init__.py +++ b/filters/cluster/rm/samba/__init__.py @@ -1,12 +1,12 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 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 -ccsflat2pcsprelude = '''\ +ccsflat2cibprelude = '''\ <!-- native initscript/systemd unitfile ~ samba --> diff --git a/filters/cluster/rm/script/__init__.py b/filters/cluster/rm/script/__init__.py index f52206c..158a4a5 100644 --- a/filters/cluster/rm/script/__init__.py +++ b/filters/cluster/rm/script/__init__.py @@ -8,7 +8,7 @@ __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>" from ....utils_xml import squote -ccsflat2pcsprelude = ('''\ +ccsflat2cibprelude = ('''\ <!-- lsb:<script> ~ script; starts-with(@file, '/etc/init.d/') --> diff --git a/filters/cluster/rm/tomcat-6/__init__.py b/filters/cluster/rm/tomcat-6/__init__.py index 3b26ace..ebc24df 100644 --- a/filters/cluster/rm/tomcat-6/__init__.py +++ b/filters/cluster/rm/tomcat-6/__init__.py @@ -16,7 +16,7 @@ ccs_artefacts = ''.join(( from ....utils_cib import ResourceSpec, rg2hb_xsl from ....utils_xml import squote -ccsflat2pcsprelude = ('''\ +ccsflat2cibprelude = ('''\ <!-- tomcat ~ tomcat-6 --> diff --git a/filters/cluster/rm/vm/__init__.py b/filters/cluster/rm/vm/__init__.py index 6dd3528..4c81c54 100644 --- a/filters/cluster/rm/vm/__init__.py +++ b/filters/cluster/rm/vm/__init__.py @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 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>" @@ -7,7 +7,7 @@ __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>" from ....utils_cib import ResourceSpec -ccsflat2pcsprelude = '''\ +ccsflat2cibprelude = '''\ <!-- VirtualDomain ~ vm --> diff --git a/formats/pcs.py b/formats/cib.py index 2c93d7b..574ae85 100644 --- a/formats/pcs.py +++ b/formats/cib.py @@ -1,17 +1,17 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 Red Hat, Inc. # Part of clufter project # Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt) -"""Pacemaker configuration system (pcs) format""" +"""Pacemaker configuration system/Cluster Information Base (CIB) format""" __author__ = "Jan Pokorný <jpokorny @at@ Red Hat .dot. com>" from ..format import XML -class pcs(XML): +class cib(XML): """Pacemaker-based cluster stack configuration (as XML/CIB) - Also known as Pacemaker Configuration System (pcs). + Also known as Pacemaker Configuration System (cib). """ # XML root = 'cib' @@ -20,22 +20,22 @@ class pcs(XML): } -class pcs_prelude(pcs): +class cib_prelude(cib): """Private, "unfinished" pacemaker-based cluster stack configuration - This is a result of ccsflat2pcsprelude filter. + This is a result of ccsflat2cibprelude filter. """ -class pcs_compact(pcs): +class cib_compact(cib): """Private, "unfinished" pacemaker-based cluster stack configuration - This is a result of pcsprelude2pcscompact filter. + This is a result of cibprelude2cibcompact filter. """ -class pcs_final(pcs): +class cib_final(cib): """Public, "finished" pacemaker-based cluster stack configuration - This is a result of pcs2pcsfinal filter. + This is a result of cib2cibfinal filter. """ diff --git a/tests/command.py b/tests/command.py index 7ca093d..4a4a352 100644 --- a/tests/command.py +++ b/tests/command.py @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 Red Hat, Inc. # Part of clufter project # Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt) """Testing command""" @@ -25,7 +25,7 @@ formats = formats.plugins class ChainResolve(TestCase): def testShapeAndProtocolMatch(self): filters = FilterManager.init_lookup('ccs2ccsflat', - 'ccsflat2pcsprelude', + 'ccsflat2cibprelude', 'ccs2needlexml', ext_plugins=False).plugins from tempfile import mktemp @@ -34,7 +34,7 @@ class ChainResolve(TestCase): dir=join(dirname(__file__), 'tmp')) @Command.deco(('ccs2ccsflat', - ('ccsflat2pcsprelude'), + ('ccsflat2cibprelude'), ('ccs2needlexml'))) def cmd_chain_match_01(cmd_ctxt, input=testfile, @@ -69,7 +69,7 @@ class ChainResolve(TestCase): ) ) @Command.deco(('ccs2ccsflat', - ('ccsflat2pcsprelude'), + ('ccsflat2cibprelude'), ('ccs2needlexml'), ('ccs2needlexml'))) def cmd_chain_nonmatch_02(cmd_ctxt, @@ -85,7 +85,7 @@ class ChainResolve(TestCase): ) # malformed protocol name @Command.deco(('ccs2ccsflat', - ('ccsflat2pcsprelude'), + ('ccsflat2cibprelude'), ('ccs2needlexml'))) def cmd_chain_nonmatch_03(cmd_ctxt, input=testfile, diff --git a/tests/filter_manager.py b/tests/filter_manager.py index 09f7ca2..3682423 100644 --- a/tests/filter_manager.py +++ b/tests/filter_manager.py @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 Red Hat, Inc. # Part of clufter project # Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt) """Testing filter manager""" @@ -35,10 +35,10 @@ class Default(FilterManagerTestCase): # NOTE imports has to be just there due to environment changed # by "starting from scratch" + plugin discovery elsewhere from .filters.ccs2ccsflat import ccs2ccsflat - from .filters.ccsflat2pcsprelude import ccsflat2pcsprelude + from .filters.ccsflat2cibprelude import ccsflat2cibprelude filters = self.flt_mgr.filters #print filters - for cls in ccs2ccsflat, ccsflat2pcsprelude: + for cls in ccs2ccsflat, ccsflat2cibprelude: # CHECK selected built-in plugin is auto-discovered self.assertTrue(cls.name in filters) # CHECK it's class matches the class of natively imported one diff --git a/tests/format_manager.py b/tests/format_manager.py index 7d749d2..5bfdd9c 100644 --- a/tests/format_manager.py +++ b/tests/format_manager.py @@ -1,5 +1,5 @@ # -*- coding: UTF-8 -*- -# Copyright 2014 Red Hat, Inc. +# Copyright 2015 Red Hat, Inc. # Part of clufter project # Licensed under GPLv2+ (a copy included | http://gnu.org/licenses/gpl-2.0.txt) """Testing format manager""" @@ -13,7 +13,7 @@ from unittest import TestCase from .format_manager import FormatManager from .formats.ccs import ccs from .formats.ccs import ccs_flat -from .formats.pcs import pcs +from .formats.cib import cib class FormatManagerTestCase(TestCase): @@ -29,7 +29,7 @@ class Default(FormatManagerTestCase): def test_default(self): formats = self.fmt_mgr.formats #print formats - for cls in ccs, ccs_flat, pcs: + for cls in ccs, ccs_flat, cib: self.assertTrue(cls.__name__ in formats) # the first was needed in the past, but now the more restrictive # one is ok |