diff options
author | Jan Pokorný <jpokorny@redhat.com> | 2016-01-22 17:04:11 +0100 |
---|---|---|
committer | Jan Pokorný <jpokorny@redhat.com> | 2016-02-01 23:53:38 +0100 |
commit | 73d3ed666d4ade1b2be24096f4bad83f40c349ab (patch) | |
tree | ff450ca1e10e9ce3d57c39ff4cdef868ed087ecd | |
parent | d614aae4fcbe2fe4fe173fa1ac5bd689c79de422 (diff) | |
download | clufter-73d3ed666d4ade1b2be24096f4bad83f40c349ab.tar.gz clufter-73d3ed666d4ade1b2be24096f4bad83f40c349ab.tar.xz clufter-73d3ed666d4ade1b2be24096f4bad83f40c349ab.zip |
filters/cib2pcscmd[...]: simplify using new attrset_xml
Fix a run-check test regression along.
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
-rw-r--r-- | filters/cib/configuration/nodes/node/__init__.py | 50 | ||||
-rw-r--r-- | filters/cib/configuration/op_defaults/__init__.py | 24 | ||||
-rw-r--r-- | filters/cib/configuration/resources/group/__init__.py | 17 | ||||
-rw-r--r-- | filters/cib/configuration/rsc_defaults/__init__.py | 24 |
4 files changed, 27 insertions, 88 deletions
diff --git a/filters/cib/configuration/nodes/node/__init__.py b/filters/cib/configuration/nodes/node/__init__.py index bd6703d..e0c6835 100644 --- a/filters/cib/configuration/nodes/node/__init__.py +++ b/filters/cib/configuration/nodes/node/__init__.py @@ -1,50 +1,26 @@ # -*- coding: UTF-8 -*- -# Copyright 2015 Red Hat, Inc. +# Copyright 2016 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 ....filters._2pcscmd import verbose_ec_test, verbose_inform from ....filters.cib2pcscmd import attrset_xsl -from ....utils_xslt import NL -cib2pcscmd = ('''\ - <xsl:if test="instance_attributes/nvpair"> -''' + ( - verbose_inform('"set properties for ", @uname, " node"') -) + ''' - <xsl:value-of select='concat($pcscmd_pcs, "property set")'/> - <xsl:value-of select="concat(' --node ', @uname)"/> -''' + ( - attrset_xsl("instance_attributes") -) + ''' - <xsl:value-of select="'%(NL)s'"/> -''' + ( - verbose_ec_test -) + ''' - </xsl:if> +cib2pcscmd = (( + attrset_xsl("instance_attributes", + cmd='$pcscmd_pcs, "property set"', + inform='"set properties for ", @uname, " node"') +) + ''' <!-- XXX "pcs resource utilization" not supported with majority of pcs versions --> - <xsl:if test="utilization/nvpair"> -''' + ( - verbose_inform('"set utilization for resource: ", @uname, " node"') -) + ''' - <xsl:value-of select="concat($pcscmd_pcs, 'node utilization -h', - ' >/dev/null', - ' && ', - $pcscmd_pcs, 'node utilization', - ' ', @uname)"/> ''' + ( - attrset_xsl("utilization") -) + ''' - <xsl:value-of select="'%(NL)s'"/> -''' + ( - verbose_ec_test -) + ''' - </xsl:if> -''') % dict( - NL=NL, -) + attrset_xsl("utilization", + cmd='$pcscmd_pcs, "node utilization -h",' + ' " >/dev/null && ",' + ' $pcscmd_pcs, "node utilization ",' + ' @uname', + inform='"set utilization for resource: ", @uname, " node"') +)) diff --git a/filters/cib/configuration/op_defaults/__init__.py b/filters/cib/configuration/op_defaults/__init__.py index 77e58a4..676760e 100644 --- a/filters/cib/configuration/op_defaults/__init__.py +++ b/filters/cib/configuration/op_defaults/__init__.py @@ -1,30 +1,16 @@ # -*- coding: UTF-8 -*- -# Copyright 2015 Red Hat, Inc. +# Copyright 2016 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 ....filters._2pcscmd import verbose_ec_test, verbose_inform from ....filters.cib2pcscmd import attrset_xsl -from ....utils_xslt import NL -cib2pcscmd = ('''\ - <xsl:if test="meta_attributes/nvpair"> -''' + ( - verbose_inform('"set operation defaults"') -) + ''' - <xsl:value-of select='concat($pcscmd_pcs, "resource op defaults")'/> -''' + ( - attrset_xsl("meta_attributes") -) + ''' - <xsl:value-of select="'%(NL)s'"/> -''' + ( - verbose_ec_test -) + ''' - </xsl:if> -''') % dict( - NL=NL, +cib2pcscmd = ( + attrset_xsl("meta_attributes", + cmd='$pcscmd_pcs, "resource op defaults"', + inform='"set operation defaults"') ) diff --git a/filters/cib/configuration/resources/group/__init__.py b/filters/cib/configuration/resources/group/__init__.py index 663dfea..e7e4e3d 100644 --- a/filters/cib/configuration/resources/group/__init__.py +++ b/filters/cib/configuration/resources/group/__init__.py @@ -22,19 +22,10 @@ cib2pcscmd = ('''\ ) + ''' <!-- meta attrs --> - <xsl:if test="meta_attributes/nvpair"> ''' + ( - verbose_inform('"meta attributes for group: ", @id') -) + ''' - <xsl:value-of select="concat($pcscmd_pcs, 'resource meta ', @id)"/> -''' + ( - attrset_xsl("meta_attributes") -) + ''' - <xsl:value-of select="'%(NL)s'"/> -''' + ( - verbose_ec_test -) + ''' - </xsl:if> -''') % dict( + attrset_xsl("meta_attributes", + cmd='$pcscmd_pcs, "resource meta ", @id', + inform='"meta attributes for group: ", @id') +)) % dict( NL=NL, ) diff --git a/filters/cib/configuration/rsc_defaults/__init__.py b/filters/cib/configuration/rsc_defaults/__init__.py index d8a868e..2f98ed6 100644 --- a/filters/cib/configuration/rsc_defaults/__init__.py +++ b/filters/cib/configuration/rsc_defaults/__init__.py @@ -1,30 +1,16 @@ # -*- coding: UTF-8 -*- -# Copyright 2015 Red Hat, Inc. +# Copyright 2016 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 ....filters._2pcscmd import verbose_ec_test, verbose_inform from ....filters.cib2pcscmd import attrset_xsl -from ....utils_xslt import NL -cib2pcscmd = ('''\ - <xsl:if test="meta_attributes/nvpair"> -''' + ( - verbose_inform('"set resource defaults"') -) + ''' - <xsl:value-of select='concat($pcscmd_pcs, "resource defaults")'/> -''' + ( - attrset_xsl("meta_attributes") -) + ''' - <xsl:value-of select="'%(NL)s'"/> -''' + ( - verbose_ec_test -) + ''' - </xsl:if> -''') % dict( - NL=NL, +cib2pcscmd = ( + attrset_xsl("meta_attributes", + cmd='$pcscmd_pcs, "resource defaults"', + inform='"set resource defaults"') ) |