From c9797a58c3e4f7b120d90e5375f768f9a80980de Mon Sep 17 00:00:00 2001
From: Jan Pokorný <jpokorny@redhat.com>
Date: Thu, 12 Mar 2015 23:45:38 +0100
Subject: utils_cib + filters/ccsflat2pcsprelude: rg2hb_xsl: s/required/req
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/rm/lvm/__init__.py        |  4 ++--
 filters/cluster/rm/postgres-8/__init__.py |  2 +-
 utils_cib.py                              | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/filters/cluster/rm/lvm/__init__.py b/filters/cluster/rm/lvm/__init__.py
index d27e465..9092203 100644
--- a/filters/cluster/rm/lvm/__init__.py
+++ b/filters/cluster/rm/lvm/__init__.py
@@ -24,9 +24,9 @@ ccsflat2pcsprelude = '''\
         <!-- INSTANCE_ATTRIBUTES -->
         <instance_attributes id="{concat($Prefix, '-ATTRS')}">
 ''' + (
-            rg2hb_xsl('volgrpname', 'vg_name', required=True)
+            rg2hb_xsl('volgrpname', 'vg_name', req=True)
             +
-            rg2hb_xsl('exclusive', 'true', required=abs)
+            rg2hb_xsl('exclusive', 'true', req=abs)
 ) + '''\
         </instance_attributes>
     </xsl:when>
diff --git a/filters/cluster/rm/postgres-8/__init__.py b/filters/cluster/rm/postgres-8/__init__.py
index 80a877a..b8b035f 100644
--- a/filters/cluster/rm/postgres-8/__init__.py
+++ b/filters/cluster/rm/postgres-8/__init__.py
@@ -26,7 +26,7 @@ ccsflat2pcsprelude = '''\
         <!-- INSTANCE_ATTRIBUTES -->
         <instance_attributes id="{concat($Prefix, '-ATTRS')}">
 ''' + (
-            rg2hb_xsl('config', 'config_file', required=True)
+            rg2hb_xsl('config', 'config_file', req=True)
             +
             rg2hb_xsl('start_opt', 'postmaster_options')
             +
diff --git a/utils_cib.py b/utils_cib.py
index 1170cc8..76a5012 100644
--- a/utils_cib.py
+++ b/utils_cib.py
@@ -64,22 +64,22 @@ class ResourceSpec(object):
         return ret
 
 
-def rg2hb_xsl(dst, src, required=False, op=False):
+def rg2hb_xsl(dst, src, req=False, op=False):
     """Emit XSL snippet yielding nvpair-encoded HB RA parameter from RG one
 
     Parameters:
-        required    valid values: False, True, abs (use raw `src` instead)
+        req    valid values: False, True, abs (use raw `src` instead)
     """
-    assert required in (False, True, abs), "Invalid `required` param"
+    assert req in (False, True, abs), "Invalid `req` param"
     return (('''\
             <xsl:if test="@{src}">
-''' if not required else '') + (('''\
+''' if not req else '') + (('''\
             <!-- {dst} ~ {src} -->
             <nvpair id="{{concat($Prefix, '-ATTRS-{dst}')}}"
                     name="{dst}"
 ''' + ('''\
                     value="{{@{src}}}"/>
-''' if required is not abs else '''\
+''' if req is not abs else '''\
                     value="{src}"/>
 ''')) if not op else ('''\
             <!-- op:{dst} ~ {src} -->
@@ -88,8 +88,8 @@ def rg2hb_xsl(dst, src, required=False, op=False):
                 interval="0"
 ''' + ('''\
                 timeout="{{concat(@{src}, 's')}}"/>
-''' if required is not abs else '''\
+''' if req is not abs else '''\
                 timeout="{src}"/>
 '''))) + ('''\
             </xsl:if>
-''' if not required else '')).format(dst=dst, src=src)
+''' if not req else '')).format(dst=dst, src=src)
-- 
cgit