Skip to content

Commit 6faa423

Browse files
waltdisgracewaltdisgrace
committed
wip: t882
1 parent 4540673 commit 6faa423

File tree

3 files changed

+129
-39
lines changed

3 files changed

+129
-39
lines changed

‎cts/cli/cibadmin_invalid_schema.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<cib crm_feature_set="3.19.5" validate-with="pacemaker-1.3" epoch="2" num_updates="0" admin_epoch="0">
2+
<configuration>
3+
<crm_config>
4+
<cluster_property_set id="cib-bootstrap-options">
5+
<nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="false"/>
6+
</cluster_property_set>
7+
</crm_config>
8+
<nodes/>
9+
<resources/>
10+
<constraints/>
11+
<rsc_defaults>
12+
<meta_attributes id="build-resource-defaults">
13+
<nvpair id="build-resource-stickiness" name="resource-stickiness" value="1"/>
14+
</meta_attributes>
15+
</rsc_defaults>
16+
<acls>
17+
<acl_role id="acl-role"/>
18+
<acl_user id="acl-user">
19+
<role_ref id="acl-role"/>
20+
</acl_user>
21+
</acls>
22+
</configuration>
23+
<status/>
24+
</cib>

‎cts/cli/regression.upgrade.exp

Lines changed: 53 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,33 @@
1+
=#=#=#= Begin test: Run cibadmin with upgrade and force flags =#=#=#=
2+
pcmk__update_schema debug: Schema pacemaker-2.10 validates
3+
pcmk__update_schema debug: Schema pacemaker-3.0 validates
4+
pcmk__update_schema debug: Schema pacemaker-3.1 validates
5+
pcmk__update_schema debug: Schema pacemaker-3.2 validates
6+
pcmk__update_schema debug: Schema pacemaker-3.3 validates
7+
pcmk__update_schema debug: Schema pacemaker-3.4 validates
8+
pcmk__update_schema debug: Schema pacemaker-3.5 validates
9+
pcmk__update_schema debug: Schema pacemaker-3.6 validates
10+
pcmk__update_schema debug: Schema pacemaker-3.7 validates
11+
pcmk__update_schema debug: Schema pacemaker-3.8 validates
12+
pcmk__update_schema debug: Schema pacemaker-3.9 validates
13+
pcmk__update_schema debug: Schema pacemaker-3.10 validates
14+
pcmk__update_schema debug: Schema pacemaker-4.0 validates
15+
pcmk__update_schema info: Transformed the configuration schema to pacemaker-4.0
16+
=#=#=#= Current cib after: Run cibadmin with upgrade and force flags =#=#=#=
17+
<cib epoch="1" num_updates="2" admin_epoch="1">
18+
<configuration>
19+
<crm_config/>
20+
<nodes/>
21+
<resources/>
22+
<constraints/>
23+
</configuration>
24+
<status/>
25+
</cib>
26+
=#=#=#= End test: Run cibadmin with upgrade and force flags - OK (0) =#=#=#=
27+
* Passed: cibadmin - Run cibadmin with upgrade and force flags
128
=#=#=#= Begin test: Set stonith-enabled=false =#=#=#=
229
=#=#=#= Current cib after: Set stonith-enabled=false =#=#=#=
3-
<cib epoch="2" num_updates="0" admin_epoch="0">
30+
<cib epoch="2" num_updates="0" admin_epoch="1">
431
<configuration>
532
<crm_config>
633
<cluster_property_set id="cib-bootstrap-options">
@@ -17,7 +44,7 @@
1744
* Passed: crm_attribute - Set stonith-enabled=false
1845
=#=#=#= Begin test: Configure the initial resource =#=#=#=
1946
=#=#=#= Current cib after: Configure the initial resource =#=#=#=
20-
<cib epoch="3" num_updates="0" admin_epoch="0">
47+
<cib epoch="3" num_updates="0" admin_epoch="1">
2148
<configuration>
2249
<crm_config>
2350
<cluster_property_set id="cib-bootstrap-options">
@@ -54,31 +81,8 @@
5481
=#=#=#= End test: Configure the initial resource - OK (0) =#=#=#=
5582
* Passed: cibadmin - Configure the initial resource
5683
=#=#=#= Begin test: Upgrade to latest CIB schema (trigger 2.10.xsl + the wrapping) =#=#=#=
57-
pcmk__update_schema debug: Schema pacemaker-2.10 validates
58-
apply_upgrade debug: Upgrading schema from pacemaker-2.10 to pacemaker-3.0: applying XSL transform upgrade-2.10-0.xsl
59-
apply_upgrade debug: Upgrading schema from pacemaker-2.10 to pacemaker-3.0: applying XSL transform upgrade-2.10-1.xsl
60-
INFO: Resources-operation instance_attributes: mySmartFuse-monitor-inputpower (rsc=mySmartFuse, meta=mySmartFuse-inputpower-instanceparams): dropping requires
61-
INFO: Resources-operation instance_attributes: ... only start/promote operation taken into account
62-
INFO: Resources-operation instance_attributes: mySmartFuse-monitor-outputpower (rsc=mySmartFuse, meta=mySmartFuse-outputpower-instanceparams): dropping requires
63-
INFO: Resources-operation instance_attributes: ... only start/promote operation taken into account
64-
apply_upgrade debug: Upgrading schema from pacemaker-2.10 to pacemaker-3.0: applying XSL transform upgrade-2.10-2.xsl
65-
DEBUG: instance_attributes: original element pointed to with @id-ref (mySmartFuse-outputpower-instanceparams) disappeared during upgrade
66-
apply_upgrade info: Schema upgrade from pacemaker-2.10 to pacemaker-3.0 succeeded
67-
pcmk__update_schema debug: Schema pacemaker-3.0 validates
68-
pcmk__update_schema debug: Schema pacemaker-3.1 validates
69-
pcmk__update_schema debug: Schema pacemaker-3.2 validates
70-
pcmk__update_schema debug: Schema pacemaker-3.3 validates
71-
pcmk__update_schema debug: Schema pacemaker-3.4 validates
72-
pcmk__update_schema debug: Schema pacemaker-3.5 validates
73-
pcmk__update_schema debug: Schema pacemaker-3.6 validates
74-
pcmk__update_schema debug: Schema pacemaker-3.7 validates
75-
pcmk__update_schema debug: Schema pacemaker-3.8 validates
76-
pcmk__update_schema debug: Schema pacemaker-3.9 validates
77-
pcmk__update_schema debug: Schema pacemaker-3.10 validates
78-
pcmk__update_schema debug: Schema pacemaker-4.0 validates
79-
pcmk__update_schema info: Transformed the configuration schema to pacemaker-4.0
8084
=#=#=#= Current cib after: Upgrade to latest CIB schema (trigger 2.10.xsl + the wrapping) =#=#=#=
81-
<cib epoch="2" num_updates="0" admin_epoch="1">
85+
<cib epoch="3" num_updates="0" admin_epoch="1">
8286
<configuration>
8387
<crm_config>
8488
<cluster_property_set id="cib-bootstrap-options">
@@ -90,16 +94,22 @@ pcmk__update_schema info: Transformed the configuration schema to pacemaker-4.0
9094
<primitive id="mySmartFuse" class="ocf" provider="experiment" type="SmartFuse">
9195
<operations>
9296
<op id="mySmartFuse-start" name="start" interval="0" timeout="40s"/>
93-
<op id="mySmartFuse-monitor-inputpower" name="monitor" interval="30s"/>
94-
<op id="mySmartFuse-monitor-outputpower" name="monitor" interval="2s"/>
97+
<op id="mySmartFuse-monitor-inputpower" name="monitor" interval="30s">
98+
<instance_attributes id="mySmartFuse-inputpower-instanceparams">
99+
<nvpair id="mySmartFuse-inputpower-requires" name="requires" value="inputpower"/>
100+
</instance_attributes>
101+
</op>
102+
<op id="mySmartFuse-monitor-outputpower" name="monitor" interval="2s">
103+
<instance_attributes id="mySmartFuse-outputpower-instanceparams">
104+
<nvpair id="mySmartFuse-outputpower-requires" name="requires" value="outputpower"/>
105+
</instance_attributes>
106+
</op>
95107
</operations>
96108
<instance_attributes id="mySmartFuse-params">
97109
<nvpair id="mySmartFuse-params-ip" name="ip" value="192.0.2.10"/>
98110
</instance_attributes>
99111
<!-- a bit hairy but valid -->
100-
<instance_attributes id="_cibtr-2_mySmartFuse-outputpower-instanceparams">
101-
<nvpair id="__cibtr-2_mySmartFuse-outputpower-instanceparams__mySmartFuse-outputpower-requires" name="requires" value="outputpower"/>
102-
</instance_attributes>
112+
<instance_attributes id-ref="mySmartFuse-outputpower-instanceparams"/>
103113
</primitive>
104114
</resources>
105115
<constraints/>
@@ -111,7 +121,7 @@ pcmk__update_schema info: Transformed the configuration schema to pacemaker-4.0
111121
=#=#=#= Begin test: Query a resource instance attribute (shall survive) =#=#=#=
112122
outputpower
113123
=#=#=#= Current cib after: Query a resource instance attribute (shall survive) =#=#=#=
114-
<cib epoch="2" num_updates="0" admin_epoch="1">
124+
<cib epoch="3" num_updates="0" admin_epoch="1">
115125
<configuration>
116126
<crm_config>
117127
<cluster_property_set id="cib-bootstrap-options">
@@ -123,16 +133,22 @@ outputpower
123133
<primitive id="mySmartFuse" class="ocf" provider="experiment" type="SmartFuse">
124134
<operations>
125135
<op id="mySmartFuse-start" name="start" interval="0" timeout="40s"/>
126-
<op id="mySmartFuse-monitor-inputpower" name="monitor" interval="30s"/>
127-
<op id="mySmartFuse-monitor-outputpower" name="monitor" interval="2s"/>
136+
<op id="mySmartFuse-monitor-inputpower" name="monitor" interval="30s">
137+
<instance_attributes id="mySmartFuse-inputpower-instanceparams">
138+
<nvpair id="mySmartFuse-inputpower-requires" name="requires" value="inputpower"/>
139+
</instance_attributes>
140+
</op>
141+
<op id="mySmartFuse-monitor-outputpower" name="monitor" interval="2s">
142+
<instance_attributes id="mySmartFuse-outputpower-instanceparams">
143+
<nvpair id="mySmartFuse-outputpower-requires" name="requires" value="outputpower"/>
144+
</instance_attributes>
145+
</op>
128146
</operations>
129147
<instance_attributes id="mySmartFuse-params">
130148
<nvpair id="mySmartFuse-params-ip" name="ip" value="192.0.2.10"/>
131149
</instance_attributes>
132150
<!-- a bit hairy but valid -->
133-
<instance_attributes id="_cibtr-2_mySmartFuse-outputpower-instanceparams">
134-
<nvpair id="__cibtr-2_mySmartFuse-outputpower-instanceparams__mySmartFuse-outputpower-requires" name="requires" value="outputpower"/>
135-
</instance_attributes>
151+
<instance_attributes id-ref="mySmartFuse-outputpower-instanceparams"/>
136152
</primitive>
137153
</resources>
138154
<constraints/>

