diff --git a/cts/cli/regression.upgrade.exp b/cts/cli/regression.upgrade.exp index 28ca057..50b22df 100644 --- a/cts/cli/regression.upgrade.exp +++ b/cts/cli/regression.upgrade.exp @@ -79,8 +79,11 @@ update_validation debug: Configuration valid for schema: pacemaker-3.2 update_validation debug: pacemaker-3.2-style configuration is also valid for pacemaker-3.3 update_validation debug: Testing 'pacemaker-3.3' validation (17 of X) update_validation debug: Configuration valid for schema: pacemaker-3.3 -update_validation trace: Stopping at pacemaker-3.3 -update_validation info: Transformed the configuration from pacemaker-2.10 to pacemaker-3.3 +update_validation debug: pacemaker-3.3-style configuration is also valid for pacemaker-3.4 +update_validation debug: Testing 'pacemaker-3.4' validation (18 of X) +update_validation debug: Configuration valid for schema: pacemaker-3.4 +update_validation trace: Stopping at pacemaker-3.4 +update_validation info: Transformed the configuration from pacemaker-2.10 to pacemaker-3.4 =#=#=#= Current cib after: Upgrade to latest CIB schema (trigger 2.10.xsl + the wrapping) =#=#=#= diff --git a/cts/cli/regression.validity.exp b/cts/cli/regression.validity.exp index 46e54b5..4407074 100644 --- a/cts/cli/regression.validity.exp +++ b/cts/cli/regression.validity.exp @@ -105,7 +105,11 @@ update_validation debug: Testing 'pacemaker-3.3' validation (17 of X) element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order update_validation trace: pacemaker-3.3 validation failed -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.3 +update_validation debug: Testing 'pacemaker-3.4' validation (18 of X) +element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order +element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order +update_validation trace: pacemaker-3.4 validation failed +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.4 =#=#=#= End test: Run crm_simulate with invalid CIB (enum violation) - Invalid configuration (78) =#=#=#= * Passed: crm_simulate - Run crm_simulate with invalid CIB (enum violation) =#=#=#= Begin test: Try to make resulting CIB invalid (unrecognized validate-with) =#=#=#= @@ -198,7 +202,10 @@ update_validation trace: pacemaker-3.2 validation failed update_validation debug: Testing 'pacemaker-3.3' validation (17 of X) element cib: Relax-NG validity error : Invalid attribute validate-with for element cib update_validation trace: pacemaker-3.3 validation failed -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.3 +update_validation debug: Testing 'pacemaker-3.4' validation (18 of X) +element cib: Relax-NG validity error : Invalid attribute validate-with for element cib +update_validation trace: pacemaker-3.4 validation failed +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.4 =#=#=#= End test: Run crm_simulate with invalid CIB (unrecognized validate-with) - Invalid configuration (78) =#=#=#= * Passed: crm_simulate - Run crm_simulate with invalid CIB (unrecognized validate-with) =#=#=#= Begin test: Try to make resulting CIB invalid, but possibly recoverable (valid with X.Y+1) =#=#=#= @@ -286,8 +293,11 @@ update_validation debug: Configuration valid for schema: pacemaker-3.2 update_validation debug: pacemaker-3.2-style configuration is also valid for pacemaker-3.3 update_validation debug: Testing 'pacemaker-3.3' validation (17 of X) update_validation debug: Configuration valid for schema: pacemaker-3.3 -update_validation trace: Stopping at pacemaker-3.3 -update_validation info: Transformed the configuration from pacemaker-1.2 to pacemaker-3.3 +update_validation debug: pacemaker-3.3-style configuration is also valid for pacemaker-3.4 +update_validation debug: Testing 'pacemaker-3.4' validation (18 of X) +update_validation debug: Configuration valid for schema: pacemaker-3.4 +update_validation trace: Stopping at pacemaker-3.4 +update_validation info: Transformed the configuration from pacemaker-1.2 to pacemaker-3.4 unpack_resources error: Resource start-up disabled since no STONITH resources have been defined unpack_resources error: Either configure some or disable STONITH with the stonith-enabled option unpack_resources error: NOTE: Clusters with shared data need STONITH to ensure data integrity @@ -393,6 +403,8 @@ element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order +element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order +element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order =#=#=#= Current cib after: Make resulting CIB invalid, and without validate-with attribute =#=#=#= @@ -450,6 +462,8 @@ validity.bad.xml:10: element rsc_order: Relax-NG validity error : Invalid attrib validity.bad.xml:10: element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order validity.bad.xml:10: element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order validity.bad.xml:10: element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order +validity.bad.xml:10: element rsc_order: Relax-NG validity error : Invalid attribute first-action for element rsc_order +validity.bad.xml:10: element rsc_order: Relax-NG validity error : Element constraints has extra content: rsc_order unpack_resources error: Resource start-up disabled since no STONITH resources have been defined unpack_resources error: Either configure some or disable STONITH with the stonith-enabled option unpack_resources error: NOTE: Clusters with shared data need STONITH to ensure data integrity diff --git a/xml/constraints-next.rng b/xml/constraints-next.rng index 7e0d98e..1fa3e75 100644 --- a/xml/constraints-next.rng +++ b/xml/constraints-next.rng @@ -43,7 +43,7 @@ - + @@ -255,7 +255,7 @@ - + diff --git a/xml/nodes-3.4.rng b/xml/nodes-3.4.rng new file mode 100644 index 0000000..0132c72 --- /dev/null +++ b/xml/nodes-3.4.rng @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + member + ping + remote + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/nvset-3.4.rng b/xml/nvset-3.4.rng new file mode 100644 index 0000000..91a7d23 --- /dev/null +++ b/xml/nvset-3.4.rng @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/options-3.4.rng b/xml/options-3.4.rng new file mode 100644 index 0000000..22330d8 --- /dev/null +++ b/xml/options-3.4.rng @@ -0,0 +1,111 @@ + + + + + + + + + + + + cluster-infrastructure + + + + + + heartbeat + openais + classic openais + classic openais (with plugin) + cman + + + + + + + + + + + cluster-infrastructure + cluster_recheck_interval + dc_deadtime + default-action-timeout + default_action_timeout + default-migration-threshold + default_migration_threshold + default-resource-failure-stickiness + default_resource_failure_stickiness + default-resource-stickiness + default_resource_stickiness + election_timeout + expected-quorum-votes + is-managed-default + is_managed_default + no_quorum_policy + notification-agent + notification-recipient + remove_after_stop + shutdown_escalation + startup_fencing + stonith_action + stonith_enabled + stop_orphan_actions + stop_orphan_resources + symmetric_cluster + transition_idle_timeout + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/resources-3.4.rng b/xml/resources-3.4.rng new file mode 100644 index 0000000..fbb4b65 --- /dev/null +++ b/xml/resources-3.4.rng @@ -0,0 +1,425 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + isolation + isolation-host + isolation-instance + isolation-wrapper + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ([0-9\-]+) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + requires + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Stopped + Started + Slave + Master + + + + + + + ignore + block + stop + restart + standby + fence + restart-container + + + + + + + + + + + + + + ocf + + + + + lsb + heartbeat + stonith + upstart + service + systemd + nagios + + + + + diff --git a/xml/rule-3.4.rng b/xml/rule-3.4.rng new file mode 100644 index 0000000..5d1daf0 --- /dev/null +++ b/xml/rule-3.4.rng @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + or + and + + + + + + + + + + + + + + lt + gt + lte + gte + eq + ne + defined + not_defined + + + + + + + + + string + number + version + + + + + + + literal + param + meta + + + + + + + + + in_range + + + + + + + + + + + + + + + + + gt + + + + lt + + + + + + date_spec + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +