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