|
 |
533c21 |
From f5ffbaf1f537d3d5b00e594211cd322f97df51ac Mon Sep 17 00:00:00 2001
|
|
|
533c21 |
From: Grace Chin <gchin@redhat.com>
|
|
|
533c21 |
Date: Fri, 5 Nov 2021 11:39:39 -0400
|
|
|
533c21 |
Subject: [PATCH 1/3] Low: xml: clone acls schema in preparation for changes
|
|
|
533c21 |
|
|
|
533c21 |
---
|
|
|
533c21 |
xml/acls-3.8.rng | 80 ++++++++++++++++++++++++++++++++++++++++++++++++
|
|
|
533c21 |
1 file changed, 80 insertions(+)
|
|
|
533c21 |
create mode 100644 xml/acls-3.8.rng
|
|
|
533c21 |
|
|
|
533c21 |
diff --git a/xml/acls-3.8.rng b/xml/acls-3.8.rng
|
|
|
533c21 |
new file mode 100644
|
|
|
533c21 |
index 000000000..0fe6eed96
|
|
|
533c21 |
--- /dev/null
|
|
|
533c21 |
+++ b/xml/acls-3.8.rng
|
|
|
533c21 |
@@ -0,0 +1,80 @@
|
|
|
533c21 |
+
|
|
|
533c21 |
+
|
|
|
533c21 |
+ datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
|
|
|
533c21 |
+ <start>
|
|
|
533c21 |
+ <optional>
|
|
|
533c21 |
+ <ref name="element-acls"/>
|
|
|
533c21 |
+ </optional>
|
|
|
533c21 |
+ </start>
|
|
|
533c21 |
+
|
|
|
533c21 |
+ <define name="element-acls">
|
|
|
533c21 |
+ <element name="acls">
|
|
|
533c21 |
+ <zeroOrMore>
|
|
|
533c21 |
+ <choice>
|
|
|
533c21 |
+ <element name="acl_target">
|
|
|
533c21 |
+ <attribute name="id"><text/></attribute>
|
|
|
533c21 |
+ <zeroOrMore>
|
|
|
533c21 |
+ <element name="role">
|
|
|
533c21 |
+ <attribute name="id"><data type="IDREF"/></attribute>
|
|
|
533c21 |
+ </element>
|
|
|
533c21 |
+ </zeroOrMore>
|
|
|
533c21 |
+ </element>
|
|
|
533c21 |
+ <element name="acl_group">
|
|
|
533c21 |
+
|
|
|
533c21 |
+ <attribute name="id"><data type="ID"/></attribute>
|
|
|
533c21 |
+ <zeroOrMore>
|
|
|
533c21 |
+ <element name="role">
|
|
|
533c21 |
+ <attribute name="id"><data type="IDREF"/></attribute>
|
|
|
533c21 |
+ </element>
|
|
|
533c21 |
+ </zeroOrMore>
|
|
|
533c21 |
+ </element>
|
|
|
533c21 |
+ <element name="acl_role">
|
|
|
533c21 |
+ <attribute name="id"><data type="ID"/></attribute>
|
|
|
533c21 |
+ <optional>
|
|
|
533c21 |
+ <attribute name="description"><text/></attribute>
|
|
|
533c21 |
+ </optional>
|
|
|
533c21 |
+ <zeroOrMore>
|
|
|
533c21 |
+ <ref name="element-permission"/>
|
|
|
533c21 |
+ </zeroOrMore>
|
|
|
533c21 |
+ </element>
|
|
|
533c21 |
+ </choice>
|
|
|
533c21 |
+ </zeroOrMore>
|
|
|
533c21 |
+ </element>
|
|
|
533c21 |
+ </define>
|
|
|
533c21 |
+
|
|
|
533c21 |
+ <define name="element-permission">
|
|
|
533c21 |
+ <element name="acl_permission">
|
|
|
533c21 |
+ <attribute name="id"><data type="ID"/></attribute>
|
|
|
533c21 |
+
|
|
|
533c21 |
+ <attribute name="kind">
|
|
|
533c21 |
+ <choice>
|
|
|
533c21 |
+ <value>read</value>
|
|
|
533c21 |
+ <value>write</value>
|
|
|
533c21 |
+ <value>deny</value>
|
|
|
533c21 |
+ </choice>
|
|
|
533c21 |
+ </attribute>
|
|
|
533c21 |
+
|
|
|
533c21 |
+ <choice>
|
|
|
533c21 |
+ <attribute name="xpath"><text/></attribute>
|
|
|
533c21 |
+
|
|
|
533c21 |
+ <attribute name="reference"><data type="IDREF"/></attribute>
|
|
|
533c21 |
+ <group>
|
|
|
533c21 |
+
|
|
|
533c21 |
+ <attribute name="object-type"><text/></attribute>
|
|
|
533c21 |
+ <optional>
|
|
|
533c21 |
+
|
|
|
533c21 |
+ does not make sense with anything other than object-type
|
|
|
533c21 |
+ xpath and reference are already sufficiently specific
|
|
|
533c21 |
+ -->
|
|
|
533c21 |
+ <attribute name="attribute"><text/></attribute>
|
|
|
533c21 |
+ </optional>
|
|
|
533c21 |
+ </group>
|
|
|
533c21 |
+ </choice>
|
|
|
533c21 |
+
|
|
|
533c21 |
+ <optional>
|
|
|
533c21 |
+ <attribute name="description"><text/></attribute>
|
|
|
533c21 |
+ </optional>
|
|
|
533c21 |
+ </element>
|
|
|
533c21 |
+ </define>
|
|
|
533c21 |
+
|
|
|
533c21 |
+</grammar>
|
|
|
533c21 |
--
|
|
|
533c21 |
2.27.0
|
|
|
533c21 |
|
|
|
533c21 |
|
|
|
533c21 |
From 7838213fc639236bdedf5f15320152d973f1bdad Mon Sep 17 00:00:00 2001
|
|
|
533c21 |
From: Grace Chin <gchin@redhat.com>
|
|
|
533c21 |
Date: Fri, 5 Nov 2021 11:40:48 -0400
|
|
|
533c21 |
Subject: [PATCH 2/3] Add a 'name' attribute to acl_target and acl_group
|
|
|
533c21 |
elements
|
|
|
533c21 |
|
|
|
533c21 |
---
|
|
|
533c21 |
xml/acls-3.8.rng | 6 ++++++
|
|
|
533c21 |
1 file changed, 6 insertions(+)
|
|
|
533c21 |
|
|
|
533c21 |
diff --git a/xml/acls-3.8.rng b/xml/acls-3.8.rng
|
|
|
533c21 |
index 0fe6eed96..48bcdffe3 100644
|
|
|
533c21 |
--- a/xml/acls-3.8.rng
|
|
|
533c21 |
+++ b/xml/acls-3.8.rng
|
|
|
533c21 |
@@ -13,6 +13,9 @@
|
|
|
533c21 |
<choice>
|
|
|
533c21 |
<element name="acl_target">
|
|
|
533c21 |
<attribute name="id"><text/></attribute>
|
|
|
533c21 |
+ <optional>
|
|
|
533c21 |
+ <attribute name="name"><text/></attribute>
|
|
|
533c21 |
+ </optional>
|
|
|
533c21 |
<zeroOrMore>
|
|
|
533c21 |
<element name="role">
|
|
|
533c21 |
<attribute name="id"><data type="IDREF"/></attribute>
|
|
|
533c21 |
@@ -22,6 +25,9 @@
|
|
|
533c21 |
<element name="acl_group">
|
|
|
533c21 |
|
|
|
533c21 |
<attribute name="id"><data type="ID"/></attribute>
|
|
|
533c21 |
+ <optional>
|
|
|
533c21 |
+ <attribute name="name"><text/></attribute>
|
|
|
533c21 |
+ </optional>
|
|
|
533c21 |
<zeroOrMore>
|
|
|
533c21 |
<element name="role">
|
|
|
533c21 |
<attribute name="id"><data type="IDREF"/></attribute>
|
|
|
533c21 |
--
|
|
|
533c21 |
2.27.0
|
|
|
533c21 |
|
|
|
533c21 |
|
|
|
533c21 |
From c3c498f4636f57e29670f8e385b625024ed222d7 Mon Sep 17 00:00:00 2001
|
|
|
533c21 |
From: Grace Chin <gchin@redhat.com>
|
|
|
533c21 |
Date: Fri, 5 Nov 2021 11:42:48 -0400
|
|
|
533c21 |
Subject: [PATCH 3/3] Changes made by run of 'cts/cts-cli -s'
|
|
|
533c21 |
|
|
|
533c21 |
---
|
|
|
533c21 |
cts/cli/regression.upgrade.exp | 7 +++++--
|
|
|
533c21 |
cts/cli/regression.validity.exp | 22 ++++++++++++++++++----
|
|
|
533c21 |
2 files changed, 23 insertions(+), 6 deletions(-)
|
|
|
533c21 |
|
|
|
533c21 |
diff --git a/cts/cli/regression.upgrade.exp b/cts/cli/regression.upgrade.exp
|
|
|
533c21 |
index e38adebdd..7ce7ec13b 100644
|
|
|
533c21 |
--- a/cts/cli/regression.upgrade.exp
|
|
|
533c21 |
+++ b/cts/cli/regression.upgrade.exp
|
|
|
533c21 |
@@ -91,8 +91,11 @@ update_validation debug: Configuration valid for schema: pacemaker-3.6
|
|
|
533c21 |
update_validation debug: pacemaker-3.6-style configuration is also valid for pacemaker-3.7
|
|
|
533c21 |
update_validation debug: Testing 'pacemaker-3.7' validation (21 of X)
|
|
|
533c21 |
update_validation debug: Configuration valid for schema: pacemaker-3.7
|
|
|
533c21 |
-update_validation trace: Stopping at pacemaker-3.7
|
|
|
533c21 |
-update_validation info: Transformed the configuration from pacemaker-2.10 to pacemaker-3.7
|
|
|
533c21 |
+update_validation debug: pacemaker-3.7-style configuration is also valid for pacemaker-3.8
|
|
|
533c21 |
+update_validation debug: Testing 'pacemaker-3.8' validation (22 of X)
|
|
|
533c21 |
+update_validation debug: Configuration valid for schema: pacemaker-3.8
|
|
|
533c21 |
+update_validation trace: Stopping at pacemaker-3.8
|
|
|
533c21 |
+update_validation info: Transformed the configuration from pacemaker-2.10 to pacemaker-3.8
|
|
|
533c21 |
=#=#=#= Current cib after: Upgrade to latest CIB schema (trigger 2.10.xsl + the wrapping) =#=#=#=
|
|
|
533c21 |
<cib epoch="2" num_updates="0" admin_epoch="1">
|
|
|
533c21 |
<configuration>
|
|
|
533c21 |
diff --git a/cts/cli/regression.validity.exp b/cts/cli/regression.validity.exp
|
|
|
533c21 |
index 5ace430e7..125035a47 100644
|
|
|
533c21 |
--- a/cts/cli/regression.validity.exp
|
|
|
533c21 |
+++ b/cts/cli/regression.validity.exp
|
|
|
533c21 |
@@ -121,7 +121,11 @@ update_validation debug: Testing 'pacemaker-3.7' validation (21 of X)
|
|
|
533c21 |
element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order
|
|
|
533c21 |
element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
|
|
|
533c21 |
update_validation trace: pacemaker-3.7 validation failed
|
|
|
533c21 |
-Cannot upgrade configuration (claiming schema pacemaker-1.2) to at least pacemaker-3.0 because it does not validate with any schema from pacemaker-1.2 to pacemaker-3.7
|
|
|
533c21 |
+update_validation debug: Testing 'pacemaker-3.8' validation (22 of X)
|
|
|
533c21 |
+element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order
|
|
|
533c21 |
+element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
|
|
|
533c21 |
+update_validation trace: pacemaker-3.8 validation failed
|
|
|
533c21 |
+Cannot upgrade configuration (claiming schema pacemaker-1.2) to at least pacemaker-3.0 because it does not validate with any schema from pacemaker-1.2 to pacemaker-3.8
|
|
|
533c21 |
=#=#=#= End test: Run crm_simulate with invalid CIB (enum violation) - Invalid configuration (78) =#=#=#=
|
|
|
533c21 |
* Passed: crm_simulate - Run crm_simulate with invalid CIB (enum violation)
|
|
|
533c21 |
=#=#=#= Begin test: Try to make resulting CIB invalid (unrecognized validate-with) =#=#=#=
|
|
|
533c21 |
@@ -226,7 +230,10 @@ update_validation trace: pacemaker-3.6 validation failed
|
|
|
533c21 |
update_validation debug: Testing 'pacemaker-3.7' validation (21 of X)
|
|
|
533c21 |
element cib: Relax-NG validity error : Invalid attribute validate-with for element cib
|
|
|
533c21 |
update_validation trace: pacemaker-3.7 validation failed
|
|
|
533c21 |
-Cannot upgrade configuration (claiming schema pacemaker-9999.0) to at least pacemaker-3.0 because it does not validate with any schema from unknown to pacemaker-3.7
|
|
|
533c21 |
+update_validation debug: Testing 'pacemaker-3.8' validation (22 of X)
|
|
|
533c21 |
+element cib: Relax-NG validity error : Invalid attribute validate-with for element cib
|
|
|
533c21 |
+update_validation trace: pacemaker-3.8 validation failed
|
|
|
533c21 |
+Cannot upgrade configuration (claiming schema pacemaker-9999.0) to at least pacemaker-3.0 because it does not validate with any schema from unknown to pacemaker-3.8
|
|
|
533c21 |
=#=#=#= End test: Run crm_simulate with invalid CIB (unrecognized validate-with) - Invalid configuration (78) =#=#=#=
|
|
|
533c21 |
* Passed: crm_simulate - Run crm_simulate with invalid CIB (unrecognized validate-with)
|
|
|
533c21 |
=#=#=#= Begin test: Try to make resulting CIB invalid, but possibly recoverable (valid with X.Y+1) =#=#=#=
|
|
|
533c21 |
@@ -326,8 +333,11 @@ update_validation debug: Configuration valid for schema: pacemaker-3.6
|
|
|
533c21 |
update_validation debug: pacemaker-3.6-style configuration is also valid for pacemaker-3.7
|
|
|
533c21 |
update_validation debug: Testing 'pacemaker-3.7' validation (21 of X)
|
|
|
533c21 |
update_validation debug: Configuration valid for schema: pacemaker-3.7
|
|
|
533c21 |
-update_validation trace: Stopping at pacemaker-3.7
|
|
|
533c21 |
-update_validation info: Transformed the configuration from pacemaker-1.2 to pacemaker-3.7
|
|
|
533c21 |
+update_validation debug: pacemaker-3.7-style configuration is also valid for pacemaker-3.8
|
|
|
533c21 |
+update_validation debug: Testing 'pacemaker-3.8' validation (22 of X)
|
|
|
533c21 |
+update_validation debug: Configuration valid for schema: pacemaker-3.8
|
|
|
533c21 |
+update_validation trace: Stopping at pacemaker-3.8
|
|
|
533c21 |
+update_validation info: Transformed the configuration from pacemaker-1.2 to pacemaker-3.8
|
|
|
533c21 |
unpack_resources error: Resource start-up disabled since no STONITH resources have been defined
|
|
|
533c21 |
unpack_resources error: Either configure some or disable STONITH with the stonith-enabled option
|
|
|
533c21 |
unpack_resources error: NOTE: Clusters with shared data need STONITH to ensure data integrity
|
|
|
533c21 |
@@ -437,6 +447,8 @@ element rsc_order: Relax-NG validity error : Invalid attribute first-action for
|
|
|
533c21 |
element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
|
|
|
533c21 |
element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order
|
|
|
533c21 |
element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
|
|
|
533c21 |
+element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order
|
|
|
533c21 |
+element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
|
|
|
533c21 |
=#=#=#= Current cib after: Make resulting CIB invalid, and without validate-with attribute =#=#=#=
|
|
|
533c21 |
<cib epoch="41" num_updates="0" admin_epoch="0" validate-with="none">
|
|
|
533c21 |
<configuration>
|
|
|
533c21 |
@@ -502,6 +514,8 @@ validity.bad.xml:10: element rsc_order: Relax-NG validity error : Invalid attrib
|
|
|
533c21 |
validity.bad.xml:10: element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
|
|
|
533c21 |
validity.bad.xml:10: element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order
|
|
|
533c21 |
validity.bad.xml:10: element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
|
|
|
533c21 |
+validity.bad.xml:10: element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order
|
|
|
533c21 |
+validity.bad.xml:10: element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order
|
|
|
533c21 |
unpack_resources error: Resource start-up disabled since no STONITH resources have been defined
|
|
|
533c21 |
unpack_resources error: Either configure some or disable STONITH with the stonith-enabled option
|
|
|
533c21 |
unpack_resources error: NOTE: Clusters with shared data need STONITH to ensure data integrity
|
|
|
533c21 |
--
|
|
|
533c21 |
2.27.0
|
|
|
533c21 |
|