filters/*: apply highlight syntax where suitable

Also reflect that in the unit test. Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
jnpkrn · Dec 8, 2015 · a0e448b · a0e448b
1 parent 684fa22
commit a0e448b
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/filters/_2pcscmd.py b/filters/_2pcscmd.py
@@ -130,8 +130,8 @@ def coro2pcscmd(**kwargs):
 ''') % dict(
     NL=NL,
     msg_enable="NOTE: cluster infrastructure services not enabled"
-               " at this point, which can be changed any time by issuing:"
-               " pcs cluster enable --all",
+               " at this point, which can be changed any time by issuing"
+               " `pcs cluster enable --all`",
     **dict(('descent_' + k, descent(k))
            for k in ('cman', 'node', 'quorum', 'totem'))
 )
diff --git a/filters/cluster/clusternodes/clusternode/__init__.py b/filters/cluster/clusternodes/clusternode/__init__.py
@@ -38,7 +38,7 @@
                                     </xsl:otherwise>
                                 </xsl:choose>
                             <xsl:value-of select="concat(' hence not propagated (as',
-                                                         ' quorum_votes property)')"/>
+                                                         ' `quorum_votes` property)')"/>
                         </xsl:message>
                     </xsl:when>
                     <xsl:otherwise>

diff --git a/filters/cluster/cman/__init__.py b/filters/cluster/cman/__init__.py
@@ -20,7 +20,7 @@
     <xsl:if test="@expected_votes">
         <xsl:message>
             <xsl:value-of select="concat('WARNING: intentionally omitting',
-                                         ' expected_votes parameter as it',
+                                         ' `expected_votes` parameter as it',
                                          ' may be based on assumptions',
                                          ' no longer true in post-conversion',
                                          ' environment')"/>

diff --git a/filters/cluster/rm/__init__.py b/filters/cluster/rm/__init__.py
@@ -259,10 +259,11 @@
     <clufter:descent at="failoverdomain"/>
 ''') % dict(
     package_name=package_name(),
-    note_unhandled='''<xsl:value-of select="concat('WARNING: resource ', name(),
-                                                   ' is currently unhandled by',
-                                                   ' the conversion, you are',
-                                                   ' advised to copy ',
+    note_unhandled='''<xsl:value-of select="concat('WARNING: resource `',
+                                                   name(),
+                                                   '` is currently unhandled',
+                                                   ' in the conversion, you',
+                                                   ' are advised to copy ',
                                                    substring-before(
                                                        @rgmanager-meta-agent,
                                                        '.metadata'

diff --git a/filters/cluster/rm/nfsclient/__init__.py b/filters/cluster/rm/nfsclient/__init__.py
@@ -43,8 +43,8 @@
     </xsl:when>
 ''') % dict(
     note=', '.join((
-        squote("NOTE: explicitly disabling unlock_on_stop parameter so as to"
-               " preserve original behavior;"),
-        squote(" you may want to enable it, though"),
+        squote("NOTE: explicitly disabling `unlock_on_stop` parameter for"),
+        squote(" `exportfs` resource so as to preserve original `nfsclient`"),
+        squote(" resource behavior; you may want to enable it, though"),
     ))
 )
diff --git a/filters/cluster/rm/script/__init__.py b/filters/cluster/rm/script/__init__.py
@@ -36,9 +36,9 @@
     </xsl:when>
 ''') % dict(
     note=', '.join((
-        squote("NOTE: consider moving "),
+        squote("NOTE: consider moving `"),
         "@file",
-        squote(" into canonical LSB scripts location (standard: /etc/init.d/)"
+        squote("` into canonical LSB scripts location (standard: `/etc/init.d/`)"
                " + reflecting this in the configuration, perhaps even"
                " switching to an equivalent (systemd, anything OCF RA, ...)")
     ))

diff --git a/tests/filters/ccsflat2cibprelude.py b/tests/filters/ccsflat2cibprelude.py
@@ -22,7 +22,7 @@ def testNfsClient(self):
   <instance_attributes id="RESOURCE-nfsclient-test1-ATTRS">
     <nvpair id="RESOURCE-nfsclient-test1-ATTRS-clientspec" name="clientspec" value="*"/>
     <nvpair id="RESOURCE-nfsclient-test1-ATTRS-directory" name="directory" value="/srv/nfs/test1"/>
-    <!-- NOTE: explicitly disabling unlock_on_stop parameter so as to preserve original behavior; you may want to enable it, though -->
+    <!-- NOTE: explicitly disabling `unlock_on_stop` parameter for `exportfs` resource so as to preserve original `nfsclient` resource behavior; you may want to enable it, though -->
     <nvpair id="RESOURCE-nfsclient-test1-ATTRS-unlock_on_stop" name="unlock_on_stop" value="false"/>
   </instance_attributes>
   <meta_attributes id="RESOURCE-nfsclient-test1-META">
@@ -38,7 +38,7 @@ def testNfsClient(self):
     <nvpair id="RESOURCE-nfsclient-test2-ATTRS-clientspec" name="clientspec" value="*"/>
     <nvpair id="RESOURCE-nfsclient-test2-ATTRS-directory" name="directory" value="/srv/nfs/test2"/>
     <nvpair id="RESOURCE-nfsclient-test2-ATTRS-options" name="options" value="rw,async,no_root_squash"/>
-    <!-- NOTE: explicitly disabling unlock_on_stop parameter so as to preserve original behavior; you may want to enable it, though -->
+    <!-- NOTE: explicitly disabling `unlock_on_stop` parameter for `exportfs` resource so as to preserve original `nfsclient` resource behavior; you may want to enable it, though -->
     <nvpair id="RESOURCE-nfsclient-test2-ATTRS-unlock_on_stop" name="unlock_on_stop" value="false"/>
   </instance_attributes>
   <meta_attributes id="RESOURCE-nfsclient-test2-META">