Blame SOURCES/025-feature-set.patch

23c78e
From cf0eebd913855f9ceda2864cbcd9cbd647fca055 Mon Sep 17 00:00:00 2001
23c78e
From: Ken Gaillot <kgaillot@redhat.com>
23c78e
Date: Wed, 13 Jan 2021 12:10:07 -0600
23c78e
Subject: [PATCH] Build: xml: rename crm_resource API file
23c78e
23c78e
5aadeaf added an API schema 2.5 for crm_resource, but API schema 2.5 was
23c78e
released with 2.0.5, so rename it to 2.6 to indicate it is a later change.
23c78e
---
23c78e
 xml/api/crm_resource-2.5.rng | 238 -------------------------------------------
23c78e
 xml/api/crm_resource-2.6.rng | 238 +++++++++++++++++++++++++++++++++++++++++++
23c78e
 2 files changed, 238 insertions(+), 238 deletions(-)
23c78e
 delete mode 100644 xml/api/crm_resource-2.5.rng
23c78e
 create mode 100644 xml/api/crm_resource-2.6.rng
23c78e
23c78e
diff --git a/xml/api/crm_resource-2.5.rng b/xml/api/crm_resource-2.5.rng
23c78e
deleted file mode 100644
23c78e
index b49e24c..0000000
23c78e
--- a/xml/api/crm_resource-2.5.rng
23c78e
+++ /dev/null
23c78e
@@ -1,238 +0,0 @@
23c78e
-
23c78e
-
23c78e
-         datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
23c78e
-
23c78e
-    <start>
23c78e
-        <ref name="element-crm-resource"/>
23c78e
-    </start>
23c78e
-
23c78e
-    <define name="element-crm-resource">
23c78e
-        <choice>
23c78e
-            <ref name="agents-list" />
23c78e
-            <ref name="alternatives-list" />
23c78e
-            <ref name="constraints-list" />
23c78e
-            <externalRef href="generic-list-2.4.rng"/>
23c78e
-            <element name="metadata"> <text/> </element>
23c78e
-            <ref name="locate-list" />
23c78e
-            <ref name="operations-list" />
23c78e
-            <ref name="providers-list" />
23c78e
-            <ref name="reasons-list" />
23c78e
-            <ref name="resource-check" />
23c78e
-            <ref name="resource-config" />
23c78e
-            <ref name="resources-list" />
23c78e
-        </choice>
23c78e
-    </define>
23c78e
-
23c78e
-    <define name="agents-list">
23c78e
-        <element name="agents">
23c78e
-            <attribute name="standard"> <text/> </attribute>
23c78e
-            <optional>
23c78e
-                <attribute name="provider"> <text/> </attribute>
23c78e
-            </optional>
23c78e
-            <zeroOrMore>
23c78e
-                <element name="agent"> <text/> </element>
23c78e
-            </zeroOrMore>
23c78e
-        </element>
23c78e
-    </define>
23c78e
-
23c78e
-    <define name="alternatives-list">
23c78e
-        <element name="providers">
23c78e
-            <attribute name="for"> <text/> </attribute>
23c78e
-            <zeroOrMore>
23c78e
-                <element name="provider"> <text/> </element>
23c78e
-            </zeroOrMore>
23c78e
-        </element>
23c78e
-    </define>
23c78e
-
23c78e
-    <define name="constraints-list">
23c78e
-        <element name="constraints">
23c78e
-            <interleave>
23c78e
-                <zeroOrMore>
23c78e
-                    <ref name="rsc-location" />
23c78e
-                </zeroOrMore>
23c78e
-                <zeroOrMore>
23c78e
-                    <ref name="rsc-colocation" />
23c78e
-                </zeroOrMore>
23c78e
-            </interleave>
23c78e
-        </element>
23c78e
-    </define>
23c78e
-
23c78e
-    <define name="locate-list">
23c78e
-        <element name="nodes">
23c78e
-            <attribute name="resource"> <text/> </attribute>
23c78e
-            <zeroOrMore>
23c78e
-                <element name="node">
23c78e
-                    <optional>
23c78e
-                        <attribute name="state"><value>promoted</value></attribute>
23c78e
-                    </optional>
23c78e
-                    <text/>
23c78e
-                </element>
23c78e
-            </zeroOrMore>
23c78e
-        </element>
23c78e
-    </define>
23c78e
-
23c78e
-    <define name="rsc-location">
23c78e
-        <element name="rsc_location">
23c78e
-            <attribute name="node"> <text/> </attribute>
23c78e
-            <attribute name="rsc"> <text/> </attribute>
23c78e
-            <attribute name="id"> <text/> </attribute>
23c78e
-            <externalRef href="../score.rng"/>
23c78e
-        </element>
23c78e
-    </define>
23c78e
-
23c78e
-    <define name="operations-list">
23c78e
-        <element name="operations">
23c78e
-            <oneOrMore>
23c78e
-                <ref name="element-operation-list" />
23c78e
-            </oneOrMore>
23c78e
-        </element>
23c78e
-    </define>
23c78e
-
23c78e
-    <define name="providers-list">
23c78e
-        <element name="providers">
23c78e
-            <attribute name="standard"> <value>ocf</value> </attribute>
23c78e
-            <optional>
23c78e
-                <attribute name="agent"> <text/> </attribute>
23c78e
-            </optional>
23c78e
-            <zeroOrMore>
23c78e
-                <element name="provider"> <text/> </element>
23c78e
-            </zeroOrMore>
23c78e
-        </element>
23c78e
-    </define>
23c78e
-
23c78e
-    <define name="reasons-list">
23c78e
-        <choice>
23c78e
-            <ref name="no-resource-or-uname"/>
23c78e
-            <ref name="resource-and-uname"/>
23c78e
-            <ref name="no-resource-but-uname"/>
23c78e
-            <ref name="resource-but-no-uname"/>
23c78e
-        </choice>
23c78e
-    </define>
23c78e
-
23c78e
-    <define name="no-resource-or-uname">
23c78e
-        <element name="reason">
23c78e
-            <element name="resources">
23c78e
-                <zeroOrMore>
23c78e
-                    <element name="resource">
23c78e
-                        <attribute name="id"> <text/> </attribute>
23c78e
-                        <attribute name="running"> <data type="boolean"/> </attribute>
23c78e
-                        <ref name="resource-check"/>
23c78e
-                    </element>
23c78e
-                </zeroOrMore>
23c78e
-            </element>
23c78e
-        </element>
23c78e
-    </define>
23c78e
-
23c78e
-    <define name="resource-and-uname">
23c78e
-        <element name="reason">
23c78e
-            <attribute name="running_on"> <text/> </attribute>
23c78e
-            <ref name="resource-check"/>
23c78e
-        </element>
23c78e
-    </define>
23c78e
-
23c78e
-    <define name="no-resource-but-uname">
23c78e
-        <element name="reason">
23c78e
-            <element name="resources">
23c78e
-                <zeroOrMore>
23c78e
-                    <element name="resource">
23c78e
-                        <attribute name="id"> <text/> </attribute>
23c78e
-                        <attribute name="running"> <data type="boolean"/> </attribute>
23c78e
-                        <attribute name="host"> <text/> </attribute>
23c78e
-                        <ref name="resource-check"/>
23c78e
-                    </element>
23c78e
-                </zeroOrMore>
23c78e
-            </element>
23c78e
-        </element>
23c78e
-    </define>
23c78e
-
23c78e
-    <define name="resource-but-no-uname">
23c78e
-        <element name="reason">
23c78e
-            <attribute name="running"> <data type="boolean"/> </attribute>
23c78e
-            <ref name="resource-check"/>
23c78e
-        </element>
23c78e
-    </define>
23c78e
-
23c78e
-    <define name="resource-config">
23c78e
-        <element name="resource_config">
23c78e
-            <externalRef href="resources-2.4.rng" />
23c78e
-            <element name="xml"> <text/> </element>
23c78e
-        </element>
23c78e
-    </define>
23c78e
-
23c78e
-    <define name="resource-check">
23c78e
-        <element name="check">
23c78e
-            <attribute name="id"> <text/> </attribute>
23c78e
-            <optional>
23c78e
-                <choice>
23c78e
-                    <attribute name="remain_stopped"><value>true</value></attribute>
23c78e
-                    <attribute name="promotable"><value>false</value></attribute>
23c78e
-                </choice>
23c78e
-            </optional>
23c78e
-            <optional>
23c78e
-                <attribute name="unmanaged"><value>true</value></attribute>
23c78e
-            </optional>
23c78e
-            <optional>
23c78e
-                <attribute name="locked-to"> <text/> </attribute>
23c78e
-            </optional>
23c78e
-        </element>
23c78e
-    </define>
23c78e
-
23c78e
-    <define name="resources-list">
23c78e
-        <element name="resources">
23c78e
-            <zeroOrMore>
23c78e
-                <externalRef href="resources-2.4.rng" />
23c78e
-            </zeroOrMore>
23c78e
-        </element>
23c78e
-    </define>
23c78e
-
23c78e
-    <define name="rsc-colocation">
23c78e
-        <element name="rsc_colocation">
23c78e
-            <attribute name="id"> <text/> </attribute>
23c78e
-            <attribute name="rsc"> <text/> </attribute>
23c78e
-            <attribute name="with-rsc"> <text/> </attribute>
23c78e
-            <externalRef href="../score.rng"/>
23c78e
-            <optional>
23c78e
-                <attribute name="node-attribute"> <text/> </attribute>
23c78e
-            </optional>
23c78e
-            <optional>
23c78e
-                <attribute name="rsc-role">
23c78e
-                    <ref name="attribute-roles"/>
23c78e
-                </attribute>
23c78e
-            </optional>
23c78e
-            <optional>
23c78e
-                <attribute name="with-rsc-role">
23c78e
-                    <ref name="attribute-roles"/>
23c78e
-                </attribute>
23c78e
-            </optional>
23c78e
-        </element>
23c78e
-    </define>
23c78e
-
23c78e
-    <define name="element-operation-list">
23c78e
-        <element name="operation">
23c78e
-            <optional>
23c78e
-                <group>
23c78e
-                    <attribute name="rsc"> <text/> </attribute>
23c78e
-                    <attribute name="agent"> <text/> </attribute>
23c78e
-                </group>
23c78e
-            </optional>
23c78e
-            <attribute name="op"> <text/> </attribute>
23c78e
-            <attribute name="node"> <text/> </attribute>
23c78e
-            <attribute name="call"> <data type="nonNegativeInteger" /> </attribute>
23c78e
-            <attribute name="rc"> <data type="nonNegativeInteger" /> </attribute>
23c78e
-            <optional>
23c78e
-                <attribute name="last-rc-change"> <text/> </attribute>
23c78e
-                <attribute name="exec-time"> <data type="nonNegativeInteger" /> </attribute>
23c78e
-            </optional>
23c78e
-            <attribute name="status"> <text/> </attribute>
23c78e
-        </element>
23c78e
-    </define>
23c78e
-
23c78e
-    <define name="attribute-roles">
23c78e
-        <choice>
23c78e
-            <value>Stopped</value>
23c78e
-            <value>Started</value>
23c78e
-            <value>Master</value>
23c78e
-            <value>Slave</value>
23c78e
-        </choice>
23c78e
-    </define>
23c78e
-</grammar>
23c78e
diff --git a/xml/api/crm_resource-2.6.rng b/xml/api/crm_resource-2.6.rng
23c78e
new file mode 100644
23c78e
index 0000000..b49e24c
23c78e
--- /dev/null
23c78e
+++ b/xml/api/crm_resource-2.6.rng
23c78e
@@ -0,0 +1,238 @@
23c78e
+
23c78e
+
23c78e
+         datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
23c78e
+
23c78e
+    <start>
23c78e
+        <ref name="element-crm-resource"/>
23c78e
+    </start>
23c78e
+
23c78e
+    <define name="element-crm-resource">
23c78e
+        <choice>
23c78e
+            <ref name="agents-list" />
23c78e
+            <ref name="alternatives-list" />
23c78e
+            <ref name="constraints-list" />
23c78e
+            <externalRef href="generic-list-2.4.rng"/>
23c78e
+            <element name="metadata"> <text/> </element>
23c78e
+            <ref name="locate-list" />
23c78e
+            <ref name="operations-list" />
23c78e
+            <ref name="providers-list" />
23c78e
+            <ref name="reasons-list" />
23c78e
+            <ref name="resource-check" />
23c78e
+            <ref name="resource-config" />
23c78e
+            <ref name="resources-list" />
23c78e
+        </choice>
23c78e
+    </define>
23c78e
+
23c78e
+    <define name="agents-list">
23c78e
+        <element name="agents">
23c78e
+            <attribute name="standard"> <text/> </attribute>
23c78e
+            <optional>
23c78e
+                <attribute name="provider"> <text/> </attribute>
23c78e
+            </optional>
23c78e
+            <zeroOrMore>
23c78e
+                <element name="agent"> <text/> </element>
23c78e
+            </zeroOrMore>
23c78e
+        </element>
23c78e
+    </define>
23c78e
+
23c78e
+    <define name="alternatives-list">
23c78e
+        <element name="providers">
23c78e
+            <attribute name="for"> <text/> </attribute>
23c78e
+            <zeroOrMore>
23c78e
+                <element name="provider"> <text/> </element>
23c78e
+            </zeroOrMore>
23c78e
+        </element>
23c78e
+    </define>
23c78e
+
23c78e
+    <define name="constraints-list">
23c78e
+        <element name="constraints">
23c78e
+            <interleave>
23c78e
+                <zeroOrMore>
23c78e
+                    <ref name="rsc-location" />
23c78e
+                </zeroOrMore>
23c78e
+                <zeroOrMore>
23c78e
+                    <ref name="rsc-colocation" />
23c78e
+                </zeroOrMore>
23c78e
+            </interleave>
23c78e
+        </element>
23c78e
+    </define>
23c78e
+
23c78e
+    <define name="locate-list">
23c78e
+        <element name="nodes">
23c78e
+            <attribute name="resource"> <text/> </attribute>
23c78e
+            <zeroOrMore>
23c78e
+                <element name="node">
23c78e
+                    <optional>
23c78e
+                        <attribute name="state"><value>promoted</value></attribute>
23c78e
+                    </optional>
23c78e
+                    <text/>
23c78e
+                </element>
23c78e
+            </zeroOrMore>
23c78e
+        </element>
23c78e
+    </define>
23c78e
+
23c78e
+    <define name="rsc-location">
23c78e
+        <element name="rsc_location">
23c78e
+            <attribute name="node"> <text/> </attribute>
23c78e
+            <attribute name="rsc"> <text/> </attribute>
23c78e
+            <attribute name="id"> <text/> </attribute>
23c78e
+            <externalRef href="../score.rng"/>
23c78e
+        </element>
23c78e
+    </define>
23c78e
+
23c78e
+    <define name="operations-list">
23c78e
+        <element name="operations">
23c78e
+            <oneOrMore>
23c78e
+                <ref name="element-operation-list" />
23c78e
+            </oneOrMore>
23c78e
+        </element>
23c78e
+    </define>
23c78e
+
23c78e
+    <define name="providers-list">
23c78e
+        <element name="providers">
23c78e
+            <attribute name="standard"> <value>ocf</value> </attribute>
23c78e
+            <optional>
23c78e
+                <attribute name="agent"> <text/> </attribute>
23c78e
+            </optional>
23c78e
+            <zeroOrMore>
23c78e
+                <element name="provider"> <text/> </element>
23c78e
+            </zeroOrMore>
23c78e
+        </element>
23c78e
+    </define>
23c78e
+
23c78e
+    <define name="reasons-list">
23c78e
+        <choice>
23c78e
+            <ref name="no-resource-or-uname"/>
23c78e
+            <ref name="resource-and-uname"/>
23c78e
+            <ref name="no-resource-but-uname"/>
23c78e
+            <ref name="resource-but-no-uname"/>
23c78e
+        </choice>
23c78e
+    </define>
23c78e
+
23c78e
+    <define name="no-resource-or-uname">
23c78e
+        <element name="reason">
23c78e
+            <element name="resources">
23c78e
+                <zeroOrMore>
23c78e
+                    <element name="resource">
23c78e
+                        <attribute name="id"> <text/> </attribute>
23c78e
+                        <attribute name="running"> <data type="boolean"/> </attribute>
23c78e
+                        <ref name="resource-check"/>
23c78e
+                    </element>
23c78e
+                </zeroOrMore>
23c78e
+            </element>
23c78e
+        </element>
23c78e
+    </define>
23c78e
+
23c78e
+    <define name="resource-and-uname">
23c78e
+        <element name="reason">
23c78e
+            <attribute name="running_on"> <text/> </attribute>
23c78e
+            <ref name="resource-check"/>
23c78e
+        </element>
23c78e
+    </define>
23c78e
+
23c78e
+    <define name="no-resource-but-uname">
23c78e
+        <element name="reason">
23c78e
+            <element name="resources">
23c78e
+                <zeroOrMore>
23c78e
+                    <element name="resource">
23c78e
+                        <attribute name="id"> <text/> </attribute>
23c78e
+                        <attribute name="running"> <data type="boolean"/> </attribute>
23c78e
+                        <attribute name="host"> <text/> </attribute>
23c78e
+                        <ref name="resource-check"/>
23c78e
+                    </element>
23c78e
+                </zeroOrMore>
23c78e
+            </element>
23c78e
+        </element>
23c78e
+    </define>
23c78e
+
23c78e
+    <define name="resource-but-no-uname">
23c78e
+        <element name="reason">
23c78e
+            <attribute name="running"> <data type="boolean"/> </attribute>
23c78e
+            <ref name="resource-check"/>
23c78e
+        </element>
23c78e
+    </define>
23c78e
+
23c78e
+    <define name="resource-config">
23c78e
+        <element name="resource_config">
23c78e
+            <externalRef href="resources-2.4.rng" />
23c78e
+            <element name="xml"> <text/> </element>
23c78e
+        </element>
23c78e
+    </define>
23c78e
+
23c78e
+    <define name="resource-check">
23c78e
+        <element name="check">
23c78e
+            <attribute name="id"> <text/> </attribute>
23c78e
+            <optional>
23c78e
+                <choice>
23c78e
+                    <attribute name="remain_stopped"><value>true</value></attribute>
23c78e
+                    <attribute name="promotable"><value>false</value></attribute>
23c78e
+                </choice>
23c78e
+            </optional>
23c78e
+            <optional>
23c78e
+                <attribute name="unmanaged"><value>true</value></attribute>
23c78e
+            </optional>
23c78e
+            <optional>
23c78e
+                <attribute name="locked-to"> <text/> </attribute>
23c78e
+            </optional>
23c78e
+        </element>
23c78e
+    </define>
23c78e
+
23c78e
+    <define name="resources-list">
23c78e
+        <element name="resources">
23c78e
+            <zeroOrMore>
23c78e
+                <externalRef href="resources-2.4.rng" />
23c78e
+            </zeroOrMore>
23c78e
+        </element>
23c78e
+    </define>
23c78e
+
23c78e
+    <define name="rsc-colocation">
23c78e
+        <element name="rsc_colocation">
23c78e
+            <attribute name="id"> <text/> </attribute>
23c78e
+            <attribute name="rsc"> <text/> </attribute>
23c78e
+            <attribute name="with-rsc"> <text/> </attribute>
23c78e
+            <externalRef href="../score.rng"/>
23c78e
+            <optional>
23c78e
+                <attribute name="node-attribute"> <text/> </attribute>
23c78e
+            </optional>
23c78e
+            <optional>
23c78e
+                <attribute name="rsc-role">
23c78e
+                    <ref name="attribute-roles"/>
23c78e
+                </attribute>
23c78e
+            </optional>
23c78e
+            <optional>
23c78e
+                <attribute name="with-rsc-role">
23c78e
+                    <ref name="attribute-roles"/>
23c78e
+                </attribute>
23c78e
+            </optional>
23c78e
+        </element>
23c78e
+    </define>
23c78e
+
23c78e
+    <define name="element-operation-list">
23c78e
+        <element name="operation">
23c78e
+            <optional>
23c78e
+                <group>
23c78e
+                    <attribute name="rsc"> <text/> </attribute>
23c78e
+                    <attribute name="agent"> <text/> </attribute>
23c78e
+                </group>
23c78e
+            </optional>
23c78e
+            <attribute name="op"> <text/> </attribute>
23c78e
+            <attribute name="node"> <text/> </attribute>
23c78e
+            <attribute name="call"> <data type="nonNegativeInteger" /> </attribute>
23c78e
+            <attribute name="rc"> <data type="nonNegativeInteger" /> </attribute>
23c78e
+            <optional>
23c78e
+                <attribute name="last-rc-change"> <text/> </attribute>
23c78e
+                <attribute name="exec-time"> <data type="nonNegativeInteger" /> </attribute>
23c78e
+            </optional>
23c78e
+            <attribute name="status"> <text/> </attribute>
23c78e
+        </element>
23c78e
+    </define>
23c78e
+
23c78e
+    <define name="attribute-roles">
23c78e
+        <choice>
23c78e
+            <value>Stopped</value>
23c78e
+            <value>Started</value>
23c78e
+            <value>Master</value>
23c78e
+            <value>Slave</value>
23c78e
+        </choice>
23c78e
+    </define>
23c78e
+</grammar>
23c78e
-- 
23c78e
1.8.3.1
23c78e