From 2473a05933375bbf2b4d03d2c80297b65428a702 Mon Sep 17 00:00:00 2001 From: zouzhimin Date: Sat, 2 Mar 2024 07:05:57 +0800 Subject: [PATCH] update crm_mon schemas for tests --- pcs.spec | 6 +- update-crm_mon-schemas-for-tests.patch | 957 +++++++++++++++++++++++++ 2 files changed, 962 insertions(+), 1 deletion(-) create mode 100644 update-crm_mon-schemas-for-tests.patch diff --git a/pcs.spec b/pcs.spec index 2782983..23b23ad 100644 --- a/pcs.spec +++ b/pcs.spec @@ -1,6 +1,6 @@ Name: pcs Version: 0.11.7 -Release: 4 +Release: 5 License: GPL-2.0-only AND Apache-2.0 AND MIT AND BSD-3-Clause AND (BSD-2-Clause OR Ruby) AND (BSD-2-Clause OR GPL-2.0-or-later) URL: https://github.com/ClusterLabs/pcs Group: System Environment/Base @@ -41,6 +41,7 @@ Patch1: Support-for-openEuler.patch Patch2: fix-do-not-put-empty-uid-gid-options-to-an-uidgid-fi.patch Patch3: fix-stonith-level-validation.patch Patch4: Fix-pcsd-ruby.patch +Patch5: update-crm_mon-schemas-for-tests.patch # ui patches: >200 # Patch201: bzNUMBER-01-name.patch @@ -401,6 +402,9 @@ run_all_tests %license pyagentx_LICENSE.txt %changelog +* Thu Mar 14 2024 zouzhimin - 0.11.7-5 +- update crm_mon schemas for tests + * Tue Mar 12 2024 zouzhimin - 0.11.7-4 - Fix pcsd ruby diff --git a/update-crm_mon-schemas-for-tests.patch b/update-crm_mon-schemas-for-tests.patch new file mode 100644 index 0000000..92c937b --- /dev/null +++ b/update-crm_mon-schemas-for-tests.patch @@ -0,0 +1,957 @@ +From 2b7322113eec6a2d789d47d47049ae90c7a46625 Mon Sep 17 00:00:00 2001 +From: Peter Romancik +Date: Fri, 2 Feb 2024 10:50:11 +0100 +Subject: [PATCH] update crm_mon schemas for tests + +--- + pcs_test/Makefile.am | 11 +- + pcs_test/resources/crm_mon.minimal.xml | 4 +- + .../resources/pcmk_api_rng/api-result.rng | 2 +- + .../resources/pcmk_api_rng/crm_mon-2.29.rng | 213 ++++++++++++ + .../resources/pcmk_api_rng/crm_mon-2.4.rng | 311 ------------------ + .../resources/pcmk_api_rng/failure-2.8.rng | 33 ++ + ...nce-event-2.0.rng => fence-event-2.15.rng} | 3 + + .../resources/pcmk_api_rng/node-attrs-2.8.rng | 24 ++ + .../pcmk_api_rng/node-history-2.12.rng | 70 ++++ + .../resources/pcmk_api_rng/nodes-2.29.rng | 54 +++ + .../pcmk_api_rng/pacemakerd-health-2.25.rng | 20 ++ + .../{resources-2.4.rng => resources-2.29.rng} | 45 ++- + 12 files changed, 472 insertions(+), 318 deletions(-) + create mode 100644 pcs_test/resources/pcmk_api_rng/crm_mon-2.29.rng + delete mode 100644 pcs_test/resources/pcmk_api_rng/crm_mon-2.4.rng + create mode 100644 pcs_test/resources/pcmk_api_rng/failure-2.8.rng + rename pcs_test/resources/pcmk_api_rng/{fence-event-2.0.rng => fence-event-2.15.rng} (91%) + create mode 100644 pcs_test/resources/pcmk_api_rng/node-attrs-2.8.rng + create mode 100644 pcs_test/resources/pcmk_api_rng/node-history-2.12.rng + create mode 100644 pcs_test/resources/pcmk_api_rng/nodes-2.29.rng + create mode 100644 pcs_test/resources/pcmk_api_rng/pacemakerd-health-2.25.rng + rename pcs_test/resources/pcmk_api_rng/{resources-2.4.rng => resources-2.29.rng} (76%) + +diff --git a/pcs_test/Makefile.am b/pcs_test/Makefile.am +index 94e4c07a..32ac5eee 100644 +--- a/pcs_test/Makefile.am ++++ b/pcs_test/Makefile.am +@@ -35,10 +35,15 @@ EXTRA_DIST = \ + resources/fenced_metadata.xml \ + resources/schedulerd_metadata.xml \ + resources/pcmk_api_rng/api-result.rng \ +- resources/pcmk_api_rng/crm_mon-2.4.rng \ ++ resources/pcmk_api_rng/crm_mon-2.29.rng \ + resources/pcmk_api_rng/digests-2.9.rng \ +- resources/pcmk_api_rng/fence-event-2.0.rng \ +- resources/pcmk_api_rng/resources-2.4.rng \ ++ resources/pcmk_api_rng/failure-2.8.rng \ ++ resources/pcmk_api_rng/fence-event-2.15.rng \ ++ resources/pcmk_api_rng/node-attrs-2.8.rng \ ++ resources/pcmk_api_rng/node-history-2.12.rng \ ++ resources/pcmk_api_rng/nodes-2.29.rng \ ++ resources/pcmk_api_rng/pacemakerd-health-2.25.rng \ ++ resources/pcmk_api_rng/resources-2.29.rng \ + resources/pcmk_api_rng/status-2.0.rng \ + resources/resource_agent_ocf_heartbeat_dummy_insane_action.xml \ + resources/resource_agent_ocf_heartbeat_dummy_utf8.xml \ +diff --git a/pcs_test/resources/crm_mon.minimal.xml b/pcs_test/resources/crm_mon.minimal.xml +index 2c3473c0..df02fe3e 100644 +--- a/pcs_test/resources/crm_mon.minimal.xml ++++ b/pcs_test/resources/crm_mon.minimal.xml +@@ -1,4 +1,4 @@ +- ++ + + + +@@ -6,7 +6,7 @@ + + + +- ++ + + + +diff --git a/pcs_test/resources/pcmk_api_rng/api-result.rng b/pcs_test/resources/pcmk_api_rng/api-result.rng +index fcd812ac..e01cfdcd 100644 +--- a/pcs_test/resources/pcmk_api_rng/api-result.rng ++++ b/pcs_test/resources/pcmk_api_rng/api-result.rng +@@ -6,7 +6,7 @@ + + + +- ++ + + + +diff --git a/pcs_test/resources/pcmk_api_rng/crm_mon-2.29.rng b/pcs_test/resources/pcmk_api_rng/crm_mon-2.29.rng +new file mode 100644 +index 00000000..9cc554cf +--- /dev/null ++++ b/pcs_test/resources/pcmk_api_rng/crm_mon-2.29.rng +@@ -0,0 +1,213 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ granted ++ revoked ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/pcs_test/resources/pcmk_api_rng/crm_mon-2.4.rng b/pcs_test/resources/pcmk_api_rng/crm_mon-2.4.rng +deleted file mode 100644 +index 88973a4e..00000000 +--- a/pcs_test/resources/pcmk_api_rng/crm_mon-2.4.rng ++++ /dev/null +@@ -1,311 +0,0 @@ +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- unknown +- member +- remote +- ping +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- granted +- revoked +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +diff --git a/pcs_test/resources/pcmk_api_rng/failure-2.8.rng b/pcs_test/resources/pcmk_api_rng/failure-2.8.rng +new file mode 100644 +index 00000000..a36d2ea9 +--- /dev/null ++++ b/pcs_test/resources/pcmk_api_rng/failure-2.8.rng +@@ -0,0 +1,33 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/pcs_test/resources/pcmk_api_rng/fence-event-2.0.rng b/pcs_test/resources/pcmk_api_rng/fence-event-2.15.rng +similarity index 91% +rename from pcs_test/resources/pcmk_api_rng/fence-event-2.0.rng +rename to pcs_test/resources/pcmk_api_rng/fence-event-2.15.rng +index e54687cd..8e000caf 100644 +--- a/pcs_test/resources/pcmk_api_rng/fence-event-2.0.rng ++++ b/pcs_test/resources/pcmk_api_rng/fence-event-2.15.rng +@@ -18,6 +18,9 @@ + + + ++ ++ ++ + + + +diff --git a/pcs_test/resources/pcmk_api_rng/node-attrs-2.8.rng b/pcs_test/resources/pcmk_api_rng/node-attrs-2.8.rng +new file mode 100644 +index 00000000..754ddb9e +--- /dev/null ++++ b/pcs_test/resources/pcmk_api_rng/node-attrs-2.8.rng +@@ -0,0 +1,24 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/pcs_test/resources/pcmk_api_rng/node-history-2.12.rng b/pcs_test/resources/pcmk_api_rng/node-history-2.12.rng +new file mode 100644 +index 00000000..9628000e +--- /dev/null ++++ b/pcs_test/resources/pcmk_api_rng/node-history-2.12.rng +@@ -0,0 +1,70 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/pcs_test/resources/pcmk_api_rng/nodes-2.29.rng b/pcs_test/resources/pcmk_api_rng/nodes-2.29.rng +new file mode 100644 +index 00000000..7dd17989 +--- /dev/null ++++ b/pcs_test/resources/pcmk_api_rng/nodes-2.29.rng +@@ -0,0 +1,54 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ red ++ yellow ++ green ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ unknown ++ member ++ remote ++ ping ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/pcs_test/resources/pcmk_api_rng/pacemakerd-health-2.25.rng b/pcs_test/resources/pcmk_api_rng/pacemakerd-health-2.25.rng +new file mode 100644 +index 00000000..2089b25f +--- /dev/null ++++ b/pcs_test/resources/pcmk_api_rng/pacemakerd-health-2.25.rng +@@ -0,0 +1,20 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/pcs_test/resources/pcmk_api_rng/resources-2.4.rng b/pcs_test/resources/pcmk_api_rng/resources-2.29.rng +similarity index 76% +rename from pcs_test/resources/pcmk_api_rng/resources-2.4.rng +rename to pcs_test/resources/pcmk_api_rng/resources-2.29.rng +index e2795836..f4214a7c 100644 +--- a/pcs_test/resources/pcmk_api_rng/resources-2.4.rng ++++ b/pcs_test/resources/pcmk_api_rng/resources-2.29.rng +@@ -35,6 +35,16 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -53,6 +63,16 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -68,6 +88,16 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +@@ -87,13 +117,26 @@ + + + +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + ++ + + + + + ++ ++ ++ + + + +-- +2.25.1 +