File pacemaker-XML-upgrade-2.10.xsl-resource-meta_at... of Package pacemaker.21299

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker-XML-upgrade-2.10.xsl-resource-meta_attributes-tweak-diagnostic-msg.patch of Package pacemaker.21299

commit 3f7509970737b54c9e0cd2894170d7ce1f6043a5
Author: Jan Pokorný <jpokorny@redhat.com>
Date:   Mon May 14 14:01:11 2018 +0200

XML: upgrade-2.10.xsl: resource meta_attributes: tweak diagnostic msg

diff --git a/xml/test-2/060-rsc-attrs-meta-isolation.ref.err b/xml/test-2/060-rsc-attrs-meta-isolation.ref.err
index d0c86c007..32533f92f 100644
--- a/xml/test-2/060-rsc-attrs-meta-isolation.ref.err
+++ b/xml/test-2/060-rsc-attrs-meta-isolation.ref.err
@@ -1,4 +1,4 @@
-Resource meta_attributes: fake-meta_attributes-isolation-wrapper: renaming isolation-wrapper as target-role, redefined as Stopped
-Resource meta_attributes: ... isolation wrappers obsoleted with bundle resources
-Resource meta_attributes: fake-meta_attributes-isolation-wrapper2: renaming isolation-wrapper as target-role, redefined as Stopped
-Resource meta_attributes: ... isolation wrappers obsoleted with bundle resources
+Resource meta_attributes: fake (meta=fake-meta_attributes): renaming isolation-wrapper as target-role, redefined as Stopped
+Resource meta_attributes: ... i.e. resource at hand disabled; isolation wrappers obsoleted with bundle resources
+Resource meta_attributes: fake (meta=fake-meta_attributes): renaming isolation-wrapper as target-role, redefined as Stopped
+Resource meta_attributes: ... i.e. resource at hand disabled; isolation wrappers obsoleted with bundle resources
diff --git a/xml/upgrade-2.10.xsl b/xml/upgrade-2.10.xsl
index 0a0dff03c..85bf81287 100644
--- a/xml/upgrade-2.10.xsl
+++ b/xml/upgrade-2.10.xsl
@@ -173,19 +173,19 @@
     <cibtr:replace what="isolation"
                    with="target-role"
                    redefined-as="Stopped"
-                   msg-extra="isolation wrappers obsoleted with bundle resources"/>
+                   msg-extra="i.e. resource at hand disabled; isolation wrappers obsoleted with bundle resources"/>
     <cibtr:replace what="isolation-host"
                    with="target-role"
                    redefined-as="Stopped"
-                   msg-extra="isolation wrappers obsoleted with bundle resources"/>
+                   msg-extra="i.e. resource at hand disabled; isolation wrappers obsoleted with bundle resources"/>
     <cibtr:replace what="isolation-instance"
                    with="target-role"
                    redefined-as="Stopped"
-                   msg-extra="isolation wrappers obsoleted with bundle resources"/>
+                   msg-extra="i.e. resource at hand disabled; isolation wrappers obsoleted with bundle resources"/>
     <cibtr:replace what="isolation-wrapper"
                    with="target-role"
                    redefined-as="Stopped"
-                   msg-extra="isolation wrappers obsoleted with bundle resources"/>
+                   msg-extra="i.e. resource at hand disabled; isolation wrappers obsoleted with bundle resources"/>
   </cibtr:table>
 
   <!--
@@ -924,7 +924,10 @@
                               ]"/>
         <xsl:if test="not($InnerSimulation)">
           <xsl:call-template name="MapMsg">
-            <xsl:with-param name="Context" select="@id"/>
+            <xsl:with-param name="Context"
+                            select="concat(../../@id,
+                                           ' (meta=', ../@id,
+                                           ')')"/>
             <xsl:with-param name="Replacement" select="$Replacement"/>
           </xsl:call-template>
         </xsl:if>

Places

File pacemaker-XML-upgrade-2.10.xsl-resource-meta_attributes-tweak-diagnostic-msg.patch of Package pacemaker.21299

Places