‎cts/cts-cli.in

Lines changed: 52 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2936,7 +2936,7 @@ class UpgradeRegressionTest(RegressionTest):
29362936
@property
29372937
def tests(self):
29382938
"""A list of Test instances to be run as part of this regression test."""
2939-
resource_cib = """
2939+
resource_cib1 = """
29402940
<resources>
29412941
<primitive id="mySmartFuse" class="ocf" provider="experiment" type="SmartFuse">
29422942
<operations>
@@ -2959,13 +2959,63 @@ class UpgradeRegressionTest(RegressionTest):
29592959
<instance_attributes id-ref="mySmartFuse-outputpower-instanceparams"/>
29602960
</primitive>
29612961
</resources>
2962+
"""
2963+
resource_cib2 = """
2964+
<cib crm_feature_set="3.19.5" validate-with="pacemaker-1.3" epoch="2" num_updates="0" admin_epoch="0">
2965+
<configuration>
2966+
<crm_config>
2967+
<cluster_property_set id="cib-bootstrap-options">
2968+
<nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="false"/>
2969+
</cluster_property_set>
2970+
</crm_config>
2971+
<nodes/>
2972+
<resources/>
2973+
<constraints/>
2974+
<rsc_defaults>
2975+
<meta_attributes id="build-resource-defaults">
2976+
<nvpair id="build-resource-stickiness" name="resource-stickiness" value="1"/>
2977+
</meta_attributes>
2978+
</rsc_defaults>
2979+
<acls>
2980+
<acl_role id="acl-role"/>
2981+
<acl_user id="acl-user">
2982+
<role_ref id="acl-role"/>
2983+
</acl_user>
2984+
</acls>
2985+
</configuration>
2986+
<status/>
2987+
</cib>
29622988
"""
29632989

2990+
t882_tests3 = [
2991+
Test("Run cibadmin with upgrade and force flags", "cibadmin -u --force",
2992+
update_cib=True),
2993+
]
2994+
2995+
t882_tests0 = [
2996+
Test("Run cibadmin with upgrade and force flags", "cibadmin -u --force",
2997+
update_cib=True),
2998+
]
2999+
3000+
t882_tests1 = [
3001+
Test("Run cibadmin with upgrade and force flags", "cibadmin -u --force -x '{cts_cli_data}/cibadmin_invalid_schema.xml'",
3002+
update_cib=True),
3003+
]
3004+
3005+
t882_tests2 = [
3006+
Test("Run cibadmin with upgrade and force flags", "cibadmin -u --force -p",
3007+
update_cib=True, stdin=resource_cib2),
3008+
]
3009+
29643010
basic_tests = [
3011+
3012+
TestGroup(t882_tests3,
3013+
env={"CIB_file": "{cts_cli_data}/cibadmin_invalid_schema.xml"}),
3014+
29653015
Test("Set stonith-enabled=false", "crm_attribute -n stonith-enabled -v false",
29663016
update_cib=True),
29673017
Test("Configure the initial resource", "cibadmin -M -o resources -p",
2968-
update_cib=True, stdin=resource_cib),
3018+
update_cib=True, stdin=resource_cib1),
29693019
Test("Upgrade to latest CIB schema (trigger 2.10.xsl + the wrapping)",
29703020
"cibadmin --upgrade --force -V -V",
29713021
update_cib=True),

0 commit comments

Comments
 (0)